Commit aaa92e9a authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: remove IEEE80211_HW_DATA_NULLFUNC_ACK 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6660d98

drivers/net/wireless/rtl8187_dev.c

+1 −2
Original line number Diff line number Diff line
@@ -606,8 +606,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf, 
	priv->mode = IEEE80211_IF_TYPE_MGMT;

	dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |

		     IEEE80211_HW_RX_INCLUDES_FCS |

		     IEEE80211_HW_WEP_INCLUDE_IV |

		     IEEE80211_HW_DATA_NULLFUNC_ACK;

		     IEEE80211_HW_WEP_INCLUDE_IV;

	dev->extra_tx_headroom = sizeof(struct rtl8187_tx_hdr);

	dev->queues = 1;

	dev->max_rssi = 65;

include/net/mac80211.h

+1 −2
Original line number Diff line number Diff line
@@ -491,8 +491,7 @@ struct ieee80211_hw { 


#define IEEE80211_HW_WEP_INCLUDE_IV (1<<5)



	/* will data nullfunc frames get proper TX status callback */

#define IEEE80211_HW_DATA_NULLFUNC_ACK (1<<6)

/* hole at 6 */



	/* Force software encryption for TKIP packets if WMM is enabled. */

#define IEEE80211_HW_NO_TKIP_WMM_HWACCEL (1<<7)