1 files changed, 23 insertions, 20 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 8cedb2a2c9df..2506021c2935 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -314,7 +314,9 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
 
         skb_reserve(skb, LL_RESERVED_SPACE(dev));
 
-        skb->nh.iph = pip =(struct iphdr *)skb_put(skb, sizeof(struct iphdr)+4);
+        skb_reset_network_header(skb);
+        pip = ip_hdr(skb);
+        skb_put(skb, sizeof(struct iphdr) + 4);
 
         pip->version  = 4;
         pip->ihl      = (sizeof(struct iphdr)+4)>>2;
@@ -331,8 +333,9 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
         ((u8*)&pip[1])[2] = 0;
         ((u8*)&pip[1])[3] = 0;
 
-        pig =(struct igmpv3_report *)skb_put(skb, sizeof(*pig));
-        skb->h.igmph = (struct igmphdr *)pig;
+        skb->transport_header = skb->network_header + sizeof(struct iphdr) + 4;
+        skb_put(skb, sizeof(*pig));
+        pig = igmpv3_report_hdr(skb);
         pig->type = IGMPV3_HOST_MEMBERSHIP_REPORT;
         pig->resv1 = 0;
         pig->csum = 0;
@@ -343,16 +346,14 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
 
 static int igmpv3_sendpack(struct sk_buff *skb)
 {
-        struct iphdr *pip = skb->nh.iph;
-        struct igmphdr *pig = skb->h.igmph;
-        int iplen, igmplen;
+        struct iphdr *pip = ip_hdr(skb);
+        struct igmphdr *pig = igmp_hdr(skb);
+        const int iplen = skb->tail - skb->network_header;
+        const int igmplen = skb->tail - skb->transport_header;
 
-        iplen = skb->tail - (unsigned char *)skb->nh.iph;
         pip->tot_len = htons(iplen);
         ip_send_check(pip);
-
-        igmplen = skb->tail - (unsigned char *)skb->h.igmph;
-        pig->csum = ip_compute_csum((void *)skb->h.igmph, igmplen);
+        pig->csum = ip_compute_csum(igmp_hdr(skb), igmplen);
 
         return NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, skb->dev,
                        dst_output);
@@ -379,7 +380,7 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ip_mc_list *pmc,
         pgr->grec_auxwords = 0;
         pgr->grec_nsrcs = 0;
         pgr->grec_mca = pmc->multiaddr;
-        pih = (struct igmpv3_report *)skb->h.igmph;
+        pih = igmpv3_report_hdr(skb);
         pih->ngrec = htons(ntohs(pih->ngrec)+1);
         *ppgr = pgr;
         return skb;
@@ -412,7 +413,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc,
         if (!*psf_list)
                 goto empty_source;
 
-        pih = skb ? (struct igmpv3_report *)skb->h.igmph : NULL;
+        pih = skb ? igmpv3_report_hdr(skb) : NULL;
 
         /* EX and TO_EX get a fresh packet, if needed */
         if (truncate) {
@@ -664,7 +665,9 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
 
         skb_reserve(skb, LL_RESERVED_SPACE(dev));
 
-        skb->nh.iph = iph = (struct iphdr *)skb_put(skb, sizeof(struct iphdr)+4);
+        skb_reset_network_header(skb);
+        iph = ip_hdr(skb);
+        skb_put(skb, sizeof(struct iphdr) + 4);
 
         iph->version  = 4;
         iph->ihl      = (sizeof(struct iphdr)+4)>>2;
@@ -827,8 +830,8 @@ static void igmp_heard_report(struct in_device *in_dev, __be32 group)
 static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,
         int len)
 {
-        struct igmphdr          *ih = skb->h.igmph;
-        struct igmpv3_query *ih3 = (struct igmpv3_query *)ih;
+        struct igmphdr          *ih = igmp_hdr(skb);
+        struct igmpv3_query *ih3 = igmpv3_query_hdr(skb);
         struct ip_mc_list       *im;
         __be32                  group = ih->group;
         int                     max_delay;
@@ -861,12 +864,12 @@ static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,
                 if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)))
                         return;
 
-                ih3 = (struct igmpv3_query *) skb->h.raw;
+                ih3 = igmpv3_query_hdr(skb);
                 if (ih3->nsrcs) {
                         if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)
                                            + ntohs(ih3->nsrcs)*sizeof(__be32)))
                                 return;
-                        ih3 = (struct igmpv3_query *) skb->h.raw;
+                        ih3 = igmpv3_query_hdr(skb);
                 }
 
                 max_delay = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE);
@@ -943,7 +946,7 @@ int igmp_rcv(struct sk_buff *skb)
                         goto drop;
         }
 
-        ih = skb->h.igmph;
+        ih = igmp_hdr(skb);
         switch (ih->type) {
         case IGMP_HOST_MEMBERSHIP_QUERY:
                 igmp_heard_query(in_dev, skb, len);
@@ -2397,7 +2400,7 @@ static int igmp_mc_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations igmp_mc_seq_ops = {
+static const struct seq_operations igmp_mc_seq_ops = {
         .start  =       igmp_mc_seq_start,
         .next   =       igmp_mc_seq_next,
         .stop   =       igmp_mc_seq_stop,
@@ -2571,7 +2574,7 @@ static int igmp_mcf_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations igmp_mcf_seq_ops = {
+static const struct seq_operations igmp_mcf_seq_ops = {
         .start  =       igmp_mcf_seq_start,
         .next   =       igmp_mcf_seq_next,
         .stop   =       igmp_mcf_seq_stop,