[SK_BUFF]: Use skb_reset_network_header where the skb_pull return was being used

But only in the cases where its a newly allocated skb, i.e. one where skb->tail
is equal to skb->data, or just after skb_reserve, where this requirement is
maintained.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 3 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);