diff options
author | Eliad Peller <eliad@wizery.com> | 2011-10-02 04:15:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-03 15:22:41 -0400 |
commit | 8a3a3c85e44d58f5af0adac74a0b866ba89a1978 (patch) | |
tree | e64861307d417743de6992122debc99fab744124 /drivers/net/wireless/rt2x00 | |
parent | 3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33 (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/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 5 |
7 files changed, 18 insertions, 11 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 7e9272b8f01d..3a6b40239bc1 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -1648,7 +1648,8 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev) | |||
1648 | /* | 1648 | /* |
1649 | * IEEE80211 stack callback functions. | 1649 | * IEEE80211 stack callback functions. |
1650 | */ | 1650 | */ |
1651 | static int rt2400pci_conf_tx(struct ieee80211_hw *hw, u16 queue, | 1651 | static int rt2400pci_conf_tx(struct ieee80211_hw *hw, |
1652 | struct ieee80211_vif *vif, u16 queue, | ||
1652 | const struct ieee80211_tx_queue_params *params) | 1653 | const struct ieee80211_tx_queue_params *params) |
1653 | { | 1654 | { |
1654 | struct rt2x00_dev *rt2x00dev = hw->priv; | 1655 | struct rt2x00_dev *rt2x00dev = hw->priv; |
@@ -1661,7 +1662,7 @@ static int rt2400pci_conf_tx(struct ieee80211_hw *hw, u16 queue, | |||
1661 | if (queue != 0) | 1662 | if (queue != 0) |
1662 | return -EINVAL; | 1663 | return -EINVAL; |
1663 | 1664 | ||
1664 | if (rt2x00mac_conf_tx(hw, queue, params)) | 1665 | if (rt2x00mac_conf_tx(hw, vif, queue, params)) |
1665 | return -EINVAL; | 1666 | return -EINVAL; |
1666 | 1667 | ||
1667 | /* | 1668 | /* |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 9688dd0a7ebd..3f183a15186e 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -4398,7 +4398,8 @@ int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value) | |||
4398 | } | 4398 | } |
4399 | EXPORT_SYMBOL_GPL(rt2800_set_rts_threshold); | 4399 | EXPORT_SYMBOL_GPL(rt2800_set_rts_threshold); |
4400 | 4400 | ||
4401 | int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | 4401 | int rt2800_conf_tx(struct ieee80211_hw *hw, |
4402 | struct ieee80211_vif *vif, u16 queue_idx, | ||
4402 | const struct ieee80211_tx_queue_params *params) | 4403 | const struct ieee80211_tx_queue_params *params) |
4403 | { | 4404 | { |
4404 | struct rt2x00_dev *rt2x00dev = hw->priv; | 4405 | struct rt2x00_dev *rt2x00dev = hw->priv; |
@@ -4414,7 +4415,7 @@ int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | |||
4414 | * we are free to update the registers based on the value | 4415 | * we are free to update the registers based on the value |
4415 | * in the queue parameter. | 4416 | * in the queue parameter. |
4416 | */ | 4417 | */ |
4417 | retval = rt2x00mac_conf_tx(hw, queue_idx, params); | 4418 | retval = rt2x00mac_conf_tx(hw, vif, queue_idx, params); |
4418 | if (retval) | 4419 | if (retval) |
4419 | return retval; | 4420 | return retval; |
4420 | 4421 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h index 6de128e9c612..8c3c281904fe 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/rt2x00/rt2800lib.h | |||
@@ -197,7 +197,8 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev); | |||
197 | void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32, | 197 | void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32, |
198 | u16 *iv16); | 198 | u16 *iv16); |
199 | int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value); | 199 | int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value); |
200 | int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | 200 | int rt2800_conf_tx(struct ieee80211_hw *hw, |
201 | struct ieee80211_vif *vif, u16 queue_idx, | ||
201 | const struct ieee80211_tx_queue_params *params); | 202 | const struct ieee80211_tx_queue_params *params); |
202 | u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif); | 203 | u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif); |
203 | int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | 204 | int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index cbf8eb334e96..2ec5c00235e6 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -1299,7 +1299,8 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | |||
1299 | struct ieee80211_vif *vif, | 1299 | struct ieee80211_vif *vif, |
1300 | struct ieee80211_bss_conf *bss_conf, | 1300 | struct ieee80211_bss_conf *bss_conf, |
1301 | u32 changes); | 1301 | u32 changes); |
1302 | int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue, | 1302 | int rt2x00mac_conf_tx(struct ieee80211_hw *hw, |
1303 | struct ieee80211_vif *vif, u16 queue, | ||
1303 | const struct ieee80211_tx_queue_params *params); | 1304 | const struct ieee80211_tx_queue_params *params); |
1304 | void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw); | 1305 | void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw); |
1305 | void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop); | 1306 | void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index cef1c878c37e..bf0acff07807 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -713,7 +713,8 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | |||
713 | } | 713 | } |
714 | EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed); | 714 | EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed); |
715 | 715 | ||
716 | int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | 716 | int rt2x00mac_conf_tx(struct ieee80211_hw *hw, |
717 | struct ieee80211_vif *vif, u16 queue_idx, | ||
717 | const struct ieee80211_tx_queue_params *params) | 718 | const struct ieee80211_tx_queue_params *params) |
718 | { | 719 | { |
719 | struct rt2x00_dev *rt2x00dev = hw->priv; | 720 | struct rt2x00_dev *rt2x00dev = hw->priv; |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 6b6a8e2dcddc..bf55b4a311e3 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -2883,7 +2883,8 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev) | |||
2883 | /* | 2883 | /* |
2884 | * IEEE80211 stack callback functions. | 2884 | * IEEE80211 stack callback functions. |
2885 | */ | 2885 | */ |
2886 | static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | 2886 | static int rt61pci_conf_tx(struct ieee80211_hw *hw, |
2887 | struct ieee80211_vif *vif, u16 queue_idx, | ||
2887 | const struct ieee80211_tx_queue_params *params) | 2888 | const struct ieee80211_tx_queue_params *params) |
2888 | { | 2889 | { |
2889 | struct rt2x00_dev *rt2x00dev = hw->priv; | 2890 | struct rt2x00_dev *rt2x00dev = hw->priv; |
@@ -2899,7 +2900,7 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | |||
2899 | * we are free to update the registers based on the value | 2900 | * we are free to update the registers based on the value |
2900 | * in the queue parameter. | 2901 | * in the queue parameter. |
2901 | */ | 2902 | */ |
2902 | retval = rt2x00mac_conf_tx(hw, queue_idx, params); | 2903 | retval = rt2x00mac_conf_tx(hw, vif, queue_idx, params); |
2903 | if (retval) | 2904 | if (retval) |
2904 | return retval; | 2905 | return retval; |
2905 | 2906 | ||
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 6f51e39f5595..cfb19dbb0a67 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -2222,7 +2222,8 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev) | |||
2222 | /* | 2222 | /* |
2223 | * IEEE80211 stack callback functions. | 2223 | * IEEE80211 stack callback functions. |
2224 | */ | 2224 | */ |
2225 | static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | 2225 | static int rt73usb_conf_tx(struct ieee80211_hw *hw, |
2226 | struct ieee80211_vif *vif, u16 queue_idx, | ||
2226 | const struct ieee80211_tx_queue_params *params) | 2227 | const struct ieee80211_tx_queue_params *params) |
2227 | { | 2228 | { |
2228 | struct rt2x00_dev *rt2x00dev = hw->priv; | 2229 | struct rt2x00_dev *rt2x00dev = hw->priv; |
@@ -2238,7 +2239,7 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | |||
2238 | * we are free to update the registers based on the value | 2239 | * we are free to update the registers based on the value |
2239 | * in the queue parameter. | 2240 | * in the queue parameter. |
2240 | */ | 2241 | */ |
2241 | retval = rt2x00mac_conf_tx(hw, queue_idx, params); | 2242 | retval = rt2x00mac_conf_tx(hw, vif, queue_idx, params); |
2242 | if (retval) | 2243 | if (retval) |
2243 | return retval; | 2244 | return retval; |
2244 | 2245 | ||