From 030dec5308a8269dd59231cf275030f8295a4ae6 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 16 Nov 2010 20:36:42 +0000 Subject: [PATCH] --- yaml --- r: 224439 b: refs/heads/master c: 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a h: refs/heads/master i: 224437: 0978b7880ad71e39ca0a16337883f63d49c2af3c 224435: a7ae5c2f1bd8b56f4209108b519833bd3f214023 224431: 9bd8045b609ed4e34c06b79f032f793c5a620689 v: v3 --- [refs] | 2 +- trunk/net/ipv4/igmp.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7a92dc27cc7e..aa40210ef712 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c3710afbc333c33100739dec10662b4ee64e219 +refs/heads/master: 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c index 50f6bc1a002a..e0e77e297de3 100644 --- a/trunk/net/ipv4/igmp.c +++ b/trunk/net/ipv4/igmp.c @@ -300,6 +300,8 @@ igmp_scount(struct ip_mc_list *pmc, int type, int gdeleted, int sdeleted) return scount; } +#define igmp_skb_size(skb) (*(unsigned int *)((skb)->cb)) + static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) { struct sk_buff *skb; @@ -308,9 +310,16 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) struct igmpv3_report *pig; struct net *net = dev_net(dev); - skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC); - if (skb == NULL) - return NULL; + while (1) { + skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), + GFP_ATOMIC | __GFP_NOWARN); + if (skb) + break; + size >>= 1; + if (size < 256) + return NULL; + } + igmp_skb_size(skb) = size; { struct flowi fl = { .oif = dev->ifindex, @@ -399,7 +408,7 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ip_mc_list *pmc, return skb; } -#define AVAILABLE(skb) ((skb) ? ((skb)->dev ? (skb)->dev->mtu - (skb)->len : \ +#define AVAILABLE(skb) ((skb) ? ((skb)->dev ? igmp_skb_size(skb) - (skb)->len : \ skb_tailroom(skb)) : 0) static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc,