Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

net/llc/llc_output.c

+4 −2
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ int llc_mac_hdr_init(struct sk_buff *skb, 
		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;
@@ -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);