diff options
author | Eliad Peller <eliad@wizery.com> | 2011-09-25 13:06:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 14:34:11 -0400 |
commit | f6f3def323e5d60cc2a5659533dce547c0aac5fc (patch) | |
tree | 9e5470eb3301c588f3ec75cc3f0ce504b50d77d5 /net/mac80211/cfg.c | |
parent | f70f01c2ebbe31fbd8a96be3b45c5620dac45b96 (diff) |
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.c | 5 |
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, | |||
1275 | struct ieee80211_txq_params *params) | 1275 | struct ieee80211_txq_params *params) |
1276 | { | 1276 | { |
1277 | struct ieee80211_local *local = wiphy_priv(wiphy); | 1277 | struct ieee80211_local *local = wiphy_priv(wiphy); |
1278 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | ||
1278 | struct ieee80211_tx_queue_params p; | 1279 | struct ieee80211_tx_queue_params p; |
1279 | 1280 | ||
1280 | if (!local->ops->conf_tx) | 1281 | if (!local->ops->conf_tx) |
@@ -1295,8 +1296,8 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy, | |||
1295 | if (params->queue >= local->hw.queues) | 1296 | if (params->queue >= local->hw.queues) |
1296 | return -EINVAL; | 1297 | return -EINVAL; |
1297 | 1298 | ||
1298 | local->tx_conf[params->queue] = p; | 1299 | sdata->tx_conf[params->queue] = p; |
1299 | if (drv_conf_tx(local, params->queue, &p)) { | 1300 | if (drv_conf_tx(local, sdata, params->queue, &p)) { |
1300 | wiphy_debug(local->hw.wiphy, | 1301 | wiphy_debug(local->hw.wiphy, |
1301 | "failed to set TX queue parameters for queue %d\n", | 1302 | "failed to set TX queue parameters for queue %d\n", |
1302 | params->queue); | 1303 | params->queue); |