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

Commit f801cf40 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

ieee802154: 6lowpan: earlier skb->dev switch 



We should change the skb->dev pointer earlier to the lowpan interface
Sometimes we call iphc_decompress which also use some netdev printout
functionality. This patch will change that the correct interface will be
displayed in this case, which should be the lowpan interface.

Reviewed-by: default avatarStefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 742c3afe

net/ieee802154/6lowpan/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
static int lowpan_give_skb_to_device(struct sk_buff *skb,

				     struct net_device *wdev)

{

	skb->dev = wdev->ieee802154_ptr->lowpan_dev;

	skb->protocol = htons(ETH_P_IPV6);

	skb->pkt_type = PACKET_HOST;
@@ -71,9 +70,11 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *wdev, 
	if (!ldev || !netif_running(ldev))

		goto drop;



	/* Replacing skb->dev and followed rx handlers will manipulate skb. */

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (!skb)

		goto drop;

	skb->dev = ldev;



	if (ieee802154_hdr_peek_addrs(skb, &hdr) < 0)

		goto drop_skb;