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

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

cfg80211: combine IWAP handlers 



Since we now have IWAP handlers for all modes, we can
combine them into one.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e82ffe3

drivers/net/wireless/iwmc3200wifi/wext.c

+2 −32
Original line number Diff line number Diff line
@@ -27,36 +27,6 @@ 
#include "iwm.h"

#include "commands.h"



static int iwm_wext_siwap(struct net_device *dev, struct iw_request_info *info,

			  struct sockaddr *ap_addr, char *extra)

{

	struct iwm_priv *iwm = ndev_to_iwm(dev);



	switch (iwm->conf.mode) {

	case UMAC_MODE_IBSS:

		return cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);

	case UMAC_MODE_BSS:

		return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);

	default:

		return -EOPNOTSUPP;

	}

}



static int iwm_wext_giwap(struct net_device *dev, struct iw_request_info *info,

			  struct sockaddr *ap_addr, char *extra)

{

	struct iwm_priv *iwm = ndev_to_iwm(dev);



	switch (iwm->conf.mode) {

	case UMAC_MODE_IBSS:

		return cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);

	case UMAC_MODE_BSS:

		return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);

	default:

		return -EOPNOTSUPP;

	}

}



static int iwm_wext_siwessid(struct net_device *dev,

			     struct iw_request_info *info,

			     struct iw_point *data, char *ssid)
@@ -111,8 +81,8 @@ static const iw_handler iwm_handlers[] = 
	(iw_handler) NULL,				/* SIOCGIWSPY */

	(iw_handler) NULL,				/* SIOCSIWTHRSPY */

	(iw_handler) NULL,				/* SIOCGIWTHRSPY */

	(iw_handler) iwm_wext_siwap,	                /* SIOCSIWAP */

	(iw_handler) iwm_wext_giwap,			/* SIOCGIWAP */

	(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 */

include/net/cfg80211.h

+6 −18
Original line number Diff line number Diff line
@@ -1601,12 +1601,6 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev, 
int cfg80211_ibss_wext_giwessid(struct net_device *dev,

				struct iw_request_info *info,

				struct iw_point *data, char *ssid);

int cfg80211_ibss_wext_siwap(struct net_device *dev,

			     struct iw_request_info *info,

			     struct sockaddr *ap_addr, char *extra);

int cfg80211_ibss_wext_giwap(struct net_device *dev,

			     struct iw_request_info *info,

			     struct sockaddr *ap_addr, char *extra);



int cfg80211_mgd_wext_siwessid(struct net_device *dev,

			       struct iw_request_info *info,
@@ -1614,12 +1608,6 @@ int cfg80211_mgd_wext_siwessid(struct net_device *dev, 
int cfg80211_mgd_wext_giwessid(struct net_device *dev,

			       struct iw_request_info *info,

			       struct iw_point *data, char *ssid);

int cfg80211_mgd_wext_siwap(struct net_device *dev,

			    struct iw_request_info *info,

			    struct sockaddr *ap_addr, char *extra);

int cfg80211_mgd_wext_giwap(struct net_device *dev,

			    struct iw_request_info *info,

			    struct sockaddr *ap_addr, char *extra);

int cfg80211_wext_siwgenie(struct net_device *dev,

			   struct iw_request_info *info,

			   struct iw_point *data, char *extra);
@@ -1686,12 +1674,12 @@ int cfg80211_wext_giwpower(struct net_device *dev, 
			   struct iw_request_info *info,

			   struct iw_param *wrq, char *extra);



int cfg80211_wds_wext_siwap(struct net_device *dev,

int cfg80211_wext_siwap(struct net_device *dev,

			struct iw_request_info *info,

			    struct sockaddr *addr, char *extra);

int cfg80211_wds_wext_giwap(struct net_device *dev,

			struct sockaddr *ap_addr, char *extra);

int cfg80211_wext_giwap(struct net_device *dev,

			struct iw_request_info *info,

			    struct sockaddr *addr, char *extra);

			struct sockaddr *ap_addr, char *extra);



/*

 * callbacks for asynchronous cfg80211 methods, notification

net/mac80211/wext.c

+2 −39
Original line number Diff line number Diff line
@@ -59,43 +59,6 @@ static int ieee80211_ioctl_giwessid(struct net_device *dev, 
}





static int ieee80211_ioctl_siwap(struct net_device *dev,

				 struct iw_request_info *info,

				 struct sockaddr *ap_addr, char *extra)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_WDS)

		return cfg80211_wds_wext_siwap(dev, info, ap_addr, extra);

	return -EOPNOTSUPP;

}





static int ieee80211_ioctl_giwap(struct net_device *dev,

				 struct iw_request_info *info,

				 struct sockaddr *ap_addr, char *extra)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (sdata->vif.type == NL80211_IFTYPE_ADHOC)

		return cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_STATION)

		return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);



	if (sdata->vif.type == NL80211_IFTYPE_WDS)

		return cfg80211_wds_wext_giwap(dev, info, ap_addr, extra);



	return -EOPNOTSUPP;

}





/* Structures to export the Wireless Handlers */



static const iw_handler ieee80211_handler[] =
@@ -120,8 +83,8 @@ static const iw_handler ieee80211_handler[] = 
	(iw_handler) NULL,				/* SIOCGIWSPY */

	(iw_handler) NULL,				/* SIOCSIWTHRSPY */

	(iw_handler) NULL,				/* SIOCGIWTHRSPY */

	(iw_handler) ieee80211_ioctl_siwap,		/* SIOCSIWAP */

	(iw_handler) ieee80211_ioctl_giwap,		/* SIOCGIWAP */

	(iw_handler) cfg80211_wext_siwap,		/* SIOCSIWAP */

	(iw_handler) cfg80211_wext_giwap,		/* SIOCGIWAP */

	(iw_handler) cfg80211_wext_siwmlme,		/* SIOCSIWMLME */

	(iw_handler) NULL,				/* SIOCGIWAPLIST */

	(iw_handler) cfg80211_wext_siwscan,		/* SIOCSIWSCAN */

net/wireless/ibss.c

+0 −4
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev, 


	return err;

}

/* temporary symbol - mark GPL - in the future the handler won't be */

EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwap);



int cfg80211_ibss_wext_giwap(struct net_device *dev,

			     struct iw_request_info *info,
@@ -493,6 +491,4 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev, 


	return 0;

}

/* temporary symbol - mark GPL - in the future the handler won't be */

EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_giwap);

