Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a41b4a authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

mac80211: add ieee80211_vif param to tsf functions 



TSF can be kept per vif.
Add ieee80211_vif param to set/get/reset_tsf, and move
the debugfs entries to the per-vif directory.

Update all the drivers that implement these callbacks.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 12932180

drivers/net/wireless/adm8211.c

+2 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,8 @@ static int adm8211_hw_reset(struct ieee80211_hw *dev) 
	return 0;

}



static u64 adm8211_get_tsft(struct ieee80211_hw *dev)

static u64 adm8211_get_tsft(struct ieee80211_hw *dev,

			    struct ieee80211_vif *vif)

{

	struct adm8211_priv *priv = dev->priv;

	u32 tsftl;

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+3 −3
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ ath5k_conf_tx(struct ieee80211_hw *hw, u16 queue, 




static u64

ath5k_get_tsf(struct ieee80211_hw *hw)

ath5k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath5k_hw *ah = hw->priv;
@@ -611,7 +611,7 @@ ath5k_get_tsf(struct ieee80211_hw *hw) 




static void

ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf)

ath5k_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u64 tsf)

{

	struct ath5k_hw *ah = hw->priv;
@@ -620,7 +620,7 @@ ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf) 




static void

ath5k_reset_tsf(struct ieee80211_hw *hw)

ath5k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath5k_hw *ah = hw->priv;

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+6 −3
Original line number Diff line number Diff line
@@ -1563,7 +1563,8 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw, 
	mutex_unlock(&priv->mutex);

}



static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw)

static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif)

{

	struct ath9k_htc_priv *priv = hw->priv;

	u64 tsf;
@@ -1577,7 +1578,8 @@ static u64 ath9k_htc_get_tsf(struct ieee80211_hw *hw) 
	return tsf;

}



static void ath9k_htc_set_tsf(struct ieee80211_hw *hw, u64 tsf)

static void ath9k_htc_set_tsf(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif, u64 tsf)

{

	struct ath9k_htc_priv *priv = hw->priv;
@@ -1588,7 +1590,8 @@ static void ath9k_htc_set_tsf(struct ieee80211_hw *hw, u64 tsf) 
	mutex_unlock(&priv->mutex);

}



static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw)

static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif)

{

	struct ath9k_htc_priv *priv = hw->priv;

drivers/net/wireless/ath/ath9k/main.c

+5 −3
Original line number Diff line number Diff line
@@ -2143,7 +2143,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, 
	ath9k_ps_restore(sc);

}



static u64 ath9k_get_tsf(struct ieee80211_hw *hw)

static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath_softc *sc = hw->priv;

	u64 tsf;
@@ -2157,7 +2157,9 @@ static u64 ath9k_get_tsf(struct ieee80211_hw *hw) 
	return tsf;

}



static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)

static void ath9k_set_tsf(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif,

			  u64 tsf)

{

	struct ath_softc *sc = hw->priv;
@@ -2168,7 +2170,7 @@ static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf) 
	mutex_unlock(&sc->mutex);

}



static void ath9k_reset_tsf(struct ieee80211_hw *hw)

static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath_softc *sc = hw->priv;

drivers/net/wireless/ath/carl9170/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,8 @@ out: 
	mutex_unlock(&ar->mutex);

}



static u64 carl9170_op_get_tsf(struct ieee80211_hw *hw)

static u64 carl9170_op_get_tsf(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif)

{

	struct ar9170 *ar = hw->priv;

	struct carl9170_tsf_rsp tsf;