diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
| commit | 67972e0c238fa802580b5919f11e1de3da5179da (patch) | |
| tree | 27022c957154a9d36fc8aa0f020bed523e7849b3 /net/wireless/nl80211.c | |
| parent | ad61df918c44316940404891d5082c63e79c256a (diff) | |
| parent | 8a8e05e5d8f6155788761961fc9845328863c16d (diff) | |
| download | op-kernel-dev-67972e0c238fa802580b5919f11e1de3da5179da.zip op-kernel-dev-67972e0c238fa802580b5919f11e1de3da5179da.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index eddab09..ca3c92a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4029,7 +4029,7 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) rdev = cfg80211_get_dev_from_info(info); if (IS_ERR(rdev)) { err = PTR_ERR(rdev); - goto out; + goto out_rtnl; } net = get_net_ns_by_pid(pid); @@ -4049,6 +4049,7 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) put_net(net); out: cfg80211_unlock_rdev(rdev); + out_rtnl: rtnl_unlock(); return err; } |
