leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ieee802154: 6lowpan: fix packet layer registration

Browse Source 
This patch fixes 802.15.4 packet layer registration when mutliple
lowpan interfaces will be added. We need to register the packet layer at
the first lowpan interface and deregister it at the last interface. This
done by open_count variable which is protected by rtnl.

Additional do a quiet fix by adding dev_put(real_dev) when netdev
registration fails, which fix the refcount for the wpan dev.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2015-08-15 11:00:32 +02:00 committed by Marcel Holtmann
parent 4481c0767e
commit 0751272880
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/ieee802154/6lowpan/core.c
View File

@ -52,6 +52,8 @@
#include "6lowpan_i.h"
static int open_count;
static struct header_ops lowpan_header_ops = {
.create = lowpan_header_create,
};
@ -141,12 +143,18 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev,
lowpan_netdev_setup(dev, LOWPAN_LLTYPE_IEEE802154);
ret = register_netdevice(dev);
if (ret >= 0) {
real_dev->ieee802154_ptr->lowpan_dev = dev;
lowpan_rx_init();
if (ret < 0) {
dev_put(real_dev);
return ret;
}
return ret;
real_dev->ieee802154_ptr->lowpan_dev = dev;
if (!open_count)
lowpan_rx_init();
open_count++;
return 0;
}
static void lowpan_dellink(struct net_device *dev, struct list_head *head)
@ -156,7 +164,11 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
ASSERT_RTNL();
lowpan_rx_exit();
open_count--;
if (!open_count)
lowpan_rx_exit();
real_dev->ieee802154_ptr->lowpan_dev = NULL;
unregister_netdevice(dev);
dev_put(real_dev);