Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=37894473fb0d07e1e015781f7ae1b9b1762d49be
Commit:     37894473fb0d07e1e015781f7ae1b9b1762d49be
Parent:     5c58ee51ff8c0aca74c225e0263bc5dd2b917781
Author:     Ivo van Doorn <[EMAIL PROTECTED]>
AuthorDate: Sat Oct 6 14:18:00 2007 +0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:55:16 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 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 984117f..67a1e37 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,
 };
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to