X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fllc%2Fllc_sap.c;h=2525165e2e8fdb8a53e774f82f72f8acba4eb94e;hb=59c51591a0ac7568824f541f57de967e88adaa07;hp=2615dc81aa36f018e6120cbaada3b685accc4db2;hpb=81450b73dde07f473a4a7208b209b4c8b7251d90;p=linux-2.6

diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 2615dc81aa..2525165e2e 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -36,11 +36,12 @@ struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev)
 	struct sk_buff *skb = alloc_skb(128, GFP_ATOMIC);
 
 	if (skb) {
+		skb_reset_mac_header(skb);
 		skb_reserve(skb, 50);
-		skb->nh.raw   = skb->h.raw = skb->data;
+		skb_reset_network_header(skb);
+		skb_reset_transport_header(skb);
 		skb->protocol = htons(ETH_P_802_2);
 		skb->dev      = dev;
-		skb->mac.raw  = skb->head;
 		if (sk != NULL)
 			skb_set_owner_w(skb, sk);
 	}