aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc/llc_sap.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 10:14:56 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:34 -0400
commit0a1b0ad9ae27f918fd935c6da101083e11446f09 (patch)
tree87050d750fb3c0a467558db8168dae422983f6fa /net/llc/llc_sap.c
parent459a98ed881802dee55897441bc7f77af614368e (diff)
[LLC]: Use skb_reset_mac_header in llc_alloc_frame
skb->head is equal to skb->data after alloc_skb, so reset the mac header while this is true, i.e. before skb_reserve. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc/llc_sap.c')
-rw-r--r--net/llc/llc_sap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 2615dc81aa36..5fa31117e46b 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -36,11 +36,11 @@ struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev)
36 struct sk_buff *skb = alloc_skb(128, GFP_ATOMIC); 36 struct sk_buff *skb = alloc_skb(128, GFP_ATOMIC);
37 37
38 if (skb) { 38 if (skb) {
39 skb_reset_mac_header(skb);
39 skb_reserve(skb, 50); 40 skb_reserve(skb, 50);
40 skb->nh.raw = skb->h.raw = skb->data; 41 skb->nh.raw = skb->h.raw = skb->data;
41 skb->protocol = htons(ETH_P_802_2); 42 skb->protocol = htons(ETH_P_802_2);
42 skb->dev = dev; 43 skb->dev = dev;
43 skb->mac.raw = skb->head;
44 if (sk != NULL) 44 if (sk != NULL)
45 skb_set_owner_w(skb, sk); 45 skb_set_owner_w(skb, sk);
46 } 46 }