aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-05 20:51:16 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-11-05 21:53:03 +0100
commit12cb56c2370b2911295026630a71af044c12d2aa (patch)
tree068e842eb808e8b4d6d0653165902c63db577d59
parentmac802154: move interface add handling in iface (diff)
downloadlinux-dev-12cb56c2370b2911295026630a71af044c12d2aa.tar.xz
linux-dev-12cb56c2370b2911295026630a71af044c12d2aa.zip
mac802154: move dev_hold out of ieee802154_if_add
This patch moves the dev_hold call inside of nl-phy ieee802154_add_iface function. The ieee802154_add_iface is the only one function which use the ieee802154_if_add function and contains the corresponding dev_put call. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/ieee802154/nl-phy.c1
-rw-r--r--net/mac802154/iface.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index 5d914d30e0b1..397ca126d9a2 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -226,6 +226,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info)
rc = PTR_ERR(dev);
goto nla_put_failure;
}
+ dev_hold(dev);
if (info->attrs[IEEE802154_ATTR_HW_ADDR]) {
struct sockaddr addr;
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index fced04b05275..78cb38124a2a 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -501,7 +501,6 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name,
if (err)
goto err_free;
- dev_hold(dev); /* we return an incremented device refcount */
return dev;
err_free: