aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath5k/mac80211-ops.c6
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_main.c9
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c8
-rw-r--r--drivers/net/wireless/ath/carl9170/main.c3
4 files changed, 16 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 0560234ec3f..bba4f6fcf7e 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -602,7 +602,7 @@ ath5k_conf_tx(struct ieee80211_hw *hw, u16 queue,
602 602
603 603
604static u64 604static u64
605ath5k_get_tsf(struct ieee80211_hw *hw) 605ath5k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
606{ 606{
607 struct ath5k_hw *ah = hw->priv; 607 struct ath5k_hw *ah = hw->priv;
608 608
@@ -611,7 +611,7 @@ ath5k_get_tsf(struct ieee80211_hw *hw)
611 611
612 612
613static void 613static void
614ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf) 614ath5k_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u64 tsf)
615{ 615{
616 struct ath5k_hw *ah = hw->priv; 616 struct ath5k_hw *ah = hw->priv;
617 617
@@ -620,7 +620,7 @@ ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
620 620
621 621
622static void 622static void
623ath5k_reset_tsf(struct ieee80211_hw *hw) 623ath5k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
624{ 624{
625 struct ath5k_hw *ah = hw->priv; 625 struct ath5k_hw *ah = hw->priv;
626 626
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 495fdf680a6..17dbbd9d2f5 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1563,7 +1563,8 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
1563 mutex_unlock(&priv->mutex); 1563 mutex_unlock(&priv->mutex);
1564} 1564}
1565 1565
1566static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw) 1566static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw,
1567 struct ieee80211_vif *vif)
1567{ 1568{
1568 struct ath9k_htc_priv *priv = hw->priv; 1569 struct ath9k_htc_priv *priv = hw->priv;
1569 u64 tsf; 1570 u64 tsf;
@@ -1577,7 +1578,8 @@ static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw)
1577 return tsf; 1578 return tsf;
1578} 1579}
1579 1580
1580static void ath9k_htc_set_tsf(struct ieee80211_hw *hw, u64 tsf) 1581static void ath9k_htc_set_tsf(struct ieee80211_hw *hw,
1582 struct ieee80211_vif *vif, u64 tsf)
1581{ 1583{
1582 struct ath9k_htc_priv *priv = hw->priv; 1584 struct ath9k_htc_priv *priv = hw->priv;
1583 1585
@@ -1588,7 +1590,8 @@ static void ath9k_htc_set_tsf(struct ieee80211_hw *hw, u64 tsf)
1588 mutex_unlock(&priv->mutex); 1590 mutex_unlock(&priv->mutex);
1589} 1591}
1590 1592
1591static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw) 1593static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw,
1594 struct ieee80211_vif *vif)
1592{ 1595{
1593 struct ath9k_htc_priv *priv = hw->priv; 1596 struct ath9k_htc_priv *priv = hw->priv;
1594 1597
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index ee39702da5d..fb803e20976 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2143,7 +2143,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
2143 ath9k_ps_restore(sc); 2143 ath9k_ps_restore(sc);
2144} 2144}
2145 2145
2146static u64 ath9k_get_tsf(struct ieee80211_hw *hw) 2146static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
2147{ 2147{
2148 struct ath_softc *sc = hw->priv; 2148 struct ath_softc *sc = hw->priv;
2149 u64 tsf; 2149 u64 tsf;
@@ -2157,7 +2157,9 @@ static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
2157 return tsf; 2157 return tsf;
2158} 2158}
2159 2159
2160static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf) 2160static void ath9k_set_tsf(struct ieee80211_hw *hw,
2161 struct ieee80211_vif *vif,
2162 u64 tsf)
2161{ 2163{
2162 struct ath_softc *sc = hw->priv; 2164 struct ath_softc *sc = hw->priv;
2163 2165
@@ -2168,7 +2170,7 @@ static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
2168 mutex_unlock(&sc->mutex); 2170 mutex_unlock(&sc->mutex);
2169} 2171}
2170 2172
2171static void ath9k_reset_tsf(struct ieee80211_hw *hw) 2173static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
2172{ 2174{
2173 struct ath_softc *sc = hw->priv; 2175 struct ath_softc *sc = hw->priv;
2174 2176
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index af351ecd87c..8b780d6d470 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1078,7 +1078,8 @@ out:
1078 mutex_unlock(&ar->mutex); 1078 mutex_unlock(&ar->mutex);
1079} 1079}
1080 1080
1081static u64 carl9170_op_get_tsf(struct ieee80211_hw *hw) 1081static u64 carl9170_op_get_tsf(struct ieee80211_hw *hw,
1082 struct ieee80211_vif *vif)
1082{ 1083{
1083 struct ar9170 *ar = hw->priv; 1084 struct ar9170 *ar = hw->priv;
1084 struct carl9170_tsf_rsp tsf; 1085 struct carl9170_tsf_rsp tsf;