summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorEliad Peller2011-09-25 19:06:54 +0200
committerJohn W. Linville2011-09-27 20:34:11 +0200
commitf6f3def323e5d60cc2a5659533dce547c0aac5fc (patch)
tree9e5470eb3301c588f3ec75cc3f0ce504b50d77d5 /net/mac80211/cfg.c
parentcfg80211/mac80211: add netdev param to set_txq_params() (diff)
downloadkernel-qcow2-linux-f6f3def323e5d60cc2a5659533dce547c0aac5fc.tar.gz
kernel-qcow2-linux-f6f3def323e5d60cc2a5659533dce547c0aac5fc.tar.xz
kernel-qcow2-linux-f6f3def323e5d60cc2a5659533dce547c0aac5fc.zip
mac80211: save tx params per sdata
save and configure tx param per sdata, rather than per hardware. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 726fb8819b43..8fef3cddbc4f 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1275,6 +1275,7 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
struct ieee80211_txq_params *params)
{
struct ieee80211_local *local = wiphy_priv(wiphy);
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct ieee80211_tx_queue_params p;
if (!local->ops->conf_tx)
@@ -1295,8 +1296,8 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
if (params->queue >= local->hw.queues)
return -EINVAL;
- local->tx_conf[params->queue] = p;
- if (drv_conf_tx(local, params->queue, &p)) {
+ sdata->tx_conf[params->queue] = p;
+ if (drv_conf_tx(local, sdata, params->queue, &p)) {
wiphy_debug(local->hw.wiphy,
"failed to set TX queue parameters for queue %d\n",
params->queue);