Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a11622 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f9298f9

drivers/net/wireless/iwmc3200wifi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config IWM 
	tristate "Intel Wireless Multicomm 3200 WiFi driver"

	depends on MMC && WLAN_80211 && EXPERIMENTAL

	depends on CFG80211

	select WIRELESS_EXT

	select FW_LOADER

	help

	  The Intel Wireless Multicomm 3200 hardware is a combo

drivers/net/wireless/iwmc3200wifi/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_IWM) := iwmc3200wifi.o

iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o

iwmc3200wifi-objs += commands.o wext.o cfg80211.o eeprom.o

iwmc3200wifi-objs += commands.o cfg80211.o eeprom.o



iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o

drivers/net/wireless/iwmc3200wifi/iwm.h

+0 −2
Original line number Diff line number Diff line
@@ -306,8 +306,6 @@ static inline void *iwm_private(struct iwm_priv *iwm) 
#define skb_to_rx_info(s) ((struct iwm_rx_info *)(s->cb))

#define skb_to_tx_info(s) ((struct iwm_tx_info *)s->cb)



extern const struct iw_handler_def iwm_iw_handler_def;



void *iwm_if_alloc(int sizeof_bus, struct device *dev,

		   struct iwm_if_ops *if_ops);

void iwm_if_free(struct iwm_priv *iwm);

drivers/net/wireless/iwmc3200wifi/netdev.c

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev, 
	}



	ndev->netdev_ops = &iwm_netdev_ops;

	ndev->wireless_handlers = &iwm_iw_handler_def;

	ndev->ieee80211_ptr = wdev;

	SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));

	wdev->netdev = ndev;

drivers/net/wireless/iwmc3200wifi/wext.c

deleted100644 → 0
+0 −95
Original line number Diff line number Diff line 
/*

 * Intel Wireless Multicomm 3200 WiFi driver

 *

 * Copyright (C) 2009 Intel Corporation <ilw@linux.intel.com>

 * Samuel Ortiz <samuel.ortiz@intel.com>

 * Zhu Yi <yi.zhu@intel.com>

 *

 * 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.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 *

 */



#include <linux/wireless.h>

#include <net/cfg80211.h>



#include "iwm.h"

#include "commands.h"



static const iw_handler iwm_handlers[] =

{

	(iw_handler) NULL,				/* SIOCSIWCOMMIT */

	(iw_handler) cfg80211_wext_giwname,		/* SIOCGIWNAME */

	(iw_handler) NULL,				/* SIOCSIWNWID */

	(iw_handler) NULL,				/* SIOCGIWNWID */

	(iw_handler) cfg80211_wext_siwfreq,		/* SIOCSIWFREQ */

	(iw_handler) cfg80211_wext_giwfreq,		/* SIOCGIWFREQ */

	(iw_handler) cfg80211_wext_siwmode,		/* SIOCSIWMODE */

	(iw_handler) cfg80211_wext_giwmode,		/* SIOCGIWMODE */

	(iw_handler) NULL,				/* SIOCSIWSENS */

	(iw_handler) NULL,				/* SIOCGIWSENS */

	(iw_handler) NULL /* not used */,		/* SIOCSIWRANGE */

	(iw_handler) cfg80211_wext_giwrange,		/* SIOCGIWRANGE */

	(iw_handler) NULL /* not used */,		/* SIOCSIWPRIV */

	(iw_handler) NULL /* kernel code */,		/* SIOCGIWPRIV */

	(iw_handler) NULL /* not used */,		/* SIOCSIWSTATS */

	(iw_handler) NULL /* kernel code */,		/* SIOCGIWSTATS */

	(iw_handler) NULL,				/* SIOCSIWSPY */

	(iw_handler) NULL,				/* SIOCGIWSPY */

	(iw_handler) NULL,				/* SIOCSIWTHRSPY */

	(iw_handler) NULL,				/* SIOCGIWTHRSPY */

	(iw_handler) cfg80211_wext_siwap,		/* SIOCSIWAP */

	(iw_handler) cfg80211_wext_giwap,		/* SIOCGIWAP */

	(iw_handler) NULL,			        /* SIOCSIWMLME */

	(iw_handler) NULL,				/* SIOCGIWAPLIST */

	(iw_handler) cfg80211_wext_siwscan,		/* SIOCSIWSCAN */

	(iw_handler) cfg80211_wext_giwscan,		/* SIOCGIWSCAN */

	(iw_handler) cfg80211_wext_siwessid,		/* SIOCSIWESSID */

	(iw_handler) cfg80211_wext_giwessid,		/* SIOCGIWESSID */

	(iw_handler) NULL,				/* SIOCSIWNICKN */

	(iw_handler) NULL,				/* SIOCGIWNICKN */

	(iw_handler) NULL,				/* -- hole -- */

	(iw_handler) NULL,				/* -- hole -- */

	(iw_handler) NULL,				/* SIOCSIWRATE */

	(iw_handler) cfg80211_wext_giwrate,		/* SIOCGIWRATE */

	(iw_handler) cfg80211_wext_siwrts,		/* SIOCSIWRTS */

	(iw_handler) cfg80211_wext_giwrts,		/* SIOCGIWRTS */

	(iw_handler) cfg80211_wext_siwfrag,	        /* SIOCSIWFRAG */

	(iw_handler) cfg80211_wext_giwfrag,		/* SIOCGIWFRAG */

	(iw_handler) cfg80211_wext_siwtxpower,		/* SIOCSIWTXPOW */

	(iw_handler) cfg80211_wext_giwtxpower,		/* SIOCGIWTXPOW */

	(iw_handler) NULL,				/* SIOCSIWRETRY */

	(iw_handler) NULL,				/* SIOCGIWRETRY */

	(iw_handler) cfg80211_wext_siwencode,		/* SIOCSIWENCODE */

	(iw_handler) cfg80211_wext_giwencode,		/* SIOCGIWENCODE */

	(iw_handler) cfg80211_wext_siwpower,		/* SIOCSIWPOWER */

	(iw_handler) cfg80211_wext_giwpower,		/* SIOCGIWPOWER */

	(iw_handler) NULL,				/* -- hole -- */

	(iw_handler) NULL,				/* -- hole -- */

	(iw_handler) cfg80211_wext_siwgenie,            /* SIOCSIWGENIE */

	(iw_handler) NULL,				/* SIOCGIWGENIE */

	(iw_handler) cfg80211_wext_siwauth,		/* SIOCSIWAUTH */

	(iw_handler) cfg80211_wext_giwauth,		/* SIOCGIWAUTH */

	(iw_handler) cfg80211_wext_siwencodeext,	/* SIOCSIWENCODEEXT */

	(iw_handler) NULL,				/* SIOCGIWENCODEEXT */

	(iw_handler) NULL,				/* SIOCSIWPMKSA */

	(iw_handler) NULL,				/* -- hole -- */

};



const struct iw_handler_def iwm_iw_handler_def = {

	.num_standard	= ARRAY_SIZE(iwm_handlers),

	.standard	= (iw_handler *) iwm_handlers,

	.get_wireless_stats = cfg80211_wireless_stats,

};