Skip to content

L
linux-davinci
Commit 9c0346bd authored by David S. Miller's avatar David S. Miller
Browse files
Options

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

parents 53bd9728 dfd06fe8
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
MAINTAINERS
View file @ 9c0346bd
...@@ -2886,7 +2886,7 @@ P: Dmitry Eremin-Solenikov ...@@ -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
......
net/ieee802154/netlink.c
View file @ 9c0346bd
...@@ -276,6 +276,9 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info) ...@@ -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) ...@@ -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");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment