diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
| commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
| tree | 3c688483e71261f564fc43be3157b337ae340dca /net/ipv6/mcast.c | |
| parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pebs
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) | |||
| 1411 | IPV6_TLV_PADN, 0 }; | 1411 | IPV6_TLV_PADN, 0 }; |
| 1412 | 1412 | ||
| 1413 | /* we assume size > sizeof(ra) here */ | 1413 | /* we assume size > sizeof(ra) here */ |
| 1414 | skb = sock_alloc_send_skb(sk, size + LL_RESERVED_SPACE(dev), 1, &err); | 1414 | skb = sock_alloc_send_skb(sk, size + LL_ALLOCATED_SPACE(dev), 1, &err); |
| 1415 | 1415 | ||
| 1416 | if (!skb) | 1416 | if (!skb) |
| 1417 | return NULL; | 1417 | return NULL; |
| @@ -1790,7 +1790,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
| 1790 | payload_len = len + sizeof(ra); | 1790 | payload_len = len + sizeof(ra); |
| 1791 | full_len = sizeof(struct ipv6hdr) + payload_len; | 1791 | full_len = sizeof(struct ipv6hdr) + payload_len; |
| 1792 | 1792 | ||
| 1793 | skb = sock_alloc_send_skb(sk, LL_RESERVED_SPACE(dev) + full_len, 1, &err); | 1793 | skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + full_len, 1, &err); |
| 1794 | 1794 | ||
| 1795 | if (skb == NULL) { | 1795 | if (skb == NULL) { |
| 1796 | rcu_read_lock(); | 1796 | rcu_read_lock(); |