aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-02-17 11:33:57 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:23 -0500
commitef8f66cd1d6f360340a73ee7ed0492ff0f5f42ea (patch)
tree577bd4f874923a938280b4ac789656aaa617b75f
parent30b3a23c2594e122e7086f97b5252a87eaf8a817 (diff)
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: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c9
-rw-r--r--drivers/net/wireless/rt2x00/rt2500pci.c9
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c9
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c9
4 files changed, 0 insertions, 36 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 28663c00b770..6c025cf32423 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1510,14 +1510,6 @@ static u64 rt2400pci_get_tsf(struct ieee80211_hw *hw)
1510 return tsf; 1510 return tsf;
1511} 1511}
1512 1512
1513static void rt2400pci_reset_tsf(struct ieee80211_hw *hw)
1514{
1515 struct rt2x00_dev *rt2x00dev = hw->priv;
1516
1517 rt2x00pci_register_write(rt2x00dev, CSR16, 0);
1518 rt2x00pci_register_write(rt2x00dev, CSR17, 0);
1519}
1520
1521static int rt2400pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 1513static int rt2400pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
1522 struct ieee80211_tx_control *control) 1514 struct ieee80211_tx_control *control)
1523{ 1515{
@@ -1586,7 +1578,6 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
1586 .conf_tx = rt2400pci_conf_tx, 1578 .conf_tx = rt2400pci_conf_tx,
1587 .get_tx_stats = rt2x00mac_get_tx_stats, 1579 .get_tx_stats = rt2x00mac_get_tx_stats,
1588 .get_tsf = rt2400pci_get_tsf, 1580 .get_tsf = rt2400pci_get_tsf,
1589 .reset_tsf = rt2400pci_reset_tsf,
1590 .beacon_update = rt2400pci_beacon_update, 1581 .beacon_update = rt2400pci_beacon_update,
1591 .tx_last_beacon = rt2400pci_tx_last_beacon, 1582 .tx_last_beacon = rt2400pci_tx_last_beacon,
1592}; 1583};
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index ec7300e4fc56..93eaba852e5d 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1821,14 +1821,6 @@ static u64 rt2500pci_get_tsf(struct ieee80211_hw *hw)
1821 return tsf; 1821 return tsf;
1822} 1822}
1823 1823
1824static void rt2500pci_reset_tsf(struct ieee80211_hw *hw)
1825{
1826 struct rt2x00_dev *rt2x00dev = hw->priv;
1827
1828 rt2x00pci_register_write(rt2x00dev, CSR16, 0);
1829 rt2x00pci_register_write(rt2x00dev, CSR17, 0);
1830}
1831
1832static int rt2500pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 1824static int rt2500pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
1833 struct ieee80211_tx_control *control) 1825 struct ieee80211_tx_control *control)
1834{ 1826{
@@ -1897,7 +1889,6 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
1897 .conf_tx = rt2x00mac_conf_tx, 1889 .conf_tx = rt2x00mac_conf_tx,
1898 .get_tx_stats = rt2x00mac_get_tx_stats, 1890 .get_tx_stats = rt2x00mac_get_tx_stats,
1899 .get_tsf = rt2500pci_get_tsf, 1891 .get_tsf = rt2500pci_get_tsf,
1900 .reset_tsf = rt2500pci_reset_tsf,
1901 .beacon_update = rt2500pci_beacon_update, 1892 .beacon_update = rt2500pci_beacon_update,
1902 .tx_last_beacon = rt2500pci_tx_last_beacon, 1893 .tx_last_beacon = rt2500pci_tx_last_beacon,
1903}; 1894};
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index dcc694eb8b3b..62d49376c9af 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2366,14 +2366,6 @@ static u64 rt61pci_get_tsf(struct ieee80211_hw *hw)
2366 return tsf; 2366 return tsf;
2367} 2367}
2368 2368
2369static void rt61pci_reset_tsf(struct ieee80211_hw *hw)
2370{
2371 struct rt2x00_dev *rt2x00dev = hw->priv;
2372
2373 rt2x00pci_register_write(rt2x00dev, TXRX_CSR12, 0);
2374 rt2x00pci_register_write(rt2x00dev, TXRX_CSR13, 0);
2375}
2376
2377static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 2369static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
2378 struct ieee80211_tx_control *control) 2370 struct ieee80211_tx_control *control)
2379{ 2371{
@@ -2450,7 +2442,6 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
2450 .conf_tx = rt2x00mac_conf_tx, 2442 .conf_tx = rt2x00mac_conf_tx,
2451 .get_tx_stats = rt2x00mac_get_tx_stats, 2443 .get_tx_stats = rt2x00mac_get_tx_stats,
2452 .get_tsf = rt61pci_get_tsf, 2444 .get_tsf = rt61pci_get_tsf,
2453 .reset_tsf = rt61pci_reset_tsf,
2454 .beacon_update = rt61pci_beacon_update, 2445 .beacon_update = rt61pci_beacon_update,
2455}; 2446};
2456 2447
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index c3d4e9307785..c56540602ad6 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1972,14 +1972,6 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw)
1972#define rt73usb_get_tsf NULL 1972#define rt73usb_get_tsf NULL
1973#endif 1973#endif
1974 1974
1975static void rt73usb_reset_tsf(struct ieee80211_hw *hw)
1976{
1977 struct rt2x00_dev *rt2x00dev = hw->priv;
1978
1979 rt73usb_register_write(rt2x00dev, TXRX_CSR12, 0);
1980 rt73usb_register_write(rt2x00dev, TXRX_CSR13, 0);
1981}
1982
1983static int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb, 1975static int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
1984 struct ieee80211_tx_control *control) 1976 struct ieee80211_tx_control *control)
1985{ 1977{
@@ -2047,7 +2039,6 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
2047 .conf_tx = rt2x00mac_conf_tx, 2039 .conf_tx = rt2x00mac_conf_tx,
2048 .get_tx_stats = rt2x00mac_get_tx_stats, 2040 .get_tx_stats = rt2x00mac_get_tx_stats,
2049 .get_tsf = rt73usb_get_tsf, 2041 .get_tsf = rt73usb_get_tsf,
2050 .reset_tsf = rt73usb_reset_tsf,
2051 .beacon_update = rt73usb_beacon_update, 2042 .beacon_update = rt73usb_beacon_update,
2052}; 2043};
2053 2044