diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2009-02-15 11:42:30 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:35 -0500 |
commit | 62750f421f6eebabedf545183ef8291cd3e63c78 (patch) | |
tree | b254d408a20af5ffe33029085cd7c02cc6e4bfb8 /drivers/net | |
parent | 13e967b2926a51e1913ea42711eaf4108372fd44 (diff) |
rt2x00: uncomment get_tsf
The atomic requirement for get_tsf() has been removed
by mac80211. This means the USB drivers can add support
for the callback function again.
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.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 6521dac7ec4a..8f522342b16d 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -2241,13 +2241,6 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, | |||
2241 | return 0; | 2241 | return 0; |
2242 | } | 2242 | } |
2243 | 2243 | ||
2244 | #if 0 | ||
2245 | /* | ||
2246 | * Mac80211 demands get_tsf must be atomic. | ||
2247 | * This is not possible for rt73usb since all register access | ||
2248 | * functions require sleeping. Untill mac80211 no longer needs | ||
2249 | * get_tsf to be atomic, this function should be disabled. | ||
2250 | */ | ||
2251 | static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) | 2244 | static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) |
2252 | { | 2245 | { |
2253 | struct rt2x00_dev *rt2x00dev = hw->priv; | 2246 | struct rt2x00_dev *rt2x00dev = hw->priv; |
@@ -2261,9 +2254,6 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) | |||
2261 | 2254 | ||
2262 | return tsf; | 2255 | return tsf; |
2263 | } | 2256 | } |
2264 | #else | ||
2265 | #define rt73usb_get_tsf NULL | ||
2266 | #endif | ||
2267 | 2257 | ||
2268 | static const struct ieee80211_ops rt73usb_mac80211_ops = { | 2258 | static const struct ieee80211_ops rt73usb_mac80211_ops = { |
2269 | .tx = rt2x00mac_tx, | 2259 | .tx = rt2x00mac_tx, |