Re: [RFCv2 bluetooth-next 06/16] ieee802154: 6lowpan: change if lowpan dev is running

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello.

On 30/08/15 23:51, Stefan Schmidt wrote:
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 <alex.aring@xxxxxxxxx>
---
  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 <stefan@xxxxxxxxxxxxxxx>


This should also have been

Reviewed-by: Stefan Schmidt <stefan@xxxxxxxxxxxxxxx>

regards
Stefan Schmidt
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux