From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.s-osg.org ([54.187.51.154]:32940 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751794AbbH3Vvr (ORCPT ); Sun, 30 Aug 2015 17:51:47 -0400 Subject: Re: [RFCv2 bluetooth-next 06/16] ieee802154: 6lowpan: change if lowpan dev is running References: <1440089265-23366-1-git-send-email-alex.aring@gmail.com> <1440089265-23366-7-git-send-email-alex.aring@gmail.com> From: Stefan Schmidt Message-ID: <55E37AEF.80703@osg.samsung.com> Date: Sun, 30 Aug 2015 23:51:43 +0200 MIME-Version: 1.0 In-Reply-To: <1440089265-23366-7-git-send-email-alex.aring@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-wpan-owner@vger.kernel.org List-ID: To: Alexander Aring , linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de Hello. On 20/08/15 18:47, Alexander Aring wrote: > 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. > > Signed-off-by: Alexander Aring > --- > net/ieee802154/6lowpan/rx.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/net/ieee802154/6lowpan/rx.c b/net/ieee802154/6lowpan/rx.c > index b1442f3..c529d9f 100644 > --- a/net/ieee802154/6lowpan/rx.c > +++ b/net/ieee802154/6lowpan/rx.c > @@ -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 ieee802154_hdr hdr; > + struct net_device *ldev; > int ret; > > - if (wdev->type != ARPHRD_IEEE802154 || > - !wdev->ieee802154_ptr->lowpan_dev) > + if (wdev->type != ARPHRD_IEEE802154) > + goto drop; > + > + ldev = wdev->ieee802154_ptr->lowpan_dev; > + if (!ldev || !netif_running(ldev)) > goto drop; > > skb = skb_share_check(skb, GFP_ATOMIC); > if (!skb) > goto drop; > > - if (!netif_running(wdev)) > - goto drop_skb; > - > if (skb->pkt_type == PACKET_OTHERHOST) > goto drop_skb; > Signed-off-by: Stefan Schmidt regards Stefan Schmidt