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

Commit 02cda6ae authored by James Ketrenos's avatar James Ketrenos Committed by Jeff Garzik
Browse files

[PATCH] ieee80211: Added ieee80211_geo to provide helper functions 



tree 385b391fc0d7c124cd0547fdb6183e9a0c333391
parent 97d7a47f76e72bedde7f402785559ed4c7a8e8e8
author James Ketrenos <jketreno@linux.intel.com> 1124447590 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127313735 -0500

Added ieee80211_geo to provide helper functions to drivers for
implementing supported channel maps.

Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 9e8571af

include/net/ieee80211.h

+46 −0
Original line number Diff line number Diff line
@@ -781,6 +781,38 @@ enum ieee80211_state { 
#define CFG_IEEE80211_COMPUTE_FCS (1<<1)

#define CFG_IEEE80211_RTS (1<<2)



#define IEEE80211_24GHZ_MIN_CHANNEL 1

#define IEEE80211_24GHZ_MAX_CHANNEL 14

#define IEEE80211_24GHZ_CHANNELS    14



#define IEEE80211_52GHZ_MIN_CHANNEL 36

#define IEEE80211_52GHZ_MAX_CHANNEL 165

#define IEEE80211_52GHZ_CHANNELS    32



enum {

	IEEE80211_CH_PASSIVE_ONLY = (1 << 0),

	IEEE80211_CH_B_ONLY = (1 << 2),

	IEEE80211_CH_NO_IBSS = (1 << 3),

	IEEE80211_CH_UNIFORM_SPREADING = (1 << 4),

	IEEE80211_CH_RADAR_DETECT = (1 << 5),

	IEEE80211_CH_INVALID = (1 << 6),

};



struct ieee80211_channel {

	u16 freq;

	u8 channel;

	u8 flags;

	u8 max_power;

};



struct ieee80211_geo {

	u8 name[4];

	u8 bg_channels;

	u8 a_channels;

	struct ieee80211_channel bg[IEEE80211_24GHZ_CHANNELS];

	struct ieee80211_channel a[IEEE80211_52GHZ_CHANNELS];

};



struct ieee80211_device {

	struct net_device *dev;

	struct ieee80211_security sec;
@@ -789,6 +821,8 @@ struct ieee80211_device { 
	struct net_device_stats stats;

	struct ieee80211_stats ieee_stats;



	struct ieee80211_geo geo;



	/* Probe / Beacon management */

	struct list_head network_free_list;

	struct list_head network_list;
@@ -1005,6 +1039,18 @@ extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, 
			     struct ieee80211_hdr_4addr *header,

			     struct ieee80211_rx_stats *stats);



/* ieee80211_geo.c */

extern const struct ieee80211_geo *ieee80211_get_geo(struct ieee80211_device

						     *ieee);

extern int ieee80211_set_geo(struct ieee80211_device *ieee,

			     const struct ieee80211_geo *geo);



extern int ieee80211_is_valid_channel(struct ieee80211_device *ieee,

				      u8 channel);

extern int ieee80211_channel_to_index(struct ieee80211_device *ieee,

				      u8 channel);

extern u8 ieee80211_freq_to_channel(struct ieee80211_device *ieee, u32 freq);



/* ieee80211_wx.c */

extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,

				 struct iw_request_info *info,

net/ieee80211/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ ieee80211-objs := \ 
	ieee80211_module.o \

	ieee80211_tx.o \

	ieee80211_rx.o \

	ieee80211_wx.o

	ieee80211_wx.o \

	ieee80211_geo.o

net/ieee80211/ieee80211_geo.c

0 → 100644
+141 −0
Original line number Diff line number Diff line 
/******************************************************************************



  Copyright(c) 2005 Intel Corporation. All rights reserved.



  This program is free software; you can redistribute it and/or modify it

  under the terms of version 2 of the GNU General Public License 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., 59

  Temple Place - Suite 330, Boston, MA  02111-1307, USA.



  The full GNU General Public License is included in this distribution in the

  file called LICENSE.



  Contact Information:

  James P. Ketrenos <ipw2100-admin@linux.intel.com>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



******************************************************************************/

#include <linux/compiler.h>

#include <linux/config.h>

#include <linux/errno.h>

#include <linux/if_arp.h>

#include <linux/in6.h>

#include <linux/in.h>

#include <linux/ip.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/proc_fs.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/tcp.h>

#include <linux/types.h>

#include <linux/version.h>

#include <linux/wireless.h>

#include <linux/etherdevice.h>

#include <asm/uaccess.h>



#include <net/ieee80211.h>



int ieee80211_is_valid_channel(struct ieee80211_device *ieee, u8 channel)

{

	int i;



	/* Driver needs to initialize the geography map before using

	 * these helper functions */

	BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);



	if (ieee->freq_band & IEEE80211_24GHZ_BAND)

		for (i = 0; i < ieee->geo.bg_channels; i++)

			/* NOTE: If G mode is currently supported but

			 * this is a B only channel, we don't see it

			 * as valid. */

			if ((ieee->geo.bg[i].channel == channel) &&

			    (!(ieee->mode & IEEE_G) ||

			     !(ieee->geo.bg[i].flags & IEEE80211_CH_B_ONLY)))

				return IEEE80211_24GHZ_BAND;



	if (ieee->freq_band & IEEE80211_52GHZ_BAND)

		for (i = 0; i < ieee->geo.a_channels; i++)

			if (ieee->geo.a[i].channel == channel)

				return IEEE80211_52GHZ_BAND;



	return 0;

}



int ieee80211_channel_to_index(struct ieee80211_device *ieee, u8 channel)

{

	int i;



	/* Driver needs to initialize the geography map before using

	 * these helper functions */

	BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);



	if (ieee->freq_band & IEEE80211_24GHZ_BAND)

		for (i = 0; i < ieee->geo.bg_channels; i++)

			if (ieee->geo.bg[i].channel == channel)

				return i;



	if (ieee->freq_band & IEEE80211_52GHZ_BAND)

		for (i = 0; i < ieee->geo.a_channels; i++)

			if (ieee->geo.a[i].channel == channel)

				return i;



	return -1;

}



