From b95ab4dcc02738433ae0e6e32ea941dcf3c3cc98 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Sun, 25 Sep 2011 20:06:53 +0300
Subject: [PATCH] --- yaml --- r: 266390 b: refs/heads/master c:
 f70f01c2ebbe31fbd8a96be3b45c5620dac45b96 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 2 +-
 trunk/net/mac80211/cfg.c     | 1 +
 trunk/net/wireless/nl80211.c | 6 ++++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7370d1a49883..6386ede3e457 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aad14ceb45f5ff12da2ab5b37a596e6f81566515
+refs/heads/master: f70f01c2ebbe31fbd8a96be3b45c5620dac45b96
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index c1dd56b7cce5..31d823a3092b 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -1486,7 +1486,7 @@ struct cfg80211_ops {
 	int	(*change_bss)(struct wiphy *wiphy, struct net_device *dev,
 			      struct bss_parameters *params);
 
-	int	(*set_txq_params)(struct wiphy *wiphy,
+	int	(*set_txq_params)(struct wiphy *wiphy, struct net_device *dev,
 				  struct ieee80211_txq_params *params);
 
 	int	(*set_channel)(struct wiphy *wiphy, struct net_device *dev,
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 56c35041ba97..726fb8819b43 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1271,6 +1271,7 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
 }
 
 static int ieee80211_set_txq_params(struct wiphy *wiphy,
+				    struct net_device *dev,
 				    struct ieee80211_txq_params *params)
 {
 	struct ieee80211_local *local = wiphy_priv(wiphy);
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 48c1bf1a142d..74d16192fbf0 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -1236,6 +1236,11 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 			goto bad_res;
 		}
 
+		if (!netdev) {
+			result = -EINVAL;
+			goto bad_res;
+		}
+
 		nla_for_each_nested(nl_txq_params,
 				    info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
 				    rem_txq_params) {
@@ -1248,6 +1253,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 				goto bad_res;
 
 			result = rdev->ops->set_txq_params(&rdev->wiphy,
+							   netdev,
 							   &txq_params);
 			if (result)
 				goto bad_res;