diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-30 22:53:18 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-30 22:53:18 (GMT) |
| commit | a230e033845853ebcfd21aae7a019a5392ebd30e (patch) | |
| tree | 0a9c5cb054513d4c0cc08aa1f3c80102546a3241 /net/batman-adv/icmp_socket.c | |
| parent | cbb963deed7bbf206f5077ab5742bee00ceefa46 (diff) | |
| parent | 6715fd3f0538e805b6a769d66823ec16b8b647ac (diff) | |
| download | linux-fsl-qoriq-a230e033845853ebcfd21aae7a019a5392ebd30e.tar.xz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- reduce broadcast overhead on non-lossy wired links
- fix typos in kernel doc
- use eth_hdr() when possible
- use netdev_allock_skb_ip_align() and don't deal with NET_IP_ALIGN
- change VID semantic in the BLA component
- other minor cleanups and code refactoring
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
| -rw-r--r-- | net/batman-adv/icmp_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 0ba6c89..b27508b 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -177,13 +177,13 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (len >= sizeof(struct batadv_icmp_packet_rr)) packet_len = sizeof(struct batadv_icmp_packet_rr); - skb = dev_alloc_skb(packet_len + ETH_HLEN + NET_IP_ALIGN); + skb = netdev_alloc_skb_ip_align(NULL, packet_len + ETH_HLEN); if (!skb) { len = -ENOMEM; goto out; } - skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); + skb_reserve(skb, ETH_HLEN); icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); if (copy_from_user(icmp_packet, buff, packet_len)) { |