diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-29 19:23:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-29 19:23:53 -0700 |
| commit | 9c0346bd0891eb009f5cd08b868ff41c65804dbe (patch) | |
| tree | 51dcbdfc4895e81f60f37fe2e5b59b1207fe5c2b | |
| parent | 53bd9728bf9be7fc3b3147e821dbeb71d767c354 (diff) | |
| parent | dfd06fe8246c0425f8d6850b8e2c872b0d691ec3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | net/ieee802154/netlink.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa2a16def17..28c150e916a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c index 105ad10876a..27eda9fdf3c 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"); + |