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

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

ieee802154: 6lowpan: fix packet layer registration 



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: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4481c076

net/ieee802154/6lowpan/core.c

+17 −5
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ 




#include "6lowpan_i.h"

#include "6lowpan_i.h"





static int open_count;



static struct header_ops lowpan_header_ops = {

static struct header_ops lowpan_header_ops = {

	.create	= lowpan_header_create,

	.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);

	lowpan_netdev_setup(dev, LOWPAN_LLTYPE_IEEE802154);





	ret = register_netdevice(dev);

	ret = register_netdevice(dev);

	if (ret >= 0) {

	if (ret < 0) {

		dev_put(real_dev);

		return ret;

	}



	real_dev->ieee802154_ptr->lowpan_dev = dev;

	real_dev->ieee802154_ptr->lowpan_dev = dev;

	if (!open_count)

		lowpan_rx_init();

		lowpan_rx_init();

	}





	return ret;

	open_count++;



	return 0;

}

}





static void lowpan_dellink(struct net_device *dev, struct list_head *head)

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();

	ASSERT_RTNL();





	open_count--;



	if (!open_count)

		lowpan_rx_exit();

		lowpan_rx_exit();



	real_dev->ieee802154_ptr->lowpan_dev = NULL;

	real_dev->ieee802154_ptr->lowpan_dev = NULL;

	unregister_netdevice(dev);

	unregister_netdevice(dev);

	dev_put(real_dev);

	dev_put(real_dev);