lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: uncomment get_tsf

Browse Source 
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>
This commit is contained in:
Ivo van Doorn
2009-02-15 17:42:30 +01:00
committed by John W. Linville
parent 13e967b292
commit 62750f421f
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/rt2x00/rt73usb.c
View File

@@ -2241,13 +2241,6 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,
return 0; return 0;
} }
#if 0
/*
* Mac80211 demands get_tsf must be atomic.
* This is not possible for rt73usb since all register access
* functions require sleeping. Untill mac80211 no longer needs
* get_tsf to be atomic, this function should be disabled.
*/
static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) static u64 rt73usb_get_tsf(struct ieee80211_hw *hw)
{ {
struct rt2x00_dev *rt2x00dev = hw->priv; struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -2261,9 +2254,6 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw)
return tsf; return tsf;
} }
#else
#define rt73usb_get_tsf NULL
#endif
static const struct ieee80211_ops rt73usb_mac80211_ops = { static const struct ieee80211_ops rt73usb_mac80211_ops = {
.tx = rt2x00mac_tx, .tx = rt2x00mac_tx,