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

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

ieee802154: 6lowpan: change if lowpan dev is running 



We don't need to check if the wpan interface is running because the
lowpan_rcv is the packet layer receive handler for the wpan interface.

Instead doing a check if wpan interface is running we should check if
the lowpan interface is running before starting 6lowpan adaptation layer.

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 348a882e

net/ieee802154/6lowpan/rx.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -65,19 +65,20 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *wdev, 
		      struct packet_type *pt, struct net_device *orig_wdev)

		      struct packet_type *pt, struct net_device *orig_wdev)

{

{

	struct ieee802154_hdr hdr;

	struct ieee802154_hdr hdr;

	struct net_device *ldev;

	int ret;

	int ret;





	if (wdev->type != ARPHRD_IEEE802154 ||

	if (wdev->type != ARPHRD_IEEE802154)

	    !wdev->ieee802154_ptr->lowpan_dev)

		goto drop;



	ldev = wdev->ieee802154_ptr->lowpan_dev;

	if (!ldev || !netif_running(ldev))

		goto drop;

		goto drop;





	skb = skb_share_check(skb, GFP_ATOMIC);

	skb = skb_share_check(skb, GFP_ATOMIC);

	if (!skb)

	if (!skb)

		goto drop;

		goto drop;





	if (!netif_running(wdev))

		goto drop_skb;



	if (skb->pkt_type == PACKET_OTHERHOST)

	if (skb->pkt_type == PACKET_OTHERHOST)

		goto drop_skb;

		goto drop_skb;