summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-09-25 20:06:53 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-09-27 14:34:11 -0400
commitf70f01c2ebbe31fbd8a96be3b45c5620dac45b96 (patch)
tree4052a95a6ec1ab8fa51bfc1f8bae831d8aa5e592 /net/wireless
parentaad14ceb45f5ff12da2ab5b37a596e6f81566515 (diff)
downloadlinux-f70f01c2ebbe31fbd8a96be3b45c5620dac45b96.tar.gz
linux-f70f01c2ebbe31fbd8a96be3b45c5620dac45b96.tar.bz2
linux-f70f01c2ebbe31fbd8a96be3b45c5620dac45b96.zip
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)
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;