]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] rt2x00: Clean disabling of rt73usb_get_tsf
authorIvo van Doorn <ivdoorn@gmail.com>
Sat, 6 Oct 2007 12:18:00 +0000 (14:18 +0200)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:55:16 +0000 (16:55 -0700)
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>
drivers/net/wireless/rt2x00/rt73usb.c

index 984117fe1f5e4ae596e5c55a4a8e703148780f35..67a1e3750d4d1725c14bc864103b5d133de51e87 100644 (file)
@@ -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,
 };