5 files changed, 24 insertions, 8 deletions

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index d4e5ba22e246..de495c57aa90 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -118,7 +118,9 @@ static void __aarp_send_query(struct aarp_entry *a)
 
         /* Set up the buffer */
         skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);
-        skb->nh.raw      = skb->h.raw = skb_put(skb, sizeof(*eah));
+        skb_reset_network_header(skb);
+        skb->h.raw       = skb->data;
+        skb_put(skb, sizeof(*eah));
         skb->protocol    = htons(ETH_P_ATALK);
         skb->dev         = dev;
         eah              = aarp_hdr(skb);
@@ -163,7 +165,9 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us,
 
         /* Set up the buffer */
         skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);
-        skb->nh.raw      = skb->h.raw = skb_put(skb, sizeof(*eah));
+        skb_reset_network_header(skb);
+        skb->h.raw       = skb->data;
+        skb_put(skb, sizeof(*eah));
         skb->protocol    = htons(ETH_P_ATALK);
         skb->dev         = dev;
         eah              = aarp_hdr(skb);
@@ -212,7 +216,9 @@ static void aarp_send_probe(struct net_device *dev, struct atalk_addr *us)
 
         /* Set up the buffer */
         skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);
-        skb->nh.raw      = skb->h.raw = skb_put(skb, sizeof(*eah));
+        skb_reset_network_header(skb);
+        skb->h.raw       = skb->data;
+        skb_put(skb, sizeof(*eah));
         skb->protocol    = htons(ETH_P_ATALK);
         skb->dev         = dev;
         eah              = aarp_hdr(skb);
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 8cedb2a2c9df..d17ad09a83e0 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 = skb->nh.iph;
+        skb_put(skb, sizeof(struct iphdr) + 4);
 
         pip->version  = 4;
         pip->ihl      = (sizeof(struct iphdr)+4)>>2;
@@ -664,7 +666,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 = skb->nh.iph;
+        skb_put(skb, sizeof(struct iphdr) + 4);
 
         iph->version  = 4;
         iph->ihl      = (sizeof(struct iphdr)+4)>>2;
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 87e9c1618100..67e5e3c035c1 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -291,7 +291,9 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
         skb->priority = sk->sk_priority;
         skb->dst = dst_clone(&rt->u.dst);
 
-        skb->nh.iph = iph = (struct iphdr *)skb_put(skb, length);
+        skb_reset_network_header(skb);
+        iph = skb->nh.iph;
+        skb_put(skb, length);
 
         skb->ip_summed = CHECKSUM_NONE;
 
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 6c6c0a3a0ab5..9aa7b961b3eb 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -576,7 +576,9 @@ static struct sk_buff *ipxitf_adjust_skbuff(struct ipx_interface *intrfc,
         skb2 = alloc_skb(len, GFP_ATOMIC);
         if (skb2) {
                 skb_reserve(skb2, out_offset);
-                skb2->nh.raw = skb2->h.raw = skb_put(skb2, skb->len);
+                skb_reset_network_header(skb2);
+                skb2->h.raw = skb2->data;
+                skb_put(skb2, skb->len);
                 memcpy(ipx_hdr(skb2), ipx_hdr(skb), skb->len);
                 memcpy(skb2->cb, skb->cb, sizeof(skb->cb));
         }
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c
index 8e1cad971f11..e8277f544e72 100644
--- a/net/ipx/ipx_route.c
+++ b/net/ipx/ipx_route.c
@@ -203,7 +203,9 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
         skb->sk = sk;
 
         /* Fill in IPX header */
-        skb->h.raw = skb->nh.raw = skb_put(skb, sizeof(struct ipxhdr));
+        skb_reset_network_header(skb);
+        skb->h.raw = skb->data;
+        skb_put(skb, sizeof(struct ipxhdr));
         ipx = ipx_hdr(skb);
         ipx->ipx_pktsize = htons(len + sizeof(struct ipxhdr));
         IPX_SKB_CB(skb)->ipx_tctrl = 0;