summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-30 06:23:53 +0400
committerDavid S. Miller <davem@davemloft.net>2009-06-30 06:23:53 +0400
commit9c0346bd0891eb009f5cd08b868ff41c65804dbe (patch)
tree51dcbdfc4895e81f60f37fe2e5b59b1207fe5c2b /net
parent53bd9728bf9be7fc3b3147e821dbeb71d767c354 (diff)
parentdfd06fe8246c0425f8d6850b8e2c872b0d691ec3 (diff)
downloadlinux-9c0346bd0891eb009f5cd08b868ff41c65804dbe.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'net')
-rw-r--r--net/ieee802154/netlink.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index 105ad10876af..27eda9fdf3c2 100644
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -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");
+