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

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

cfg80211: combine iwfreq implementations 



Until now we implemented iwfreq for managed mode, we
needed to keep the implementations separate, but now
that we have all versions implemented we can combine
them and export just one handler.

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

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_siwfreq(struct net_device *dev,

			    struct iw_request_info *info,

			    struct iw_freq *freq, char *extra)

{

	struct iwm_priv *iwm = ndev_to_iwm(dev);



	switch (iwm->conf.mode) {

	case UMAC_MODE_IBSS:

		return cfg80211_ibss_wext_siwfreq(dev, info, freq, extra);

	default:

		return -EOPNOTSUPP;

	}

}



static int iwm_wext_giwfreq(struct net_device *dev,

			    struct iw_request_info *info,

			    struct iw_freq *freq, char *extra)

{

	struct iwm_priv *iwm = ndev_to_iwm(dev);



	switch (iwm->conf.mode) {

	case UMAC_MODE_IBSS:

		return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);

	case UMAC_MODE_BSS:

		return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);

	default:

		return -EOPNOTSUPP;

	}

}



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

			  struct sockaddr *ap_addr, char *extra)

{
@@ -125,8 +95,8 @@ static const iw_handler iwm_handlers[] = 
	(iw_handler) cfg80211_wext_giwname,		/* SIOCGIWNAME */

	(iw_handler) NULL,				/* SIOCSIWNWID */

	(iw_handler) NULL,				/* SIOCGIWNWID */

	(iw_handler) iwm_wext_siwfreq,			/* SIOCSIWFREQ */

	(iw_handler) iwm_wext_giwfreq,			/* SIOCGIWFREQ */

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

include/net/cfg80211.h

+6 −14
Original line number Diff line number Diff line
@@ -1595,12 +1595,6 @@ int cfg80211_wext_siwmlme(struct net_device *dev, 
int cfg80211_wext_giwrange(struct net_device *dev,

			   struct iw_request_info *info,

			   struct iw_point *data, char *extra);

int cfg80211_ibss_wext_siwfreq(struct net_device *dev,

			       struct iw_request_info *info,

			       struct iw_freq *freq, char *extra);

int cfg80211_ibss_wext_giwfreq(struct net_device *dev,

			       struct iw_request_info *info,

			       struct iw_freq *freq, char *extra);

int cfg80211_ibss_wext_siwessid(struct net_device *dev,

				struct iw_request_info *info,

				struct iw_point *data, char *ssid);
@@ -1614,12 +1608,6 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev, 
			     struct iw_request_info *info,

			     struct sockaddr *ap_addr, char *extra);



int cfg80211_mgd_wext_siwfreq(struct net_device *dev,

			      struct iw_request_info *info,

			      struct iw_freq *freq, char *extra);

int cfg80211_mgd_wext_giwfreq(struct net_device *dev,

			      struct iw_request_info *info,

			      struct iw_freq *freq, char *extra);

int cfg80211_mgd_wext_siwessid(struct net_device *dev,

			       struct iw_request_info *info,

			       struct iw_point *data, char *ssid);
@@ -1642,8 +1630,12 @@ int cfg80211_wext_giwauth(struct net_device *dev, 
			  struct iw_request_info *info,

			  struct iw_param *data, char *extra);



struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,

					     struct iw_freq *freq);

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_siwrate(struct net_device *dev,

			  struct iw_request_info *info,

net/mac80211/wext.c

+2 −71
Original line number Diff line number Diff line
@@ -27,75 +27,6 @@ 
#include "aes_ccm.h"





static int ieee80211_ioctl_siwfreq(struct net_device *dev,

				   struct iw_request_info *info,

				   struct iw_freq *freq, char *extra)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_channel *chan;



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

		return cfg80211_ibss_wext_siwfreq(dev, info, freq, extra);

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

		return cfg80211_mgd_wext_siwfreq(dev, info, freq, extra);



	/* freq->e == 0: freq->m = channel; otherwise freq = m * 10^e */

	if (freq->e == 0) {

		if (freq->m < 0)

			return -EINVAL;

		else

			chan = ieee80211_get_channel(local->hw.wiphy,

				ieee80211_channel_to_frequency(freq->m));

	} else {

		int i, div = 1000000;

		for (i = 0; i < freq->e; i++)

			div /= 10;

		if (div <= 0)

			return -EINVAL;

		chan = ieee80211_get_channel(local->hw.wiphy, freq->m / div);

	}



	if (!chan)

		return -EINVAL;



	if (chan->flags & IEEE80211_CHAN_DISABLED)

		return -EINVAL;



	/*

	 * no change except maybe auto -> fixed, ignore the HT

	 * setting so you can fix a channel you're on already

	 */

	if (local->oper_channel == chan)

		return 0;



	local->oper_channel = chan;

	local->oper_channel_type = NL80211_CHAN_NO_HT;

	ieee80211_hw_config(local, 0);



	return 0;

}





static int ieee80211_ioctl_giwfreq(struct net_device *dev,

				   struct iw_request_info *info,

				   struct iw_freq *freq, char *extra)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



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

		return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);

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

		return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);



	freq->m = local->oper_channel->center_freq;

	freq->e = 6;



	return 0;

}





static int ieee80211_ioctl_siwessid(struct net_device *dev,

				    struct iw_request_info *info,

				    struct iw_point *data, char *ssid)
@@ -173,8 +104,8 @@ static const iw_handler ieee80211_handler[] = 
	(iw_handler) cfg80211_wext_giwname,		/* SIOCGIWNAME */

	(iw_handler) NULL,				/* SIOCSIWNWID */

	(iw_handler) NULL,				/* SIOCGIWNWID */

	(iw_handler) ieee80211_ioctl_siwfreq,		/* SIOCSIWFREQ */

	(iw_handler) ieee80211_ioctl_giwfreq,		/* SIOCGIWFREQ */

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

net/wireless/core.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ struct cfg80211_registered_device { 
	struct work_struct conn_work;

	struct work_struct event_work;



	/* current channel */

	struct ieee80211_channel *channel;



#ifdef CONFIG_CFG80211_DEBUGFS

	/* Debugfs entries */

	struct wiphy_debugfsdentries {

net/wireless/ibss.c

+1 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/etherdevice.h>

#include <linux/if_arp.h>

#include <net/cfg80211.h>

#include "wext-compat.h"

#include "nl80211.h"
@@ -312,8 +313,6 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev, 


	return err;

}

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

EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwfreq);



int cfg80211_ibss_wext_giwfreq(struct net_device *dev,

			       struct iw_request_info *info,
@@ -342,8 +341,6 @@ int cfg80211_ibss_wext_giwfreq(struct net_device *dev, 
	/* no channel if not joining */

	return -EINVAL;

}

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

EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_giwfreq);



int cfg80211_ibss_wext_siwessid(struct net_device *dev,

				struct iw_request_info *info,