[MAC80211]: remove IEEE80211_HW_DATA_NULLFUNC_ACK

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 73f1ebc7eec7127c8ca4bdbd8dd803cc295b0b71..9db9ece31b494022a0a59e3be15c741b48d701f1 100644 (file)
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -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;

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e635ca41a0df14b4d2efacd5e703e1ad7ebc7454..427ff6d36265dc778015f4231666e759ea9030b2 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -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)