aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c5
-rw-r--r--drivers/net/wireless/rt2x00/rt2500pci.c3
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.h2
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c2
6 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index daa32fc9398..7e9272b8f01 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1239,7 +1239,7 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry,
1239 * call, we must decrease the higher 32bits with 1 to get 1239 * call, we must decrease the higher 32bits with 1 to get
1240 * to correct value. 1240 * to correct value.
1241 */ 1241 */
1242 tsf = rt2x00dev->ops->hw->get_tsf(rt2x00dev->hw); 1242 tsf = rt2x00dev->ops->hw->get_tsf(rt2x00dev->hw, NULL);
1243 rx_low = rt2x00_get_field32(word4, RXD_W4_RX_END_TIME); 1243 rx_low = rt2x00_get_field32(word4, RXD_W4_RX_END_TIME);
1244 rx_high = upper_32_bits(tsf); 1244 rx_high = upper_32_bits(tsf);
1245 1245
@@ -1673,7 +1673,8 @@ static int rt2400pci_conf_tx(struct ieee80211_hw *hw, u16 queue,
1673 return 0; 1673 return 0;
1674} 1674}
1675 1675
1676static u64 rt2400pci_get_tsf(struct ieee80211_hw *hw) 1676static u64 rt2400pci_get_tsf(struct ieee80211_hw *hw,
1677 struct ieee80211_vif *vif)
1677{ 1678{
1678 struct rt2x00_dev *rt2x00dev = hw->priv; 1679 struct rt2x00_dev *rt2x00dev = hw->priv;
1679 u64 tsf; 1680 u64 tsf;
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index b46c3b8866f..dcc0e1fcca7 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1966,7 +1966,8 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)
1966/* 1966/*
1967 * IEEE80211 stack callback functions. 1967 * IEEE80211 stack callback functions.
1968 */ 1968 */
1969static u64 rt2500pci_get_tsf(struct ieee80211_hw *hw) 1969static u64 rt2500pci_get_tsf(struct ieee80211_hw *hw,
1970 struct ieee80211_vif *vif)
1970{ 1971{
1971 struct rt2x00_dev *rt2x00dev = hw->priv; 1972 struct rt2x00_dev *rt2x00dev = hw->priv;
1972 u64 tsf; 1973 u64 tsf;
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 31c98509f7e..9688dd0a7eb 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -4466,7 +4466,7 @@ int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
4466} 4466}
4467EXPORT_SYMBOL_GPL(rt2800_conf_tx); 4467EXPORT_SYMBOL_GPL(rt2800_conf_tx);
4468 4468
4469u64 rt2800_get_tsf(struct ieee80211_hw *hw) 4469u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
4470{ 4470{
4471 struct rt2x00_dev *rt2x00dev = hw->priv; 4471 struct rt2x00_dev *rt2x00dev = hw->priv;
4472 u64 tsf; 4472 u64 tsf;
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h
index 7a2511f6785..6de128e9c61 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
@@ -199,7 +199,7 @@ void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32,
199int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value); 199int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value);
200int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 200int rt2800_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
201 const struct ieee80211_tx_queue_params *params); 201 const struct ieee80211_tx_queue_params *params);
202u64 rt2800_get_tsf(struct ieee80211_hw *hw); 202u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
203int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 203int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
204 enum ieee80211_ampdu_mlme_action action, 204 enum ieee80211_ampdu_mlme_action action,
205 struct ieee80211_sta *sta, u16 tid, u16 *ssn, 205 struct ieee80211_sta *sta, u16 tid, u16 *ssn,
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 058ef4b19d1..6b6a8e2dcdd 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2940,7 +2940,7 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
2940 return 0; 2940 return 0;
2941} 2941}
2942 2942
2943static u64 rt61pci_get_tsf(struct ieee80211_hw *hw) 2943static u64 rt61pci_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
2944{ 2944{
2945 struct rt2x00_dev *rt2x00dev = hw->priv; 2945 struct rt2x00_dev *rt2x00dev = hw->priv;
2946 u64 tsf; 2946 u64 tsf;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 0baeb894f09..6f51e39f559 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2279,7 +2279,7 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
2279 return 0; 2279 return 0;
2280} 2280}
2281 2281
2282static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) 2282static u64 rt73usb_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
2283{ 2283{
2284 struct rt2x00_dev *rt2x00dev = hw->priv; 2284 struct rt2x00_dev *rt2x00dev = hw->priv;
2285 u64 tsf; 2285 u64 tsf;