Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ipw2x00/ipw2200.c
This commit is contained in:
@@ -1674,10 +1674,15 @@ static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
||||
|
||||
/*
|
||||
* Initialize all hw fields.
|
||||
*
|
||||
* Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING unless we are
|
||||
* capable of sending the buffered frames out after the DTIM
|
||||
* transmission using rt2x00lib_beacondone. This will send out
|
||||
* multicast and broadcast traffic immediately instead of buffering it
|
||||
* infinitly and thus dropping it after some time.
|
||||
*/
|
||||
rt2x00dev->hw->flags =
|
||||
IEEE80211_HW_RX_INCLUDES_FCS |
|
||||
IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
||||
IEEE80211_HW_SIGNAL_DBM |
|
||||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
|
Reference in New Issue
Block a user