1 files changed, 11 insertions, 6 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index b2ca095cb9da..fa057d105bef 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -304,9 +304,11 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
         struct igmpv3_report *pig;
         struct net *net = dev_net(dev);
         struct flowi4 fl4;
+        int hlen = LL_RESERVED_SPACE(dev);
+        int tlen = dev->needed_tailroom;
 
         while (1) {
-                skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev),
+                skb = alloc_skb(size + hlen + tlen,
                                 GFP_ATOMIC | __GFP_NOWARN);
                 if (skb)
                         break;
@@ -327,7 +329,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
         skb_dst_set(skb, &rt->dst);
         skb->dev = dev;
 
-        skb_reserve(skb, LL_RESERVED_SPACE(dev));
+        skb_reserve(skb, hlen);
 
         skb_reset_network_header(skb);
         pip = ip_hdr(skb);
@@ -647,6 +649,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
         __be32  group = pmc ? pmc->multiaddr : 0;
         struct flowi4 fl4;
         __be32  dst;
+        int hlen, tlen;
 
         if (type == IGMPV3_HOST_MEMBERSHIP_REPORT)
                 return igmpv3_send_report(in_dev, pmc);
@@ -661,7 +664,9 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
         if (IS_ERR(rt))
                 return -1;
 
-        skb = alloc_skb(IGMP_SIZE+LL_ALLOCATED_SPACE(dev), GFP_ATOMIC);
+        hlen = LL_RESERVED_SPACE(dev);
+        tlen = dev->needed_tailroom;
+        skb = alloc_skb(IGMP_SIZE + hlen + tlen, GFP_ATOMIC);
         if (skb == NULL) {
                 ip_rt_put(rt);
                 return -1;
@@ -669,7 +674,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
 
         skb_dst_set(skb, &rt->dst);
 
-        skb_reserve(skb, LL_RESERVED_SPACE(dev));
+        skb_reserve(skb, hlen);
 
         skb_reset_network_header(skb);
         iph = ip_hdr(skb);
@@ -1574,7 +1579,7 @@ out_unlock:
  * Add multicast single-source filter to the interface list
  */
 static int ip_mc_add1_src(struct ip_mc_list *pmc, int sfmode,
-        __be32 *psfsrc, int delta)
+        __be32 *psfsrc)
 {
         struct ip_sf_list *psf, *psf_prev;
 
@@ -1709,7 +1714,7 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode,
                 pmc->sfcount[sfmode]++;
         err = 0;
         for (i=0; i<sfcount; i++) {
-                err = ip_mc_add1_src(pmc, sfmode, &psfsrc[i], delta);
+                err = ip_mc_add1_src(pmc, sfmode, &psfsrc[i]);
                 if (err)
                         break;
         }