[LLC]: Use skb_reset_mac_header in llc_mac_hdr_init
Arnaldo Carvalho de Melo [Sat, 10 Mar 2007 15:17:29 +0000 (12:17 -0300)]
skb_push updates and returns skb->data, so we can just call
skb_reset_mac_header after the call to skb_push.

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

net/llc/llc_output.c

index 729e251..754f4fe 100644 (file)
@@ -41,7 +41,8 @@ int llc_mac_hdr_init(struct sk_buff *skb,
                struct net_device *dev = skb->dev;
                struct trh_hdr *trh;
 
-               skb->mac.raw = skb_push(skb, sizeof(*trh));
+               skb_push(skb, sizeof(*trh));
+               skb_reset_mac_header(skb);
                trh = tr_hdr(skb);
                trh->ac = AC;
                trh->fc = LLC_FRAME;
@@ -62,7 +63,8 @@ int llc_mac_hdr_init(struct sk_buff *skb,
                unsigned short len = skb->len;
                struct ethhdr *eth;
 
-               skb->mac.raw = skb_push(skb, sizeof(*eth));
+               skb_push(skb, sizeof(*eth));
+               skb_reset_mac_header(skb);
                eth = eth_hdr(skb);
                eth->h_proto = htons(len);
                memcpy(eth->h_dest, da, ETH_ALEN);