aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 10:17:29 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:35 -0400
commitf64955eb117ad62480b858fd69a11e6f9e74f60b (patch)
treec61c51a7d8241b96f7973424c66bac87896b6158
parent0a1b0ad9ae27f918fd935c6da101083e11446f09 (diff)
[LLC]: Use skb_reset_mac_header in llc_mac_hdr_init
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>
-rw-r--r--net/llc/llc_output.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index 729e25108275..754f4fedc852 100644
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -41,7 +41,8 @@ int llc_mac_hdr_init(struct sk_buff *skb,
41 struct net_device *dev = skb->dev; 41 struct net_device *dev = skb->dev;
42 struct trh_hdr *trh; 42 struct trh_hdr *trh;
43 43
44 skb->mac.raw = skb_push(skb, sizeof(*trh)); 44 skb_push(skb, sizeof(*trh));
45 skb_reset_mac_header(skb);
45 trh = tr_hdr(skb); 46 trh = tr_hdr(skb);
46 trh->ac = AC; 47 trh->ac = AC;
47 trh->fc = LLC_FRAME; 48 trh->fc = LLC_FRAME;
@@ -62,7 +63,8 @@ int llc_mac_hdr_init(struct sk_buff *skb,
62 unsigned short len = skb->len; 63 unsigned short len = skb->len;
63 struct ethhdr *eth; 64 struct ethhdr *eth;
64 65
65 skb->mac.raw = skb_push(skb, sizeof(*eth)); 66 skb_push(skb, sizeof(*eth));
67 skb_reset_mac_header(skb);
66 eth = eth_hdr(skb); 68 eth = eth_hdr(skb);
67 eth->h_proto = htons(len); 69 eth->h_proto = htons(len);
68 memcpy(eth->h_dest, da, ETH_ALEN); 70 memcpy(eth->h_dest, da, ETH_ALEN);