aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2007-10-06 14:18:00 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:55:16 -0700
commit37894473fb0d07e1e015781f7ae1b9b1762d49be (patch)
tree617d22b7becda205710638c2c49b5c8b8fa4989c /drivers/net
parent5c58ee51ff8c0aca74c225e0263bc5dd2b917781 (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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 984117fe1f5..67a1e3750d4 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)
return tsf;
}
+#else
+#define rt73usb_get_tsf NULL
#endif
static void rt73usb_reset_tsf(struct ieee80211_hw *hw)
@@ -1970,12 +1972,7 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
.erp_ie_changed = rt2x00mac_erp_ie_changed,
.conf_tx = rt2x00mac_conf_tx,
.get_tx_stats = rt2x00mac_get_tx_stats,
-#if 0
-/*
- * See comment at the rt73usb_get_tsf function.
- */
.get_tsf = rt73usb_get_tsf,
-#endif
.reset_tsf = rt73usb_reset_tsf,
.beacon_update = rt73usb_beacon_update,
};