diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-27 06:01:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-29 15:46:20 -0400 |
commit | a9a11622c5c742c115fad371c0397ae86dd3bb67 (patch) | |
tree | 747d04a77d4411886befb5701322fa06da90a0fb /drivers/net/wireless/iwmc3200wifi | |
parent | 1f9298f96082692bdfe73af6fc2167f627f21647 (diff) |
cfg80211: self-contained wext handling where possible
Finally! This is what you've all been waiting for!
This patch makes cfg80211 take care of wext emulation
_completely_ by itself, drivers that don't need things
cfg80211 doesn't do yet don't even need to be aware of
wireless extensions.
This means we can also clean up mac80211's and iwm's
Kconfig and make it possible to build them w/o wext
now!
RIP wext.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/iwm.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/netdev.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/wext.c | 95 |
5 files changed, 1 insertions, 100 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/Kconfig b/drivers/net/wireless/iwmc3200wifi/Kconfig index 030401d367d3..c62da435285a 100644 --- a/drivers/net/wireless/iwmc3200wifi/Kconfig +++ b/drivers/net/wireless/iwmc3200wifi/Kconfig | |||
@@ -2,7 +2,6 @@ config IWM | |||
2 | tristate "Intel Wireless Multicomm 3200 WiFi driver" | 2 | tristate "Intel Wireless Multicomm 3200 WiFi driver" |
3 | depends on MMC && WLAN_80211 && EXPERIMENTAL | 3 | depends on MMC && WLAN_80211 && EXPERIMENTAL |
4 | depends on CFG80211 | 4 | depends on CFG80211 |
5 | select WIRELESS_EXT | ||
6 | select FW_LOADER | 5 | select FW_LOADER |
7 | help | 6 | help |
8 | The Intel Wireless Multicomm 3200 hardware is a combo | 7 | The Intel Wireless Multicomm 3200 hardware is a combo |
diff --git a/drivers/net/wireless/iwmc3200wifi/Makefile b/drivers/net/wireless/iwmc3200wifi/Makefile index 927f022545c1..d34291b652d3 100644 --- a/drivers/net/wireless/iwmc3200wifi/Makefile +++ b/drivers/net/wireless/iwmc3200wifi/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | obj-$(CONFIG_IWM) := iwmc3200wifi.o | 1 | obj-$(CONFIG_IWM) := iwmc3200wifi.o |
2 | iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o | 2 | iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o |
3 | iwmc3200wifi-objs += commands.o wext.o cfg80211.o eeprom.o | 3 | iwmc3200wifi-objs += commands.o cfg80211.o eeprom.o |
4 | 4 | ||
5 | iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o | 5 | iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o |
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h index 2175a481d2f4..7a51bc340fda 100644 --- a/drivers/net/wireless/iwmc3200wifi/iwm.h +++ b/drivers/net/wireless/iwmc3200wifi/iwm.h | |||
@@ -306,8 +306,6 @@ static inline void *iwm_private(struct iwm_priv *iwm) | |||
306 | #define skb_to_rx_info(s) ((struct iwm_rx_info *)(s->cb)) | 306 | #define skb_to_rx_info(s) ((struct iwm_rx_info *)(s->cb)) |
307 | #define skb_to_tx_info(s) ((struct iwm_tx_info *)s->cb) | 307 | #define skb_to_tx_info(s) ((struct iwm_tx_info *)s->cb) |
308 | 308 | ||
309 | extern const struct iw_handler_def iwm_iw_handler_def; | ||
310 | |||
311 | void *iwm_if_alloc(int sizeof_bus, struct device *dev, | 309 | void *iwm_if_alloc(int sizeof_bus, struct device *dev, |
312 | struct iwm_if_ops *if_ops); | 310 | struct iwm_if_ops *if_ops); |
313 | void iwm_if_free(struct iwm_priv *iwm); | 311 | void iwm_if_free(struct iwm_priv *iwm); |
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c index 092d28ae56a0..30116d1b4489 100644 --- a/drivers/net/wireless/iwmc3200wifi/netdev.c +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c | |||
@@ -123,7 +123,6 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev, | |||
123 | } | 123 | } |
124 | 124 | ||
125 | ndev->netdev_ops = &iwm_netdev_ops; | 125 | ndev->netdev_ops = &iwm_netdev_ops; |
126 | ndev->wireless_handlers = &iwm_iw_handler_def; | ||
127 | ndev->ieee80211_ptr = wdev; | 126 | ndev->ieee80211_ptr = wdev; |
128 | SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy)); | 127 | SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy)); |
129 | wdev->netdev = ndev; | 128 | wdev->netdev = ndev; |
diff --git a/drivers/net/wireless/iwmc3200wifi/wext.c b/drivers/net/wireless/iwmc3200wifi/wext.c deleted file mode 100644 index 9196024a2890..000000000000 --- a/drivers/net/wireless/iwmc3200wifi/wext.c +++ /dev/null | |||
@@ -1,95 +0,0 @@ | |||
1 | /* | ||
2 | * Intel Wireless Multicomm 3200 WiFi driver | ||
3 | * | ||
4 | * Copyright (C) 2009 Intel Corporation <ilw@linux.intel.com> | ||
5 | * Samuel Ortiz <samuel.ortiz@intel.com> | ||
6 | * Zhu Yi <yi.zhu@intel.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or | ||
9 | * modify it under the terms of the GNU General Public License version | ||
10 | * 2 as published by the Free Software Foundation. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
20 | * 02110-1301, USA. | ||
21 | * | ||
22 | */ | ||
23 | |||
24 | #include <linux/wireless.h> | ||
25 | #include <net/cfg80211.h> | ||
26 | |||
27 | #include "iwm.h" | ||
28 | #include "commands.h" | ||
29 | |||
30 | static const iw_handler iwm_handlers[] = | ||
31 | { | ||
32 | (iw_handler) NULL, /* SIOCSIWCOMMIT */ | ||
33 | (iw_handler) cfg80211_wext_giwname, /* SIOCGIWNAME */ | ||
34 | (iw_handler) NULL, /* SIOCSIWNWID */ | ||
35 | (iw_handler) NULL, /* SIOCGIWNWID */ | ||
36 | (iw_handler) cfg80211_wext_siwfreq, /* SIOCSIWFREQ */ | ||
37 | (iw_handler) cfg80211_wext_giwfreq, /* SIOCGIWFREQ */ | ||
38 | (iw_handler) cfg80211_wext_siwmode, /* SIOCSIWMODE */ | ||
39 | (iw_handler) cfg80211_wext_giwmode, /* SIOCGIWMODE */ | ||
40 | (iw_handler) NULL, /* SIOCSIWSENS */ | ||
41 | (iw_handler) NULL, /* SIOCGIWSENS */ | ||
42 | (iw_handler) NULL /* not used */, /* SIOCSIWRANGE */ | ||
43 | (iw_handler) cfg80211_wext_giwrange, /* SIOCGIWRANGE */ | ||
44 | (iw_handler) NULL /* not used */, /* SIOCSIWPRIV */ | ||
45 | (iw_handler) NULL /* kernel code */, /* SIOCGIWPRIV */ | ||
46 | (iw_handler) NULL /* not used */, /* SIOCSIWSTATS */ | ||
47 | (iw_handler) NULL /* kernel code */, /* SIOCGIWSTATS */ | ||
48 | (iw_handler) NULL, /* SIOCSIWSPY */ | ||
49 | (iw_handler) NULL, /* SIOCGIWSPY */ | ||
50 | (iw_handler) NULL, /* SIOCSIWTHRSPY */ | ||
51 | (iw_handler) NULL, /* SIOCGIWTHRSPY */ | ||
52 | (iw_handler) cfg80211_wext_siwap, /* SIOCSIWAP */ | ||
53 | (iw_handler) cfg80211_wext_giwap, /* SIOCGIWAP */ | ||
54 | (iw_handler) NULL, /* SIOCSIWMLME */ | ||
55 | (iw_handler) NULL, /* SIOCGIWAPLIST */ | ||
56 | (iw_handler) cfg80211_wext_siwscan, /* SIOCSIWSCAN */ | ||
57 | (iw_handler) cfg80211_wext_giwscan, /* SIOCGIWSCAN */ | ||
58 | (iw_handler) cfg80211_wext_siwessid, /* SIOCSIWESSID */ | ||
59 | (iw_handler) cfg80211_wext_giwessid, /* SIOCGIWESSID */ | ||
60 | (iw_handler) NULL, /* SIOCSIWNICKN */ | ||
61 | (iw_handler) NULL, /* SIOCGIWNICKN */ | ||
62 | (iw_handler) NULL, /* -- hole -- */ | ||
63 | (iw_handler) NULL, /* -- hole -- */ | ||
64 | (iw_handler) NULL, /* SIOCSIWRATE */ | ||
65 | (iw_handler) cfg80211_wext_giwrate, /* SIOCGIWRATE */ | ||
66 | (iw_handler) cfg80211_wext_siwrts, /* SIOCSIWRTS */ | ||
67 | (iw_handler) cfg80211_wext_giwrts, /* SIOCGIWRTS */ | ||
68 | (iw_handler) cfg80211_wext_siwfrag, /* SIOCSIWFRAG */ | ||
69 | (iw_handler) cfg80211_wext_giwfrag, /* SIOCGIWFRAG */ | ||
70 | (iw_handler) cfg80211_wext_siwtxpower, /* SIOCSIWTXPOW */ | ||
71 | (iw_handler) cfg80211_wext_giwtxpower, /* SIOCGIWTXPOW */ | ||
72 | (iw_handler) NULL, /* SIOCSIWRETRY */ | ||
73 | (iw_handler) NULL, /* SIOCGIWRETRY */ | ||
74 | (iw_handler) cfg80211_wext_siwencode, /* SIOCSIWENCODE */ | ||
75 | (iw_handler) cfg80211_wext_giwencode, /* SIOCGIWENCODE */ | ||
76 | (iw_handler) cfg80211_wext_siwpower, /* SIOCSIWPOWER */ | ||
77 | (iw_handler) cfg80211_wext_giwpower, /* SIOCGIWPOWER */ | ||
78 | (iw_handler) NULL, /* -- hole -- */ | ||
79 | (iw_handler) NULL, /* -- hole -- */ | ||
80 | (iw_handler) cfg80211_wext_siwgenie, /* SIOCSIWGENIE */ | ||
81 | (iw_handler) NULL, /* SIOCGIWGENIE */ | ||
82 | (iw_handler) cfg80211_wext_siwauth, /* SIOCSIWAUTH */ | ||
83 | (iw_handler) cfg80211_wext_giwauth, /* SIOCGIWAUTH */ | ||
84 | (iw_handler) cfg80211_wext_siwencodeext, /* SIOCSIWENCODEEXT */ | ||
85 | (iw_handler) NULL, /* SIOCGIWENCODEEXT */ | ||
86 | (iw_handler) NULL, /* SIOCSIWPMKSA */ | ||
87 | (iw_handler) NULL, /* -- hole -- */ | ||
88 | }; | ||
89 | |||
90 | const struct iw_handler_def iwm_iw_handler_def = { | ||
91 | .num_standard = ARRAY_SIZE(iwm_handlers), | ||
92 | .standard = (iw_handler *) iwm_handlers, | ||
93 | .get_wireless_stats = cfg80211_wireless_stats, | ||
94 | }; | ||
95 | |||