All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/11] wext reductio
@ 2011-07-13  8:39 Johannes Berg
  2011-07-13  8:39 ` [PATCH 01/11] cfg80211: split wext compatibility to separate header Johannes Berg
                   ` (10 more replies)
  0 siblings, 11 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

So ... Kalle posted ath6kl which erroneously used
wext constants and I noticed that he can do that
only because cfg80211 includes the wext headers.
Then I found mac80211 does the same, so I went on
a little cleanup spree. :-)

johannes


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 01/11] cfg80211: split wext compatibility to separate header
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  8:39 ` [PATCH 02/11] iwlagn: remove wireless extensions inclusions Johannes Berg
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

A lot of drivers erroneously use wext constants
and don't notice since cfg80211.h includes them.
Make this more split up so drivers needing wext
compatibility from cfg80211 need to explicitly
include that from cfg80211-wext.h.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/ipw2x00/ipw2200.c |    1 
 drivers/net/wireless/orinoco/wext.c    |    1 
 include/net/cfg80211-wext.h            |  124 +++++++++++++++++++++++++++++++++
 include/net/cfg80211.h                 |  112 -----------------------------
 net/wireless/scan.c                    |    1 
 net/wireless/wext-compat.c             |    1 
 net/wireless/wext-sme.c                |    1 
 7 files changed, 129 insertions(+), 112 deletions(-)

--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ b/include/net/cfg80211-wext.h	2011-07-13 09:54:23.000000000 +0200
@@ -0,0 +1,124 @@
+#ifndef __NET_CFG80211_WEXT_H
+#define __NET_CFG80211_WEXT_H
+/*
+ * 802.11 device and configuration interface -- wext handlers
+ *
+ * Copyright 2006-2010	Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+
+/*
+ * Temporary wext handlers & helper functions
+ *
+ * These are used only by drivers that aren't yet fully
+ * converted to cfg80211.
+ */
+int cfg80211_wext_giwname(struct net_device *dev,
+			  struct iw_request_info *info,
+			  char *name, char *extra);
+int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
+			  u32 *mode, char *extra);
+int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
+			  u32 *mode, char *extra);
+int cfg80211_wext_siwscan(struct net_device *dev,
+			  struct iw_request_info *info,
+			  union iwreq_data *wrqu, char *extra);
+int cfg80211_wext_giwscan(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_point *data, char *extra);
+int cfg80211_wext_siwmlme(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_point *data, char *extra);
+int cfg80211_wext_giwrange(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_point *data, char *extra);
+int cfg80211_wext_siwgenie(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_point *data, char *extra);
+int cfg80211_wext_siwauth(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_param *data, char *extra);
+int cfg80211_wext_giwauth(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_param *data, char *extra);
+
+int cfg80211_wext_siwfreq(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_freq *freq, char *extra);
+int cfg80211_wext_giwfreq(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_freq *freq, char *extra);
+int cfg80211_wext_siwessid(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_point *data, char *ssid);
+int cfg80211_wext_giwessid(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_point *data, char *ssid);
+int cfg80211_wext_siwrate(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_param *rate, char *extra);
+int cfg80211_wext_giwrate(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_param *rate, char *extra);
+
+int cfg80211_wext_siwrts(struct net_device *dev,
+			 struct iw_request_info *info,
+			 struct iw_param *rts, char *extra);
+int cfg80211_wext_giwrts(struct net_device *dev,
+			 struct iw_request_info *info,
+			 struct iw_param *rts, char *extra);
+int cfg80211_wext_siwfrag(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_param *frag, char *extra);
+int cfg80211_wext_giwfrag(struct net_device *dev,
+			  struct iw_request_info *info,
+			  struct iw_param *frag, char *extra);
+int cfg80211_wext_siwretry(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_param *retry, char *extra);
+int cfg80211_wext_giwretry(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_param *retry, char *extra);
+int cfg80211_wext_siwencodeext(struct net_device *dev,
+			       struct iw_request_info *info,
+			       struct iw_point *erq, char *extra);
+int cfg80211_wext_siwencode(struct net_device *dev,
+			    struct iw_request_info *info,
+			    struct iw_point *erq, char *keybuf);
+int cfg80211_wext_giwencode(struct net_device *dev,
+			    struct iw_request_info *info,
+			    struct iw_point *erq, char *keybuf);
+int cfg80211_wext_siwtxpower(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *data, char *keybuf);
+int cfg80211_wext_giwtxpower(struct net_device *dev,
+			     struct iw_request_info *info,
+			     union iwreq_data *data, char *keybuf);
+struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev);
+
+int cfg80211_wext_siwpower(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_param *wrq, char *extra);
+int cfg80211_wext_giwpower(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_param *wrq, char *extra);
+
+int cfg80211_wext_siwap(struct net_device *dev,
+			struct iw_request_info *info,
+			struct sockaddr *ap_addr, char *extra);
+int cfg80211_wext_giwap(struct net_device *dev,
+			struct iw_request_info *info,
+			struct sockaddr *ap_addr, char *extra);
+
+int cfg80211_wext_siwpmksa(struct net_device *dev,
+			   struct iw_request_info *info,
+			   struct iw_point *data, char *extra);
+
+#endif /* __NET_CFG80211_WEXT_H */
--- a/include/net/cfg80211.h	2011-07-13 09:44:48.000000000 +0200
+++ b/include/net/cfg80211.h	2011-07-13 09:49:23.000000000 +0200
@@ -20,11 +20,6 @@
 #include <linux/ieee80211.h>
 #include <net/regulatory.h>
 
-/* remove once we remove the wext stuff */
-#include <net/iw_handler.h>
-#include <linux/wireless.h>
-
-
 /**
  * DOC: Introduction
  *
@@ -2368,113 +2363,6 @@ extern int freq_reg_info(struct wiphy *w
 			 const struct ieee80211_reg_rule **reg_rule);
 
 /*
- * Temporary wext handlers & helper functions
- *
- * In the future cfg80211 will simply assign the entire wext handler
- * structure to netdevs it manages, but we're not there yet.
- */
-int cfg80211_wext_giwname(struct net_device *dev,
-			  struct iw_request_info *info,
-			  char *name, char *extra);
-int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
-			  u32 *mode, char *extra);
-int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
-			  u32 *mode, char *extra);
-int cfg80211_wext_siwscan(struct net_device *dev,
-			  struct iw_request_info *info,
-			  union iwreq_data *wrqu, char *extra);
-int cfg80211_wext_giwscan(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_point *data, char *extra);
-int cfg80211_wext_siwmlme(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_point *data, char *extra);
-int cfg80211_wext_giwrange(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_point *data, char *extra);
-int cfg80211_wext_siwgenie(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_point *data, char *extra);
-int cfg80211_wext_siwauth(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_param *data, char *extra);
-int cfg80211_wext_giwauth(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_param *data, char *extra);
-
-int cfg80211_wext_siwfreq(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_freq *freq, char *extra);
-int cfg80211_wext_giwfreq(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_freq *freq, char *extra);
-int cfg80211_wext_siwessid(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_point *data, char *ssid);
-int cfg80211_wext_giwessid(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_point *data, char *ssid);
-int cfg80211_wext_siwrate(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_param *rate, char *extra);
-int cfg80211_wext_giwrate(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_param *rate, char *extra);
-
-int cfg80211_wext_siwrts(struct net_device *dev,
-			 struct iw_request_info *info,
-			 struct iw_param *rts, char *extra);
-int cfg80211_wext_giwrts(struct net_device *dev,
-			 struct iw_request_info *info,
-			 struct iw_param *rts, char *extra);
-int cfg80211_wext_siwfrag(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_param *frag, char *extra);
-int cfg80211_wext_giwfrag(struct net_device *dev,
-			  struct iw_request_info *info,
-			  struct iw_param *frag, char *extra);
-int cfg80211_wext_siwretry(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_param *retry, char *extra);
-int cfg80211_wext_giwretry(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_param *retry, char *extra);
-int cfg80211_wext_siwencodeext(struct net_device *dev,
-			       struct iw_request_info *info,
-			       struct iw_point *erq, char *extra);
-int cfg80211_wext_siwencode(struct net_device *dev,
-			    struct iw_request_info *info,
-			    struct iw_point *erq, char *keybuf);
-int cfg80211_wext_giwencode(struct net_device *dev,
-			    struct iw_request_info *info,
-			    struct iw_point *erq, char *keybuf);
-int cfg80211_wext_siwtxpower(struct net_device *dev,
-			     struct iw_request_info *info,
-			     union iwreq_data *data, char *keybuf);
-int cfg80211_wext_giwtxpower(struct net_device *dev,
-			     struct iw_request_info *info,
-			     union iwreq_data *data, char *keybuf);
-struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev);
-
-int cfg80211_wext_siwpower(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_param *wrq, char *extra);
-int cfg80211_wext_giwpower(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_param *wrq, char *extra);
-
-int cfg80211_wext_siwap(struct net_device *dev,
-			struct iw_request_info *info,
-			struct sockaddr *ap_addr, char *extra);
-int cfg80211_wext_giwap(struct net_device *dev,
-			struct iw_request_info *info,
-			struct sockaddr *ap_addr, char *extra);
-
-int cfg80211_wext_siwpmksa(struct net_device *dev,
-			   struct iw_request_info *info,
-			   struct iw_point *data, char *extra);
-
-/*
  * callbacks for asynchronous cfg80211 methods, notification
  * functions and BSS handling helpers
  */
--- a/net/wireless/scan.c	2011-07-13 09:46:42.000000000 +0200
+++ b/net/wireless/scan.c	2011-07-13 09:46:51.000000000 +0200
@@ -12,6 +12,7 @@
 #include <linux/etherdevice.h>
 #include <net/arp.h>
 #include <net/cfg80211.h>
+#include <net/cfg80211-wext.h>
 #include <net/iw_handler.h>
 #include "core.h"
 #include "nl80211.h"
--- a/net/wireless/wext-compat.c	2011-07-13 09:47:02.000000000 +0200
+++ b/net/wireless/wext-compat.c	2011-07-13 09:47:05.000000000 +0200
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <net/iw_handler.h>
 #include <net/cfg80211.h>
+#include <net/cfg80211-wext.h>
 #include "wext-compat.h"
 #include "core.h"
 
--- a/net/wireless/wext-sme.c	2011-07-13 09:47:46.000000000 +0200
+++ b/net/wireless/wext-sme.c	2011-07-13 09:47:48.000000000 +0200
@@ -9,6 +9,7 @@
 #include <linux/if_arp.h>
 #include <linux/slab.h>
 #include <net/cfg80211.h>
+#include <net/cfg80211-wext.h>
 #include "wext-compat.h"
 #include "nl80211.h"
 
--- a/drivers/net/wireless/ipw2x00/ipw2200.c	2011-07-13 09:50:04.000000000 +0200
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c	2011-07-13 09:50:26.000000000 +0200
@@ -32,6 +32,7 @@
 
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <net/cfg80211-wext.h>
 #include "ipw2200.h"
 
 
--- a/drivers/net/wireless/orinoco/wext.c	2011-07-13 09:50:04.000000000 +0200
+++ b/drivers/net/wireless/orinoco/wext.c	2011-07-13 09:50:30.000000000 +0200
@@ -9,6 +9,7 @@
 #include <linux/ieee80211.h>
 #include <net/iw_handler.h>
 #include <net/cfg80211.h>
+#include <net/cfg80211-wext.h>
 
 #include "hermes.h"
 #include "hermes_rid.h"



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 02/11] iwlagn: remove wireless extensions inclusions
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
  2011-07-13  8:39 ` [PATCH 01/11] cfg80211: split wext compatibility to separate header Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  8:39 ` [PATCH 03/11] iwlegacy: " Johannes Berg
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h and net/iw_handler.h headers are
for wireless extensions only, so mac80211 drivers
shouldn't be including them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-1000.c   |    1 -
 drivers/net/wireless/iwlwifi/iwl-2000.c   |    1 -
 drivers/net/wireless/iwlwifi/iwl-5000.c   |    1 -
 drivers/net/wireless/iwlwifi/iwl-6000.c   |    1 -
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c |    1 -
 drivers/net/wireless/iwlwifi/iwl-agn.c    |    1 -
 drivers/net/wireless/iwlwifi/iwl-led.c    |    1 -
 7 files changed, 7 deletions(-)

--- a/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-07-13 10:01:13.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-07-13 10:04:15.000000000 +0200
@@ -38,7 +38,6 @@
 #include <linux/sched.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-07-13 10:02:54.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-07-13 10:02:58.000000000 +0200
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c	2011-07-13 10:02:54.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c	2011-07-13 10:02:59.000000000 +0200
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-07-13 10:02:54.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-07-13 10:03:00.000000000 +0200
@@ -31,7 +31,6 @@
 #include <linux/sched.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-07-13 10:02:54.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-07-13 10:03:02.000000000 +0200
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-13 10:02:54.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-13 10:03:03.000000000 +0200
@@ -27,7 +27,6 @@
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 
 #include <linux/netdevice.h>
--- a/drivers/net/wireless/iwlwifi/iwl-led.c	2011-07-13 10:02:54.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c	2011-07-13 10:03:05.000000000 +0200
@@ -31,7 +31,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 03/11] iwlegacy: remove wireless extensions inclusions
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
  2011-07-13  8:39 ` [PATCH 01/11] cfg80211: split wext compatibility to separate header Johannes Berg
  2011-07-13  8:39 ` [PATCH 02/11] iwlagn: remove wireless extensions inclusions Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  8:39 ` [PATCH 04/11] ath5k: " Johannes Berg
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h and net/iw_handler.h headers are
for wireless extensions only, so mac80211 drivers
shouldn't be including them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/iwlegacy/iwl-3945-led.c |    1 -
 drivers/net/wireless/iwlegacy/iwl-3945-rs.c  |    1 -
 drivers/net/wireless/iwlegacy/iwl-3945.c     |    1 -
 drivers/net/wireless/iwlegacy/iwl-4965-led.c |    1 -
 drivers/net/wireless/iwlegacy/iwl-4965-rs.c  |    1 -
 drivers/net/wireless/iwlegacy/iwl-4965.c     |    1 -
 drivers/net/wireless/iwlegacy/iwl-led.c      |    1 -
 drivers/net/wireless/iwlegacy/iwl3945-base.c |    1 -
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    1 -
 9 files changed, 9 deletions(-)

