---

yaml --- r: 167518 b: refs/heads/master c: 8a8e05e h: refs/heads/master v: v3
git-mirror · Oct 8, 2009 · fdf2ec6 · fdf2ec6
1 parent 1e176c0
commit fdf2ec6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e937c633f718e0916a294db7282c922c1bf3ce3
+refs/heads/master: 8a8e05e5d8f6155788761961fc9845328863c16d
diff --git a/trunk/net/wireless/nl80211.c b/trunk/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;
 }