aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-09-25 13:06:53 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-27 14:34:11 -0400
commitf70f01c2ebbe31fbd8a96be3b45c5620dac45b96 (patch)
tree4052a95a6ec1ab8fa51bfc1f8bae831d8aa5e592 /net/wireless
parentaad14ceb45f5ff12da2ab5b37a596e6f81566515 (diff)
cfg80211/mac80211: add netdev param to set_txq_params()
tx params are currently configured per hw, although they should be configured per interface. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 48c1bf1a142d..74d16192fbf0 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1236,6 +1236,11 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
1236 goto bad_res; 1236 goto bad_res;
1237 } 1237 }
1238 1238
1239 if (!netdev) {
1240 result = -EINVAL;
1241 goto bad_res;
1242 }
1243
1239 nla_for_each_nested(nl_txq_params, 1244 nla_for_each_nested(nl_txq_params,
1240 info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS], 1245 info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
1241 rem_txq_params) { 1246 rem_txq_params) {
@@ -1248,6 +1253,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
1248 goto bad_res; 1253 goto bad_res;
1249 1254
1250 result = rdev->ops->set_txq_params(&rdev->wiphy, 1255 result = rdev->ops->set_txq_params(&rdev->wiphy,
1256 netdev,
1251 &txq_params); 1257 &txq_params);
1252 if (result) 1258 if (result)
1253 goto bad_res; 1259 goto bad_res;