u8 ieee80211_freq_to_channel(struct ieee80211_device * ieee, u32 freq)

{

	int i;



	/* Driver needs to initialize the geography map before using

	 * these helper functions */

	BUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);



	freq /= 100000;



	if (ieee->freq_band & IEEE80211_24GHZ_BAND)

		for (i = 0; i < ieee->geo.bg_channels; i++)

			if (ieee->geo.bg[i].freq == freq)

				return ieee->geo.bg[i].channel;



	if (ieee->freq_band & IEEE80211_52GHZ_BAND)

		for (i = 0; i < ieee->geo.a_channels; i++)

			if (ieee->geo.a[i].freq == freq)

				return ieee->geo.a[i].channel;



	return 0;

}



int ieee80211_set_geo(struct ieee80211_device *ieee,

		      const struct ieee80211_geo *geo)

{

	memcpy(ieee->geo.name, geo->name, 3);

	ieee->geo.name[3] = '\0';

	ieee->geo.bg_channels = geo->bg_channels;

	ieee->geo.a_channels = geo->a_channels;

	memcpy(ieee->geo.bg, geo->bg, geo->bg_channels *

	       sizeof(struct ieee80211_channel));

	memcpy(ieee->geo.a, geo->a, ieee->geo.a_channels *

	       sizeof(struct ieee80211_channel));

	return 0;

}



const struct ieee80211_geo *ieee80211_get_geo(struct ieee80211_device *ieee)

{

	return &ieee->geo;

}



EXPORT_SYMBOL(ieee80211_is_valid_channel);

EXPORT_SYMBOL(ieee80211_freq_to_channel);

EXPORT_SYMBOL(ieee80211_channel_to_index);

EXPORT_SYMBOL(ieee80211_set_geo);

EXPORT_SYMBOL(ieee80211_get_geo);