X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=net%2Fllc%2Fllc_output.c;h=754f4fedc852fb6181d5c5bed0146096d5ff12f4;hb=d00953a53e9a2edbe005c1e596f1e96a8a293401;hp=b4e668e0e12c46da8b7f5cbf1a6a24a9c5da73ba;hpb=ca94f26d2b2ee8ad76be617b35f846444fedc07b;p=linux-2.6-omap-h63xx.git

diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index b4e668e0e12..754f4fedc85 100644
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -40,8 +40,9 @@ int llc_mac_hdr_init(struct sk_buff *skb,
 	case ARPHRD_IEEE802_TR: {
 		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;
@@ -52,7 +53,7 @@ int llc_mac_hdr_init(struct sk_buff *skb,
 		if (da) {
 			memcpy(trh->daddr, da, dev->addr_len);
 			tr_source_route(skb, trh, dev);
-			skb->mac.raw = skb->data;
+			skb_reset_mac_header(skb);
 		}
 		break;
 	}
@@ -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);