#endif

net/wireless/wext-compat.c

+44 −8
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ int cfg80211_wext_giwpower(struct net_device *dev, 
}

EXPORT_SYMBOL_GPL(cfg80211_wext_giwpower);



int cfg80211_wds_wext_siwap(struct net_device *dev,

static int cfg80211_wds_wext_siwap(struct net_device *dev,

				   struct iw_request_info *info,

				   struct sockaddr *addr, char *extra)

{
@@ -1177,9 +1177,8 @@ int cfg80211_wds_wext_siwap(struct net_device *dev, 


	return 0;

}

EXPORT_SYMBOL_GPL(cfg80211_wds_wext_siwap);



int cfg80211_wds_wext_giwap(struct net_device *dev,

static int cfg80211_wds_wext_giwap(struct net_device *dev,

				   struct iw_request_info *info,

				   struct sockaddr *addr, char *extra)

{
@@ -1193,7 +1192,6 @@ int cfg80211_wds_wext_giwap(struct net_device *dev, 


	return 0;

}

EXPORT_SYMBOL_GPL(cfg80211_wds_wext_giwap);



int cfg80211_wext_siwrate(struct net_device *dev,

			  struct iw_request_info *info,
@@ -1327,3 +1325,41 @@ struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev) 
	return &wstats;

}

EXPORT_SYMBOL_GPL(cfg80211_wireless_stats);



int cfg80211_wext_siwap(struct net_device *dev,

			struct iw_request_info *info,

			struct sockaddr *ap_addr, char *extra)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;



	switch (wdev->iftype) {

	case NL80211_IFTYPE_ADHOC:

		return cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);

	case NL80211_IFTYPE_STATION:

		return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);

	case NL80211_IFTYPE_WDS:

		return cfg80211_wds_wext_siwap(dev, info, ap_addr, extra);

	default:

		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL_GPL(cfg80211_wext_siwap);



int cfg80211_wext_giwap(struct net_device *dev,

			struct iw_request_info *info,

			struct sockaddr *ap_addr, char *extra)

{

	struct wireless_dev *wdev = dev->ieee80211_ptr;



	switch (wdev->iftype) {

	case NL80211_IFTYPE_ADHOC:

		return cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);

	case NL80211_IFTYPE_STATION:

		return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);

	case NL80211_IFTYPE_WDS:

		return cfg80211_wds_wext_giwap(dev, info, ap_addr, extra);

	default:

		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL_GPL(cfg80211_wext_giwap);