diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-13 05:48:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 05:48:31 +0200 |
| commit | f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5 (patch) | |
| tree | 5ccce7558f9e1e53e5b189d6e2fe62a667988ac8 /net/ipv6/mcast.c | |
| parent | net: Set LL_MAX_HEADER properly for wireless. (diff) | |
| download | linux-f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5.tar.xz linux-f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5.zip | |
net: Allow netdevices to specify needed head/tailroom
This patch adds needed_headroom/needed_tailroom members to struct
net_device and updates many places that allocate sbks to use them. Not
all of them can be converted though, and I'm sure I missed some (I
mostly grepped for LL_RESERVED_SPACE)
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/mcast.c')
| -rw-r--r-- | net/ipv6/mcast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 54f91efdae58..fd632dd7f98d 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -1411,7 +1411,7 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size) IPV6_TLV_PADN, 0 }; /* we assume size > sizeof(ra) here */ - skb = sock_alloc_send_skb(sk, size + LL_RESERVED_SPACE(dev), 1, &err); + skb = sock_alloc_send_skb(sk, size + LL_ALLOCATED_SPACE(dev), 1, &err); if (!skb) return NULL; @@ -1790,7 +1790,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) payload_len = len + sizeof(ra); full_len = sizeof(struct ipv6hdr) + payload_len; - skb = sock_alloc_send_skb(sk, LL_RESERVED_SPACE(dev) + full_len, 1, &err); + skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + full_len, 1, &err); if (skb == NULL) { rcu_read_lock(); |