--- a/drivers/net/wireless/iwlegacy/iwl-3945-led.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-led.c	2011-07-13 10:03:29.000000000 +0200
@@ -32,7 +32,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c	2011-07-13 10:03:30.000000000 +0200
@@ -28,7 +28,6 @@
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 
 #include <linux/netdevice.h>
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.c	2011-07-13 10:03:31.000000000 +0200
@@ -34,7 +34,6 @@
 #include <linux/sched.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlegacy/iwl-4965-led.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-led.c	2011-07-13 10:03:32.000000000 +0200
@@ -32,7 +32,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c	2011-07-13 10:03:33.000000000 +0200
@@ -27,7 +27,6 @@
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 
 #include <linux/netdevice.h>
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.c	2011-07-13 10:03:34.000000000 +0200
@@ -33,7 +33,6 @@
 #include <linux/sched.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlegacy/iwl-led.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl-led.c	2011-07-13 10:03:35.000000000 +0200
@@ -33,7 +33,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-07-13 10:03:36.000000000 +0200
@@ -40,7 +40,6 @@
 #include <linux/sched.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c	2011-07-13 10:03:26.000000000 +0200
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c	2011-07-13 10:03:37.000000000 +0200
@@ -40,7 +40,6 @@
 #include <linux/sched.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 04/11] ath5k: remove wireless extensions inclusions
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (2 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 03/11] iwlegacy: " Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13 14:16   ` Pavel Roskin
  2011-07-13  8:39 ` [PATCH 05/11] b43: " Johannes Berg
                   ` (6 subsequent siblings)
  10 siblings, 1 reply; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h and net/iw_handler.h headers are
