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

Commit ef8f66cd authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove reset_tsf() 



Specifications indicate the TSF registers are read-only,
so there is no point in writing 0 to those registers.

As far as I know there isn't another way to reset the
TSF registers. So removing these callbacks will notify
mac80211 about the lack of support.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 30b3a23c

drivers/net/wireless/rt2x00/rt2400pci.c

+0 −9
Original line number Diff line number Diff line
@@ -1510,14 +1510,6 @@ static u64 rt2400pci_get_tsf(struct ieee80211_hw *hw) 
	return tsf;

}



static void rt2400pci_reset_tsf(struct ieee80211_hw *hw)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;



	rt2x00pci_register_write(rt2x00dev, CSR16, 0);

	rt2x00pci_register_write(rt2x00dev, CSR17, 0);

}



static int rt2400pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,

				   struct ieee80211_tx_control *control)

{
@@ -1586,7 +1578,6 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = { 
	.conf_tx		= rt2400pci_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.get_tsf		= rt2400pci_get_tsf,

	.reset_tsf		= rt2400pci_reset_tsf,

	.beacon_update		= rt2400pci_beacon_update,

	.tx_last_beacon		= rt2400pci_tx_last_beacon,

};

drivers/net/wireless/rt2x00/rt2500pci.c

+0 −9
Original line number Diff line number Diff line
@@ -1821,14 +1821,6 @@ static u64 rt2500pci_get_tsf(struct ieee80211_hw *hw) 
	return tsf;

}



static void rt2500pci_reset_tsf(struct ieee80211_hw *hw)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;



	rt2x00pci_register_write(rt2x00dev, CSR16, 0);

	rt2x00pci_register_write(rt2x00dev, CSR17, 0);

}



static int rt2500pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,

				   struct ieee80211_tx_control *control)

{
@@ -1897,7 +1889,6 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { 
	.conf_tx		= rt2x00mac_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.get_tsf		= rt2500pci_get_tsf,

	.reset_tsf		= rt2500pci_reset_tsf,

	.beacon_update		= rt2500pci_beacon_update,

	.tx_last_beacon		= rt2500pci_tx_last_beacon,

};

drivers/net/wireless/rt2x00/rt61pci.c

+0 −9
Original line number Diff line number Diff line
@@ -2366,14 +2366,6 @@ static u64 rt61pci_get_tsf(struct ieee80211_hw *hw) 
	return tsf;

}



static void rt61pci_reset_tsf(struct ieee80211_hw *hw)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;



	rt2x00pci_register_write(rt2x00dev, TXRX_CSR12, 0);

	rt2x00pci_register_write(rt2x00dev, TXRX_CSR13, 0);

}



static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,

			  struct ieee80211_tx_control *control)

{
@@ -2450,7 +2442,6 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = { 
	.conf_tx		= rt2x00mac_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.get_tsf		= rt61pci_get_tsf,

	.reset_tsf		= rt61pci_reset_tsf,

	.beacon_update		= rt61pci_beacon_update,

};

drivers/net/wireless/rt2x00/rt73usb.c

+0 −9
Original line number Diff line number Diff line
@@ -1972,14 +1972,6 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) 
#define rt73usb_get_tsf	NULL

#endif



static void rt73usb_reset_tsf(struct ieee80211_hw *hw)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;



	rt73usb_register_write(rt2x00dev, TXRX_CSR12, 0);

	rt73usb_register_write(rt2x00dev, TXRX_CSR13, 0);

}



static int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,

				 struct ieee80211_tx_control *control)

{
@@ -2047,7 +2039,6 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = { 
	.conf_tx		= rt2x00mac_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.get_tsf		= rt73usb_get_tsf,

	.reset_tsf		= rt73usb_reset_tsf,

	.beacon_update		= rt73usb_beacon_update,

};