Skip to contentSkip to conversation

remove IEEE80211_HW_DATA_NULLFUNC_ACK flag

PATCH New Johannes Berg 1 participant 5 messages Aug 16, 2007

Subsystems (2)
Networking drivers (wireless) mac80211
lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

cover remove IEEE80211_HW_DATA_NULLFUNC_ACK flag

Not used and inverted meaning.

author maintainer
#1 lore raw

PATCH 1/4 ralink drivers: remove IEEE80211_HW_DATA_NULLFUNC_ACK

The flag will be removed from mac80211 because it is unused.

Signed-off-by Johannes Berg <[email protected]>
Cc [email protected]
Cc Ivo van Doorn <[email protected]>
---
 drivers/net/wireless/rt2400pci.c |    1 -
 drivers/net/wireless/rt2500pci.c |    1 -
 drivers/net/wireless/rt2500usb.c |    1 -
 drivers/net/wireless/rt61pci.c   |    1 -
 drivers/net/wireless/rt73usb.c   |    1 -
 5 files changed, 5 deletions(-)
drivers/net/wireless/rt2400pci.c +0 -1
@@ -1446,7 +1446,6 @@ static void rt2400pci_probe_hw_mode(stru
 	rt2x00dev->hw->flags =
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
-	    IEEE80211_HW_DATA_NULLFUNC_ACK |
 	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
 	    IEEE80211_HW_MONITOR_DURING_OPER |
 	    IEEE80211_HW_NO_PROBE_FILTERING;
drivers/net/wireless/rt2500pci.c +0 -1
@@ -1691,7 +1691,6 @@ static void rt2500pci_probe_hw_mode(stru
 	rt2x00dev->hw->flags =
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
-	    IEEE80211_HW_DATA_NULLFUNC_ACK |
 	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
 	    IEEE80211_HW_MONITOR_DURING_OPER |
 	    IEEE80211_HW_NO_PROBE_FILTERING;
drivers/net/wireless/rt2500usb.c +0 -1
@@ -1422,7 +1422,6 @@ static void rt2500usb_probe_hw_mode(stru
 	    IEEE80211_HW_RX_INCLUDES_FCS |
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
-	    IEEE80211_HW_DATA_NULLFUNC_ACK |
 	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
 	    IEEE80211_HW_MONITOR_DURING_OPER |
 	    IEEE80211_HW_NO_PROBE_FILTERING;
drivers/net/wireless/rt61pci.c +0 -1
@@ -2215,7 +2215,6 @@ static void rt61pci_probe_hw_mode(struct
 	rt2x00dev->hw->flags =
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
-	    IEEE80211_HW_DATA_NULLFUNC_ACK |
 	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
 	    IEEE80211_HW_MONITOR_DURING_OPER |
 	    IEEE80211_HW_NO_PROBE_FILTERING;
drivers/net/wireless/rt73usb.c +0 -1
@@ -1682,7 +1682,6 @@ static void rt73usb_probe_hw_mode(struct
 	    IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
-	    IEEE80211_HW_DATA_NULLFUNC_ACK |
 	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
 	    IEEE80211_HW_MONITOR_DURING_OPER |
 	    IEEE80211_HW_NO_PROBE_FILTERING;
author maintainer
#2 lore raw

PATCH 2/4 rtl8187: remove IEEE80211_HW_DATA_NULLFUNC_ACK

In reply to Johannes Berg

The flag will be removed from mac80211 because it is unused.

Signed-off-by Johannes Berg <[email protected]>
Cc Michael Wu <[email protected]>
---
 drivers/net/wireless/rtl8187_dev.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/rtl8187_dev.c +1 -2
@@ -621,8 +621,7 @@ static int __devinit rtl8187_probe(struc
 	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;
author maintainer
#3 lore raw

PATCH 3/4 p54: remove IEEE80211_HW_DATA_NULLFUNC_ACK

In reply to Johannes Berg

The flag will be removed from mac80211 because it is unused.

Signed-off-by Johannes Berg <[email protected]>
Cc Michael Wu <[email protected]>
Cc [email protected]
---
 drivers/net/wireless/p54common.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/p54common.c +1 -3
@@ -893,9 +893,7 @@ struct ieee80211_hw *p54_init_common(siz
 	priv->modes[0].channels = priv->channels;
 	dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */
 		    IEEE80211_HW_RX_INCLUDES_FCS |
-		    IEEE80211_HW_WEP_INCLUDE_IV |
-		    IEEE80211_HW_DATA_NULLFUNC_ACK; /* TODO: check */
-		    /* IEEE80211_HW_MONITOR_DURING_OPER FIXME: check */
+		    IEEE80211_HW_WEP_INCLUDE_IV;
 	dev->channel_change_time = 1000;	/* TODO: find actual value */
 	dev->max_rssi = 100;
author maintainer
#4 lore raw

PATCH 4/4 mac80211: remove IEEE80211_HW_DATA_NULLFUNC_ACK

In reply to Johannes Berg

The flag is only propagated to hostapd which doesn't use it. If we ever add it back please do it in an inverted meaning so drivers for good hardware don't need to set an ever-growing list of flags.

Signed-off-by Johannes Berg <[email protected]>
Cc Jiri Benc <[email protected]>
Cc Michael Wu <[email protected]>
---
 include/net/mac80211.h         |    3 ---
 net/mac80211/hostapd_ioctl.h   |    2 --
 net/mac80211/ieee80211_ioctl.c |    2 --
 3 files changed, 7 deletions(-)
include/net/mac80211.h +0 -3
@@ -473,9 +473,6 @@ 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)
-
 	/* Force software encryption for TKIP packets if WMM is enabled. */
 #define IEEE80211_HW_NO_TKIP_WMM_HWACCEL (1<<7)
net/mac80211/hostapd_ioctl.h +0 -2
@@ -171,8 +171,6 @@ struct prism2_hostapd_param {
 #define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT(0)
 #define HOSTAP_CRYPT_FLAG_PERMANENT BIT(1)
 
-#define HOSTAP_HW_FLAG_NULLFUNC_OK BIT(0)
-
 /* Data structures used for get_hw_features ioctl */
 struct hostapd_ioctl_hw_modes_hdr {
 	int mode;
net/mac80211/ieee80211_ioctl.c +0 -2
@@ -111,8 +111,6 @@ static int ieee80211_ioctl_get_hw_featur
 	struct ieee80211_hw_mode *mode;
 
 	param->u.hw_features.flags = 0;
-	if (local->hw.flags & IEEE80211_HW_DATA_NULLFUNC_ACK)
-		param->u.hw_features.flags |= HOSTAP_HW_FLAG_NULLFUNC_OK;
 
 	param->u.hw_features.num_modes = 0;
 	list_for_each_entry(mode, &local->modes_list, list) {