for wireless extensions only, so mac80211 drivers
shouldn't be including them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/ath/ath5k/base.h |    1 -
 1 file changed, 1 deletion(-)

--- a/drivers/net/wireless/ath/ath5k/base.h	2011-07-13 10:07:03.000000000 +0200
+++ b/drivers/net/wireless/ath/ath5k/base.h	2011-07-13 10:07:07.000000000 +0200
@@ -43,7 +43,6 @@
 
 #include <linux/interrupt.h>
 #include <linux/list.h>
-#include <linux/wireless.h>
 #include <linux/if_ether.h>
 #include <linux/leds.h>
 #include <linux/rfkill.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 05/11] b43: remove wireless extensions inclusions
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (3 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 04/11] ath5k: " Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  8:39 ` [PATCH 06/11] b43legacy: " Johannes Berg
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h and net/iw_handler.h headers are
for wireless extensions only, so mac80211 drivers
shouldn't be including them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/b43/main.c |    1 -
 1 file changed, 1 deletion(-)

--- a/drivers/net/wireless/b43/main.c	2011-07-13 10:09:54.000000000 +0200
+++ b/drivers/net/wireless/b43/main.c	2011-07-13 10:09:56.000000000 +0200
@@ -37,7 +37,6 @@
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/firmware.h>
-#include <linux/wireless.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
 #include <linux/io.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 06/11] b43legacy: remove wireless extensions inclusions
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (4 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 05/11] b43: " Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13 14:02   ` Larry Finger
  2011-07-13  8:39 ` [PATCH 07/11] rndis_wlan: " Johannes Berg
                   ` (4 subsequent siblings)
  10 siblings, 1 reply; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h and net/iw_handler.h headers are
