Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ivo van Doorn and committed by
John W. Linville
62750f42 13e967b2

-10
-10
drivers/net/wireless/rt2x00/rt73usb.c
··· 2241 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 2244 static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) 2252 2245 { 2253 2246 struct rt2x00_dev *rt2x00dev = hw->priv; ··· 2254 2261 2255 2262 return tsf; 2256 2263 } 2257 - #else 2258 - #define rt73usb_get_tsf NULL 2259 - #endif 2260 2264 2261 2265 static const struct ieee80211_ops rt73usb_mac80211_ops = { 2262 2266 .tx = rt2x00mac_tx,