diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2007-10-06 08:18:00 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:16 -0400 |
commit | 37894473fb0d07e1e015781f7ae1b9b1762d49be (patch) | |
tree | 617d22b7becda205710638c2c49b5c8b8fa4989c | |
parent | 5c58ee51ff8c0aca74c225e0263bc5dd2b917781 (diff) |
[PATCH] rt2x00: Clean disabling of rt73usb_get_tsf
By defining rt73usb_get_tsf to NULL we only
have 1 location that needs to be edited
when rt73usb_get_tsf can be enabled again.
This also reduces the number of #ifdefs in
the code which is also a "good thing"
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/rt73usb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 984117fe1f5e..67a1e3750d4d 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1910,6 +1910,8 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) | |||
1910 | 1910 | ||
1911 | return tsf; | 1911 | return tsf; |
1912 | } | 1912 | } |
1913 | #else | ||
1914 | #define rt73usb_get_tsf NULL | ||
1913 | #endif | 1915 | #endif |
1914 | 1916 | ||
1915 | static void rt73usb_reset_tsf(struct ieee80211_hw *hw) | 1917 | static void rt73usb_reset_tsf(struct ieee80211_hw *hw) |
@@ -1970,12 +1972,7 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = { | |||
1970 | .erp_ie_changed = rt2x00mac_erp_ie_changed, | 1972 | .erp_ie_changed = rt2x00mac_erp_ie_changed, |
1971 | .conf_tx = rt2x00mac_conf_tx, | 1973 | .conf_tx = rt2x00mac_conf_tx, |
1972 | .get_tx_stats = rt2x00mac_get_tx_stats, | 1974 | .get_tx_stats = rt2x00mac_get_tx_stats, |
1973 | #if 0 | ||
1974 | /* | ||
1975 | * See comment at the rt73usb_get_tsf function. | ||
1976 | */ | ||
1977 | .get_tsf = rt73usb_get_tsf, | 1975 | .get_tsf = rt73usb_get_tsf, |
1978 | #endif | ||
1979 | .reset_tsf = rt73usb_reset_tsf, | 1976 | .reset_tsf = rt73usb_reset_tsf, |
1980 | .beacon_update = rt73usb_beacon_update, | 1977 | .beacon_update = rt73usb_beacon_update, |
1981 | }; | 1978 | }; |