for wireless extensions only, so mac80211 drivers
shouldn't be including them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/b43legacy/b43legacy.h |    1 -
 drivers/net/wireless/b43legacy/main.c      |    1 -
 2 files changed, 2 deletions(-)

--- a/drivers/net/wireless/b43legacy/b43legacy.h	2011-07-13 10:10:08.000000000 +0200
+++ b/drivers/net/wireless/b43legacy/b43legacy.h	2011-07-13 10:10:12.000000000 +0200
@@ -14,7 +14,6 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 
-#include <linux/wireless.h>
 #include <net/mac80211.h>
 
 #include "debugfs.h"
--- a/drivers/net/wireless/b43legacy/main.c	2011-07-13 10:10:08.000000000 +0200
+++ b/drivers/net/wireless/b43legacy/main.c	2011-07-13 10:10:14.000000000 +0200
@@ -35,7 +35,6 @@
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/firmware.h>
-#include <linux/wireless.h>
 #include <linux/workqueue.h>
 #include <linux/sched.h>
 #include <linux/skbuff.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 07/11] rndis_wlan: remove wireless extensions inclusions
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (5 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 06/11] b43legacy: " Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  8:39 ` [PATCH 08/11] wl12xx: remove wext dependencies Johannes Berg
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h and net/iw_handler.h headers are
for wireless extensions only, so mac80211 drivers
shouldn't be including them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/rndis_wlan.c |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/net/wireless/rndis_wlan.c	2011-07-13 10:27:00.000000000 +0200
+++ b/drivers/net/wireless/rndis_wlan.c	2011-07-13 10:27:55.000000000 +0200
@@ -36,13 +36,11 @@
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
-#include <linux/wireless.h>
 #include <linux/ieee80211.h>
 #include <linux/if_arp.h>
 #include <linux/ctype.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <net/iw_handler.h>
 #include <net/cfg80211.h>
 #include <linux/usb/usbnet.h>
 #include <linux/usb/rndis_host.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 08/11] wl12xx: remove wext dependencies
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (6 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 07/11] rndis_wlan: " Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  9:04   ` Luciano Coelho
  2011-07-13  8:39 ` [PATCH 09/11] wl1251: " Johannes Berg
                   ` (2 subsequent siblings)
  10 siblings, 1 reply; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

