aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwl8k.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-02 04:15:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-03 15:22:41 -0400
commit8a3a3c85e44d58f5af0adac74a0b866ba89a1978 (patch)
treee64861307d417743de6992122debc99fab744124 /drivers/net/wireless/mwl8k.c
parent3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33 (diff)
mac80211: pass vif param to conf_tx() callback
tx params should be configured per interface. add ieee80211_vif param to the conf_tx callback, and change all the drivers that use this callback. The following spatch was used: @rule1@ struct ieee80211_ops ops; identifier conf_tx_op; @@ ops.conf_tx = conf_tx_op; @rule2@ identifier rule1.conf_tx_op; identifier hw, queue, params; @@ conf_tx_op ( - struct ieee80211_hw *hw, + struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue, const struct ieee80211_tx_queue_params *params) {...} Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r--drivers/net/wireless/mwl8k.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index ea1395aafa39..995695c28d5c 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -4915,7 +4915,8 @@ static int mwl8k_sta_add(struct ieee80211_hw *hw,
4915 return ret; 4915 return ret;
4916} 4916}
4917 4917
4918static int mwl8k_conf_tx(struct ieee80211_hw *hw, u16 queue, 4918static int mwl8k_conf_tx(struct ieee80211_hw *hw,
4919 struct ieee80211_vif *vif, u16 queue,
4919 const struct ieee80211_tx_queue_params *params) 4920 const struct ieee80211_tx_queue_params *params)
4920{ 4921{
4921 struct mwl8k_priv *priv = hw->priv; 4922 struct mwl8k_priv *priv = hw->priv;
@@ -5462,7 +5463,7 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)
5462 goto fail; 5463 goto fail;
5463 5464
5464 for (i = 0; i < MWL8K_TX_WMM_QUEUES; i++) { 5465 for (i = 0; i < MWL8K_TX_WMM_QUEUES; i++) {
5465 rc = mwl8k_conf_tx(hw, i, &priv->wmm_params[i]); 5466 rc = mwl8k_conf_tx(hw, NULL, i, &priv->wmm_params[i]);
5466 if (rc) 5467 if (rc)
5467 goto fail; 5468 goto fail;
5468 } 5469 }