Commit 62750f42 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 13e967b2

drivers/net/wireless/rt2x00/rt73usb.c

+0 −10
Original line number Diff line number Diff line
@@ -2241,13 +2241,6 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 
	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)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -2261,9 +2254,6 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) 


	return tsf;

}

#else

#define rt73usb_get_tsf	NULL

#endif



static const struct ieee80211_ops rt73usb_mac80211_ops = {

	.tx			= rt2x00mac_tx,