Commit f64955eb authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller

[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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a1b0ad9
...@@ -41,7 +41,8 @@ int llc_mac_hdr_init(struct sk_buff *skb, ...@@ -41,7 +41,8 @@ int llc_mac_hdr_init(struct sk_buff *skb,
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
struct trh_hdr *trh; 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 = tr_hdr(skb);
trh->ac = AC; trh->ac = AC;
trh->fc = LLC_FRAME; trh->fc = LLC_FRAME;
...@@ -62,7 +63,8 @@ int llc_mac_hdr_init(struct sk_buff *skb, ...@@ -62,7 +63,8 @@ int llc_mac_hdr_init(struct sk_buff *skb,
unsigned short len = skb->len; unsigned short len = skb->len;
struct ethhdr *eth; 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 = eth_hdr(skb);
eth->h_proto = htons(len); eth->h_proto = htons(len);
memcpy(eth->h_dest, da, ETH_ALEN); memcpy(eth->h_dest, da, ETH_ALEN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment