diff options
-rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 3 | ||||
-rw-r--r-- | include/net/mac80211.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 73f1ebc7eec7..9db9ece31b49 100644 --- 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, | |||
606 | priv->mode = IEEE80211_IF_TYPE_MGMT; | 606 | priv->mode = IEEE80211_IF_TYPE_MGMT; |
607 | dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | | 607 | dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | |
608 | IEEE80211_HW_RX_INCLUDES_FCS | | 608 | IEEE80211_HW_RX_INCLUDES_FCS | |
609 | IEEE80211_HW_WEP_INCLUDE_IV | | 609 | IEEE80211_HW_WEP_INCLUDE_IV; |
610 | IEEE80211_HW_DATA_NULLFUNC_ACK; | ||
611 | dev->extra_tx_headroom = sizeof(struct rtl8187_tx_hdr); | 610 | dev->extra_tx_headroom = sizeof(struct rtl8187_tx_hdr); |
612 | dev->queues = 1; | 611 | dev->queues = 1; |
613 | dev->max_rssi = 65; | 612 | dev->max_rssi = 65; |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index e635ca41a0df..427ff6d36265 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -491,8 +491,7 @@ struct ieee80211_hw { | |||
491 | 491 | ||
492 | #define IEEE80211_HW_WEP_INCLUDE_IV (1<<5) | 492 | #define IEEE80211_HW_WEP_INCLUDE_IV (1<<5) |
493 | 493 | ||
494 | /* will data nullfunc frames get proper TX status callback */ | 494 | /* hole at 6 */ |
495 | #define IEEE80211_HW_DATA_NULLFUNC_ACK (1<<6) | ||
496 | 495 | ||
497 | /* Force software encryption for TKIP packets if WMM is enabled. */ | 496 | /* Force software encryption for TKIP packets if WMM is enabled. */ |
498 | #define IEEE80211_HW_NO_TKIP_WMM_HWACCEL (1<<7) | 497 | #define IEEE80211_HW_NO_TKIP_WMM_HWACCEL (1<<7) |