From fdf2ec6000f102c3b75afa40909a25c9fb9793e4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 8 Oct 2009 21:02:02 +0200
Subject: [PATCH] --- yaml --- r: 167518 b: refs/heads/master c:
 8a8e05e5d8f6155788761961fc9845328863c16d h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index af446a0f1c44..95424dc07e09 100644
--- 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
index eddab097435c..ca3c92a0a14f 100644
--- 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;
 }