hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
David S. Miller 2009-06-29 19:23:53 -07:00
parent 53bd9728bf dfd06fe824
commit 9c0346bd08
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -2886,7 +2886,7 @@ P: Dmitry Eremin-Solenikov
M: dbaryshkov@gmail.com M: dbaryshkov@gmail.com
P: Sergey Lapin P: Sergey Lapin
M: slapin@ossfans.org 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 W: http://apps.sourceforge.net/trac/linux-zigbee
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
S: Maintained S: Maintained

6
net/ieee802154/netlink.c
View File

@ -276,6 +276,9 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)
else else
return NULL; return NULL;
if (!dev)
return NULL;
if (dev->type != ARPHRD_IEEE802154) { if (dev->type != ARPHRD_IEEE802154) {
dev_put(dev); dev_put(dev);
return NULL; return NULL;
@ -521,3 +524,6 @@ static void __exit ieee802154_nl_exit(void)
} }
module_exit(ieee802154_nl_exit); module_exit(ieee802154_nl_exit);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("ieee 802.15.4 configuration interface");