* [PATCH 1/4] ralink drivers: remove IEEE80211_HW_DATA_NULLFUNC_ACK
2007-08-16 16:29 [PATCH 0/4] remove IEEE80211_HW_DATA_NULLFUNC_ACK flag Johannes Berg
@ 2007-08-16 16:29 ` Johannes Berg
2007-08-16 16:29 ` [PATCH 2/4] rtl8187: " Johannes Berg
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2007-08-16 16:29 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, rt2400-devel, Ivo van Doorn
The flag will be removed from mac80211 because it is unused.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: rt2400-devel@lists.sourceforge.net
Cc: Ivo van Doorn <ivdoorn@gmail.com>
---
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(-)
--- wireless-dev.orig/drivers/net/wireless/rt2400pci.c 2007-08-16 18:18:27.243468950 +0200
+++ wireless-dev/drivers/net/wireless/rt2400pci.c 2007-08-16 18:18:43.093468950 +0200
@@ -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;
--- wireless-dev.orig/drivers/net/wireless/rt2500pci.c 2007-08-16 18:19:14.133468950 +0200
+++ wireless-dev/drivers/net/wireless/rt2500pci.c 2007-08-16 18:19:16.323468950 +0200
@@ -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;
--- wireless-dev.orig/drivers/net/wireless/rt2500usb.c 2007-08-16 18:19:14.233468950 +0200
+++ wireless-dev/drivers/net/wireless/rt2500usb.c 2007-08-16 18:19:17.883468950 +0200
@@ -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;
--- wireless-dev.orig/drivers/net/wireless/rt61pci.c 2007-08-16 18:18:27.143468950 +0200
+++ wireless-dev/drivers/net/wireless/rt61pci.c 2007-08-16 18:18:41.373468950 +0200
@@ -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;
--- wireless-dev.orig/drivers/net/wireless/rt73usb.c 2007-08-16 18:18:27.033468950 +0200
+++ wireless-dev/drivers/net/wireless/rt73usb.c 2007-08-16 18:18:39.603468950 +0200
@@ -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;
--
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/4] rtl8187: remove IEEE80211_HW_DATA_NULLFUNC_ACK
2007-08-16 16:29 [PATCH 0/4] remove IEEE80211_HW_DATA_NULLFUNC_ACK flag Johannes Berg
2007-08-16 16:29 ` [PATCH 1/4] ralink drivers: remove IEEE80211_HW_DATA_NULLFUNC_ACK Johannes Berg
@ 2007-08-16 16:29 ` Johannes Berg
2007-08-16 16:29 ` [PATCH 3/4] p54: " Johannes Berg
2007-08-16 16:29 ` [PATCH 4/4] mac80211: " Johannes Berg
3 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2007-08-16 16:29 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Michael Wu
The flag will be removed from mac80211 because it is unused.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Michael Wu <flamingice@sourmilk.net>
---
drivers/net/wireless/rtl8187_dev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- wireless-dev.orig/drivers/net/wireless/rtl8187_dev.c 2007-08-16 18:18:59.553468950 +0200
+++ wireless-dev/drivers/net/wireless/rtl8187_dev.c 2007-08-16 18:19:02.563468950 +0200
@@ -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;
--
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] p54: remove IEEE80211_HW_DATA_NULLFUNC_ACK
2007-08-16 16:29 [PATCH 0/4] remove IEEE80211_HW_DATA_NULLFUNC_ACK flag Johannes Berg
2007-08-16 16:29 ` [PATCH 1/4] ralink drivers: remove IEEE80211_HW_DATA_NULLFUNC_ACK Johannes Berg
2007-08-16 16:29 ` [PATCH 2/4] rtl8187: " Johannes Berg
@ 2007-08-16 16:29 ` Johannes Berg
2007-08-16 16:29 ` [PATCH 4/4] mac80211: " Johannes Berg
3 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2007-08-16 16:29 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Michael Wu, developers
The flag will be removed from mac80211 because it is unused.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Michael Wu <flamingice@sourmilk.net>
Cc: developers@islsm.org
---
drivers/net/wireless/p54common.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- wireless-dev.orig/drivers/net/wireless/p54common.c 2007-08-16 18:19:38.323468950 +0200
+++ wireless-dev/drivers/net/wireless/p54common.c 2007-08-16 18:19:49.633468950 +0200
@@ -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;
--
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] mac80211: remove IEEE80211_HW_DATA_NULLFUNC_ACK
2007-08-16 16:29 [PATCH 0/4] remove IEEE80211_HW_DATA_NULLFUNC_ACK flag Johannes Berg
` (2 preceding siblings ...)
2007-08-16 16:29 ` [PATCH 3/4] p54: " Johannes Berg
@ 2007-08-16 16:29 ` Johannes Berg
3 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2007-08-16 16:29 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Jiri Benc, Michael Wu
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 <johannes@sipsolutions.net>
Cc: Jiri Benc <jbenc@suse.cz>
Cc: Michael Wu <flamingice@sourmilk.net>
---
include/net/mac80211.h | 3 ---
net/mac80211/hostapd_ioctl.h | 2 --
net/mac80211/ieee80211_ioctl.c | 2 --
3 files changed, 7 deletions(-)
--- wireless-dev.orig/include/net/mac80211.h 2007-08-16 18:20:19.703468950 +0200
+++ wireless-dev/include/net/mac80211.h 2007-08-16 18:20:23.083468950 +0200
@@ -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)
--- wireless-dev.orig/net/mac80211/hostapd_ioctl.h 2007-08-16 18:20:42.023468950 +0200
+++ wireless-dev/net/mac80211/hostapd_ioctl.h 2007-08-16 18:20:47.063468950 +0200
@@ -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;
--- wireless-dev.orig/net/mac80211/ieee80211_ioctl.c 2007-08-16 18:20:29.553468950 +0200
+++ wireless-dev/net/mac80211/ieee80211_ioctl.c 2007-08-16 18:20:38.833468950 +0200
@@ -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) {
--
^ permalink raw reply [flat|nested] 5+ messages in thread