This driver uses IW_ESSID_MAX_SIZE when it should
be using IEEE80211_MAX_SSID_LEN instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/wl12xx/cmd.h          |    4 ++--
 drivers/net/wireless/wl12xx/main.c         |    2 +-
 drivers/net/wireless/wl12xx/scan.h         |    6 +++---
 drivers/net/wireless/wl12xx/wl12xx.h       |    4 ++--
 drivers/net/wireless/wl12xx/wl12xx_80211.h |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

--- a/drivers/net/wireless/wl12xx/cmd.h	2011-07-13 10:22:17.000000000 +0200
+++ b/drivers/net/wireless/wl12xx/cmd.h	2011-07-13 10:22:22.000000000 +0200
@@ -239,7 +239,7 @@ struct wl1271_cmd_join {
 	u8 bss_type;
 	u8 channel;
 	u8 ssid_len;
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	u8 ctrl; /* JOIN_CMD_CTRL_* */
 	u8 reserved[3];
 } __packed;
@@ -528,7 +528,7 @@ struct wl1271_cmd_bss_start {
 	/* wl1271_ssid_type */
 	u8 ssid_type;
 	u8 ssid_len;
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	u8 padding_1[2];
 
 	/* Basic rate set */
--- a/drivers/net/wireless/wl12xx/main.c	2011-07-13 10:22:17.000000000 +0200
+++ b/drivers/net/wireless/wl12xx/main.c	2011-07-13 10:22:22.000000000 +0200
@@ -1997,7 +1997,7 @@ static void __wl1271_op_remove_interface
 	wl1271_power_off(wl);
 
 	memset(wl->bssid, 0, ETH_ALEN);
-	memset(wl->ssid, 0, IW_ESSID_MAX_SIZE + 1);
+	memset(wl->ssid, 0, IEEE80211_MAX_SSID_LEN + 1);
 	wl->ssid_len = 0;
 	wl->bss_type = MAX_BSS_TYPE;
 	wl->set_bss_type = MAX_BSS_TYPE;
--- a/drivers/net/wireless/wl12xx/scan.h	2011-07-13 10:22:17.000000000 +0200
+++ b/drivers/net/wireless/wl12xx/scan.h	2011-07-13 10:22:22.000000000 +0200
@@ -77,7 +77,7 @@ struct basic_scan_params {
 	u8 ssid_len;
 	/* in order to align */
 	u8 padding1[2];
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	/* Band to scan */
 	u8 band;
 	u8 use_ssid_list;
@@ -167,7 +167,7 @@ struct wl1271_cmd_sched_scan_config {
 	u8 filter_type;
 
 	u8 ssid_len;     /* For SCAN_SSID_FILTER_SPECIFIC */
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 
 	u8 n_probe_reqs; /* Number of probes requests per channel */
 
@@ -194,7 +194,7 @@ enum {
 struct wl1271_ssid {
 	u8 type;
 	u8 len;
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	/* u8 padding[2]; */
 } __packed;
 
--- a/drivers/net/wireless/wl12xx/wl12xx.h	2011-07-13 10:22:17.000000000 +0200
+++ b/drivers/net/wireless/wl12xx/wl12xx.h	2011-07-13 10:22:22.000000000 +0200
@@ -309,7 +309,7 @@ struct wl1271_scan {
 	unsigned long scanned_ch[BITS_TO_LONGS(WL1271_MAX_CHANNELS)];
 	bool failed;
 	u8 state;
-	u8 ssid[IW_ESSID_MAX_SIZE+1];
+	u8 ssid[IEEE80211_MAX_SSID_LEN+1];
 	size_t ssid_len;
 };
 
@@ -415,7 +415,7 @@ struct wl1271 {
 	u8 mac_addr[ETH_ALEN];
 	u8 bss_type;
 	u8 set_bss_type;
-	u8 ssid[IW_ESSID_MAX_SIZE + 1];
+	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
 	u8 ssid_len;
 	int channel;
 
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h	2011-07-13 10:22:17.000000000 +0200
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h	2011-07-13 10:22:22.000000000 +0200
@@ -77,7 +77,7 @@ struct wl12xx_ie_header {
 
 struct wl12xx_ie_ssid {
 	struct wl12xx_ie_header header;
-	char ssid[IW_ESSID_MAX_SIZE];
+	char ssid[IEEE80211_MAX_SSID_LEN];
 } __packed;
 
 struct wl12xx_ie_rates {



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 09/11] wl1251: remove wext dependencies
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (7 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 08/11] wl12xx: remove wext dependencies Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13  8:39 ` [PATCH 10/11] mwifiex: add wext include Johannes Berg
  2011-07-13  8:39 ` [PATCH 11/11] mac80211: remove linux/wireless.h inclusion Johannes Berg
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

This driver uses IW_ESSID_MAX_SIZE when it should
be using IEEE80211_MAX_SSID_LEN instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/wl1251/cmd.h          |    2 +-
 drivers/net/wireless/wl1251/wl12xx_80211.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/net/wireless/wl1251/cmd.h	2011-07-13 10:22:47.000000000 +0200
+++ b/drivers/net/wireless/wl1251/cmd.h	2011-07-13 10:22:50.000000000 +0200
@@ -269,7 +269,7 @@ struct cmd_join {
 	u8 bss_type;
 	u8 channel;
 	u8 ssid_len;
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	u8 ctrl; /* JOIN_CMD_CTRL_* */
 	u8 tx_mgt_frame_rate; /* OBSOLETE */
 	u8 tx_mgt_frame_mod;  /* OBSOLETE */
--- a/drivers/net/wireless/wl1251/wl12xx_80211.h	2011-07-13 10:22:47.000000000 +0200
+++ b/drivers/net/wireless/wl1251/wl12xx_80211.h	2011-07-13 10:22:50.000000000 +0200
@@ -76,7 +76,7 @@ struct wl12xx_ie_header {
 
 struct wl12xx_ie_ssid {
 	struct wl12xx_ie_header header;
-	char ssid[IW_ESSID_MAX_SIZE];
+	char ssid[IEEE80211_MAX_SSID_LEN];
 } __packed;
 
 struct wl12xx_ie_rates {



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 10/11] mwifiex: add wext include
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (8 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 09/11] wl1251: " Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  2011-07-13 19:56   ` Bing Zhao
  2011-07-13  8:39 ` [PATCH 11/11] mac80211: remove linux/wireless.h inclusion Johannes Berg
  10 siblings, 1 reply; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless, Bing Zhao

From: Johannes Berg <johannes.berg@intel.com>

In trying to remove the wext includes from mac80211
and cfg80211 I found that mwifiex currently uses
them. This is wrong, it shouldn't, but to not break
it completely include wext there.

Please remove this and fix all the resulting bugs.

Cc: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/mwifiex/ioctl.h |    1 +
 1 file changed, 1 insertion(+)

--- a/drivers/net/wireless/mwifiex/ioctl.h	2011-07-13 10:29:57.000000000 +0200
+++ b/drivers/net/wireless/mwifiex/ioctl.h	2011-07-13 10:32:42.000000000 +0200
@@ -20,6 +20,7 @@
 #ifndef _MWIFIEX_IOCTL_H_
 #define _MWIFIEX_IOCTL_H_
 
+#include <linux/wireless.h>
 #include <net/mac80211.h>
 
 enum {



^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 11/11] mac80211: remove linux/wireless.h inclusion
  2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
                   ` (9 preceding siblings ...)
  2011-07-13  8:39 ` [PATCH 10/11] mwifiex: add wext include Johannes Berg
@ 2011-07-13  8:39 ` Johannes Berg
  10 siblings, 0 replies; 16+ messages in thread
From: Johannes Berg @ 2011-07-13  8:39 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

linux/wireless.h is for wireless extensions only, so
mac80211 shouldn't include it since it uses cfg80211.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 include/net/mac80211.h |    1 -
 1 file changed, 1 deletion(-)

--- a/include/net/mac80211.h	2011-07-13 10:33:11.000000000 +0200
+++ b/include/net/mac80211.h	2011-07-13 10:33:14.000000000 +0200
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/if_ether.h>
 #include <linux/skbuff.h>
-#include <linux/wireless.h>
 #include <linux/device.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 08/11] wl12xx: remove wext dependencies
  2011-07-13  8:39 ` [PATCH 08/11] wl12xx: remove wext dependencies Johannes Berg
@ 2011-07-13  9:04   ` Luciano Coelho
  0 siblings, 0 replies; 16+ messages in thread
From: Luciano Coelho @ 2011-07-13  9:04 UTC (permalink / raw)
  To: Johannes Berg; +Cc: John Linville, linux-wireless

On Wed, 2011-07-13 at 10:39 +0200, Johannes Berg wrote:
> plain text document attachment (011-wl12xx-fix-wext.patch)
> From: Johannes Berg <johannes.berg@intel.com>
> 
> This driver uses IW_ESSID_MAX_SIZE when it should
> be using IEEE80211_MAX_SSID_LEN instead.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---

Acked-by: Luciano Coelho <coelho@ti.com>

-- 
Cheers,
Luca.


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 06/11] b43legacy: remove wireless extensions inclusions
  2011-07-13  8:39 ` [PATCH 06/11] b43legacy: " Johannes Berg
@ 2011-07-13 14:02   ` Larry Finger
  0 siblings, 0 replies; 16+ messages in thread
From: Larry Finger @ 2011-07-13 14:02 UTC (permalink / raw)
  To: Johannes Berg; +Cc: John Linville, linux-wireless

On 07/13/2011 03:39 AM, Johannes Berg wrote:
> From: Johannes Berg<johannes.berg@intel.com>
>
> linux/wireless.h and net/iw_handler.h headers are
> for wireless extensions only, so mac80211 drivers
> shouldn't be including them.
>
> Signed-off-by: Johannes Berg<johannes.berg@intel.com>
> ---
>   drivers/net/wireless/b43legacy/b43legacy.h |    1 -
>   drivers/net/wireless/b43legacy/main.c      |    1 -
>   2 files changed, 2 deletions(-)

ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 04/11] ath5k: remove wireless extensions inclusions
  2011-07-13  8:39 ` [PATCH 04/11] ath5k: " Johannes Berg
@ 2011-07-13 14:16   ` Pavel Roskin
  0 siblings, 0 replies; 16+ messages in thread
From: Pavel Roskin @ 2011-07-13 14:16 UTC (permalink / raw)
  To: Johannes Berg; +Cc: John Linville, linux-wireless

On 07/13/2011 04:39 AM, Johannes Berg wrote:
> From: Johannes Berg<johannes.berg@intel.com>
>
> linux/wireless.h and net/iw_handler.h headers are
> for wireless extensions only, so mac80211 drivers
> shouldn't be including them.
>
> Signed-off-by: Johannes Berg<johannes.berg@intel.com>

Acked-by: Pavel Roskin <proski@gnu.org>

-- 
Regards,
Pavel Roskin

^ permalink raw reply	[flat|nested] 16+ messages in thread

* RE: [PATCH 10/11] mwifiex: add wext include
  2011-07-13  8:39 ` [PATCH 10/11] mwifiex: add wext include Johannes Berg
@ 2011-07-13 19:56   ` Bing Zhao
  0 siblings, 0 replies; 16+ messages in thread
From: Bing Zhao @ 2011-07-13 19:56 UTC (permalink / raw)
  To: Johannes Berg, John Linville; +Cc: linux-wireless

Hi Johannes,

> From: Johannes Berg <johannes.berg@intel.com>
> 
> In trying to remove the wext includes from mac80211
> and cfg80211 I found that mwifiex currently uses
> them. This is wrong, it shouldn't, but to not break
> it completely include wext there.
> 
> Please remove this and fix all the resulting bugs.

Thanks for pointing that out.
I will remove the wext and fix all the resulting bugs.

Thanks,
Bing

> 
> Cc: Bing Zhao <bzhao@marvell.com>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Acked-by: Bing Zhao <bzhao@marvell.com>

> ---
>  drivers/net/wireless/mwifiex/ioctl.h |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- a/drivers/net/wireless/mwifiex/ioctl.h	2011-07-13 10:29:57.000000000 +0200
> +++ b/drivers/net/wireless/mwifiex/ioctl.h	2011-07-13 10:32:42.000000000 +0200
> @@ -20,6 +20,7 @@
>  #ifndef _MWIFIEX_IOCTL_H_
>  #define _MWIFIEX_IOCTL_H_
> 
> +#include <linux/wireless.h>
>  #include <net/mac80211.h>
> 
>  enum {
> 


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2011-07-13 19:56 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-13  8:39 [PATCH 00/11] wext reductio Johannes Berg
2011-07-13  8:39 ` [PATCH 01/11] cfg80211: split wext compatibility to separate header Johannes Berg
2011-07-13  8:39 ` [PATCH 02/11] iwlagn: remove wireless extensions inclusions Johannes Berg
2011-07-13  8:39 ` [PATCH 03/11] iwlegacy: " Johannes Berg
2011-07-13  8:39 ` [PATCH 04/11] ath5k: " Johannes Berg
2011-07-13 14:16   ` Pavel Roskin
2011-07-13  8:39 ` [PATCH 05/11] b43: " Johannes Berg
2011-07-13  8:39 ` [PATCH 06/11] b43legacy: " Johannes Berg
2011-07-13 14:02   ` Larry Finger
2011-07-13  8:39 ` [PATCH 07/11] rndis_wlan: " Johannes Berg
2011-07-13  8:39 ` [PATCH 08/11] wl12xx: remove wext dependencies Johannes Berg
2011-07-13  9:04   ` Luciano Coelho
2011-07-13  8:39 ` [PATCH 09/11] wl1251: " Johannes Berg
2011-07-13  8:39 ` [PATCH 10/11] mwifiex: add wext include Johannes Berg
2011-07-13 19:56   ` Bing Zhao
2011-07-13  8:39 ` [PATCH 11/11] mac80211: remove linux/wireless.h inclusion Johannes Berg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.