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

Commit 9c0346bd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan

parents 53bd9728 dfd06fe8

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2886,7 +2886,7 @@ P: Dmitry Eremin-Solenikov 
M:	dbaryshkov@gmail.com

P:	Sergey Lapin

M:	slapin@ossfans.org

L:	linux-zigbee-devel@lists.sourceforge.net

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git

S:	Maintained

net/ieee802154/netlink.c

+6 −0
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info) 
	else

		return NULL;



	if (!dev)

		return NULL;



	if (dev->type != ARPHRD_IEEE802154) {

		dev_put(dev);

		return NULL;
@@ -521,3 +524,6 @@ static void __exit ieee802154_nl_exit(void) 
}

module_exit(ieee802154_nl_exit);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("ieee 802.15.4 configuration interface");