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

Commit a813833d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging-next 

* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (61 commits)
  staging: rtl8192e: Fix compilation warnings
  staging: rtl8192e: Fix unload/reload problem
  staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
  staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
  staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND
  staging: rtl8192e: Remove LOOP_TEST as parameter
  staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN
  staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS
  staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_
  staging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG
  staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG
  staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON
  staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC
  staging: rtl8192e: Remove dead code associated with CONFIG_BT_30
  staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG
  staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA
  staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP
  staging: rtl8192e: Remove dead code associated with IRQF_SHARED
  staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211
  staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO
  ...
parents ac657d58 bca54c01

drivers/staging/rtl8192e/Makefile

+34 −32
Original line number Diff line number Diff line 
NIC_SELECT = RTL8192E



ccflags-y := -DRTL8192E

ccflags-y += -std=gnu89

ccflags-y += -O2

ccflags-y += -DTHOMAS_TURBO

ccflags-y += -DUSE_FW_SOURCE_IMG_FILE

ccflags-y += -DCONFIG_PM_RTL

ccflags-y += -DCONFIG_PM

ccflags-y += -DHAVE_NET_DEVICE_OPS

ccflags-y += -DENABLE_DOT11D



ccflags-y += -DENABLE_IPS

ccflags-y += -DENABLE_LPS



r8192e_pci-objs :=		\

	r8192E_core.o		\

	r8180_93cx6.o		\

	r8192E_wx.o		\

	r8190_rtl8256.o		\

	r819xE_phy.o		\

	r819xE_firmware.o	\

	r819xE_cmdpkt.o		\

	r8192E_dm.o		\

	r8192_pm.o		\

	ieee80211/ieee80211_rx.o		\

	ieee80211/ieee80211_softmac.o		\

	ieee80211/ieee80211_tx.o		\

	ieee80211/ieee80211_wx.o		\

	ieee80211/ieee80211_module.o		\

	ieee80211/ieee80211_softmac_wx.o	\

	ieee80211/rtl819x_HTProc.o		\

	ieee80211/rtl819x_TSProc.o		\

	ieee80211/rtl819x_BAProc.o		\

	ieee80211/dot11d.o			\

	ieee80211/ieee80211_crypt.o		\

	ieee80211/ieee80211_crypt_tkip.o	\

	ieee80211/ieee80211_crypt_ccmp.o	\

	ieee80211/ieee80211_crypt_wep.o

	rtl_core.o		\

	rtl_eeprom.o		\

	rtl_ps.o		\

	rtl_wx.o		\

	rtl_cam.o		\

	rtl_dm.o		\

	rtl_pm.o		\

	rtl_pci.o		\

	rtl_debug.o		\

	rtl_ethtool.o		\

	r8192E_dev.o		\

	r8192E_phy.o		\

	r8192E_firmware.o	\

	r8192E_cmdpkt.o		\

	r8192E_hwimg.o		\

	r8190P_rtl8256.o	\

	rtllib_rx.o		\

	rtllib_softmac.o	\

	rtllib_tx.o		\

	rtllib_wx.o		\

	rtllib_module.o		\

	rtllib_softmac_wx.o	\

	rtl819x_HTProc.o	\

	rtl819x_TSProc.o	\

	rtl819x_BAProc.o	\

	dot11d.o		\

	rtllib_crypt.o		\

	rtllib_crypt_tkip.o	\

	rtllib_crypt_ccmp.o	\

	rtllib_crypt_wep.o



obj-$(CONFIG_RTL8192E) += r8192e_pci.o

drivers/staging/rtl8192e/TODO

0 → 100644
+2 −0
Original line number Diff line number Diff line 
* merge into drivers/net/wireless/rtllib/rtl8192e

* clean up function naming

drivers/staging/rtl8192e/dot11d.c

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

 * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.

 *

 * 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, USA

 *

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

 * file called LICENSE.

 *

 * Contact Information:

 * wlanfae <wlanfae@realtek.com>

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

#include "dot11d.h"



struct channel_list {

	u8      Channel[32];

	u8      Len;

};



static struct channel_list ChannelPlan[] = {

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 36, 40, 44, 48, 52, 56, 60, 64,

	  149, 153, 157, 161, 165}, 24},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56,

	  60, 64}, 21},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,

	  56, 60, 64}, 22},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,

	  56, 60, 64}, 22},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,

	  56, 60, 64}, 22},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,

	 56, 60, 64}, 22},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, 14},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},

	{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52,

	  56, 60, 64}, 21}

};



void Dot11d_Init(struct rtllib_device *ieee)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);

	pDot11dInfo->bEnabled = false;



	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->CountryIeLen = 0;

	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);

	RESET_CIE_WATCHDOG(ieee);



}



void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)

{

	int i, max_chan = 14, min_chan = 1;



	ieee->bGlobalDomain = false;



	if (ChannelPlan[channel_plan].Len != 0) {

		memset(GET_DOT11D_INFO(ieee)->channel_map, 0,

		       sizeof(GET_DOT11D_INFO(ieee)->channel_map));

		for (i = 0; i < ChannelPlan[channel_plan].Len; i++) {

			if (ChannelPlan[channel_plan].Channel[i] < min_chan ||

			    ChannelPlan[channel_plan].Channel[i] > max_chan)

				break;

			GET_DOT11D_INFO(ieee)->channel_map[ChannelPlan

					[channel_plan].Channel[i]] = 1;

		}

	}



	switch (channel_plan) {

	case COUNTRY_CODE_GLOBAL_DOMAIN:

		ieee->bGlobalDomain = true;

		for (i = 12; i <= 14; i++)

			GET_DOT11D_INFO(ieee)->channel_map[i] = 2;

		ieee->IbssStartChnl = 10;

		ieee->ibss_maxjoin_chal = 11;

		break;



	case COUNTRY_CODE_WORLD_WIDE_13:

		for (i = 12; i <= 13; i++)

			GET_DOT11D_INFO(ieee)->channel_map[i] = 2;

		ieee->IbssStartChnl = 10;

		ieee->ibss_maxjoin_chal = 11;

		break;



	default:

		ieee->IbssStartChnl = 1;

		ieee->ibss_maxjoin_chal = 14;

		break;

	}

}





void Dot11d_Reset(struct rtllib_device *ieee)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);

	u32 i;



	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);

	for (i = 1; i <= 11; i++)

		(pDot11dInfo->channel_map)[i] = 1;

	for (i = 12; i <= 14; i++)

		(pDot11dInfo->channel_map)[i] = 2;

	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->CountryIeLen = 0;

	RESET_CIE_WATCHDOG(ieee);

}



void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,

			    u16 CoutryIeLen, u8 *pCoutryIe)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 i, j, NumTriples, MaxChnlNum;

	struct chnl_txpow_triple *pTriple;



	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);

	MaxChnlNum = 0;

	NumTriples = (CoutryIeLen - 3) / 3;

	pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);

	for (i = 0; i < NumTriples; i++) {

		if (MaxChnlNum >= pTriple->FirstChnl) {

			printk(KERN_INFO "Dot11d_UpdateCountryIe(): Invalid"

			       " country IE, skip it........1\n");

			return;

		}

		if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl +

		    pTriple->NumChnls)) {

			printk(KERN_INFO "Dot11d_UpdateCountryIe(): Invalid "

			       "country IE, skip it........2\n");

			return;

		}



		for (j = 0 ; j < pTriple->NumChnls; j++) {

			pDot11dInfo->channel_map[pTriple->FirstChnl + j] = 1;

			pDot11dInfo->MaxTxPwrDbmList[pTriple->FirstChnl + j] =

						 pTriple->MaxTxPowerInDbm;

			MaxChnlNum = pTriple->FirstChnl + j;

		}



		pTriple = (struct chnl_txpow_triple *)((u8*)pTriple + 3);

	}



	UPDATE_CIE_SRC(dev, pTaddr);



	pDot11dInfo->CountryIeLen = CoutryIeLen;

	memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe, CoutryIeLen);

	pDot11dInfo->State = DOT11D_STATE_LEARNED;

}



u8 DOT11D_GetMaxTxPwrInDbm(struct rtllib_device *dev, u8 Channel)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 MaxTxPwrInDbm = 255;



	if (MAX_CHANNEL_NUMBER < Channel) {

		printk(KERN_INFO "DOT11D_GetMaxTxPwrInDbm(): Invalid "

		       "Channel\n");

		return MaxTxPwrInDbm;

	}

	if (pDot11dInfo->channel_map[Channel])

		MaxTxPwrInDbm = pDot11dInfo->MaxTxPwrDbmList[Channel];



	return MaxTxPwrInDbm;

}



void DOT11D_ScanComplete(struct rtllib_device *dev)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);



	switch (pDot11dInfo->State) {

	case DOT11D_STATE_LEARNED:

		pDot11dInfo->State = DOT11D_STATE_DONE;

		break;

	case DOT11D_STATE_DONE:

		Dot11d_Reset(dev);

		break;

	case DOT11D_STATE_NONE:

		break;

	}

}



int ToLegalChannel(struct rtllib_device *dev, u8 channel)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 default_chn = 0;

	u32 i;



	for (i = 1; i <= MAX_CHANNEL_NUMBER; i++) {

		if (pDot11dInfo->channel_map[i] > 0) {

			default_chn = i;

			break;

		}

	}



	if (MAX_CHANNEL_NUMBER < channel) {

		printk(KERN_ERR "%s(): Invalid Channel\n", __func__);

		return default_chn;

	}



	if (pDot11dInfo->channel_map[channel] > 0)

		return channel;



	return default_chn;

}

drivers/staging/rtl8192e/dot11d.h

+62 −51
Original line number Diff line number Diff line 
#ifndef INC_DOT11D_H

#define INC_DOT11D_H



#ifdef ENABLE_DOT11D

#include "ieee80211.h"



struct _CHNL_TXPOWER_TRIPLE {

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

 * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.

 *

 * 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, USA

 *

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

 * file called LICENSE.

 *

 * Contact Information:

 * wlanfae <wlanfae@realtek.com>

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

#ifndef __INC_DOT11D_H

#define __INC_DOT11D_H



#include "rtllib.h"







struct chnl_txpow_triple {

	u8 FirstChnl;

	u8  NumChnls;

	u8  MaxTxPowerInDbm;

};



enum _DOT11D_STATE {

enum dot11d_state {

	DOT11D_STATE_NONE = 0,

	DOT11D_STATE_LEARNED,

	DOT11D_STATE_DONE,

};



/**

 * struct _RT_DOT11D_INFO

 * @CountryIeLen: value greater than 0 if @CountryIeBuf contains

 * struct rt_dot11d_info * @CountryIeLen: value greater than 0 if @CountryIeBuf contains

 *		  valid country information element.

 * @chanell_map: holds channel values

 *		0 - invalid,
@@ -27,7 +45,8 @@ enum _DOT11D_STATE { 
 * @CountryIeSrcAddr - Source AP of the country IE

 */



struct _RT_DOT11D_INFO {

struct rt_dot11d_info {



	bool bEnabled;



	u16 CountryIeLen;
@@ -38,7 +57,7 @@ struct _RT_DOT11D_INFO { 
	u8  channel_map[MAX_CHANNEL_NUMBER+1];

	u8  MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1];



	DOT11D_STATE State;

	enum dot11d_state State;

};



static inline void cpMacAddr(unsigned char *des, unsigned char *src)
@@ -46,49 +65,41 @@ static inline void cpMacAddr(unsigned char *des, unsigned char *src) 
	memcpy(des, src, 6);

}



#define GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO) \

			((__pIeeeDev)->pDot11dInfo))

#define GET_DOT11D_INFO(__pIeeeDev)			\

	 ((struct rt_dot11d_info *)((__pIeeeDev)->pDot11dInfo))



#define IS_DOT11D_ENABLE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->bEnabled)

#define IS_DOT11D_ENABLE(__pIeeeDev)			\

	 (GET_DOT11D_INFO(__pIeeeDev)->bEnabled)

#define IS_COUNTRY_IE_VALID(__pIeeeDev)			\

	(GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0)



#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa)		\

	 eqMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)



#define UPDATE_CIE_SRC(__pIeeeDev, __pTa)		\

	cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)



#define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \

	(((__Ie).Length == 0 || (__Ie).Length !=	\

	GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? FALSE : \

	(!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, \

	GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ?	\

	false : (!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf,	\

	(__Ie).Octet, (__Ie).Length)))



#define CIE_WATCHDOG_TH 1

#define GET_CIE_WATCHDOG(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)-> \

							CountryIeWatchdog)

#define GET_CIE_WATCHDOG(__pIeeeDev)				\

	 (GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog)

#define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0

#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))



#define IS_DOT11D_STATE_DONE(__pIeeeDev)			\

	(GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)





void Dot11d_Init(struct ieee80211_device *dev);



void Dot11d_Reset(struct ieee80211_device *dev);



void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr,

void Dot11d_Init(struct rtllib_device *dev);

void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee);

void Dot11d_Reset(struct rtllib_device *dev);

void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,

			    u16 CoutryIeLen, u8 *pCoutryIe);

u8 DOT11D_GetMaxTxPwrInDbm(struct rtllib_device *dev, u8 Channel);

void DOT11D_ScanComplete(struct rtllib_device *dev);

int ToLegalChannel(struct rtllib_device *dev, u8 channel);



u8 DOT11D_GetMaxTxPwrInDbm(struct ieee80211_device *dev, u8 channel);



void DOT11D_ScanComplete(struct ieee80211_device *dev);



int IsLegalChannel(struct ieee80211_device *dev, u8 channel);



int ToLegalChannel(struct ieee80211_device *dev, u8 channel);



#endif /* ENABLE_DOT11D */

#endif /* INC_DOT11D_H */
 
#endif

drivers/staging/rtl8192e/ieee80211/dot11d.c

deleted100644 → 0
+0 −218
Original line number Diff line number Diff line 
#ifdef ENABLE_DOT11D

//-----------------------------------------------------------------------------

//	File:

//		Dot11d.c

//

//	Description:

//		Implement 802.11d.

//

//-----------------------------------------------------------------------------



#include "dot11d.h"



void

Dot11d_Init(struct ieee80211_device *ieee)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);



	pDot11dInfo->bEnabled = 0;



	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->CountryIeLen = 0;

	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);

	RESET_CIE_WATCHDOG(ieee);



	printk("Dot11d_Init()\n");

}



//

//	Description:

//		Reset to the state as we are just entering a regulatory domain.

//

void

Dot11d_Reset(struct ieee80211_device *ieee)

{

	u32 i;

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);

#if 0

	if(!pDot11dInfo->bEnabled)

		return;

#endif

	// Clear old channel map

	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);

	// Set new channel map

	for (i=1; i<=11; i++) {

		(pDot11dInfo->channel_map)[i] = 1;

	}

	for (i=12; i<=14; i++) {

		(pDot11dInfo->channel_map)[i] = 2;

	}



	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->CountryIeLen = 0;

	RESET_CIE_WATCHDOG(ieee);

}



//

//	Description:

//		Update country IE from Beacon or Probe Resopnse

//		and configure PHY for operation in the regulatory domain.

//

//	TODO:

//		Configure Tx power.

//

//	Assumption:

//		1. IS_DOT11D_ENABLE() is TRUE.

//		2. Input IE is an valid one.

//

void

Dot11d_UpdateCountryIe(

	struct ieee80211_device *dev,

	u8 *		pTaddr,

	u16	CoutryIeLen,

	u8 * pCoutryIe

	)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 i, j, NumTriples, MaxChnlNum;

	PCHNL_TXPOWER_TRIPLE pTriple;



	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);

	MaxChnlNum = 0;

	NumTriples = (CoutryIeLen - 3) / 3; // skip 3-byte country string.

	pTriple = (PCHNL_TXPOWER_TRIPLE)(pCoutryIe + 3);

	for(i = 0; i < NumTriples; i++)

	{

		if(MaxChnlNum >= pTriple->FirstChnl)

		{ // It is not in a monotonically increasing order, so stop processing.

			printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");

			return;

		}

		if(MAX_CHANNEL_NUMBER < (pTriple->FirstChnl + pTriple->NumChnls))

		{ // It is not a valid set of channel id, so stop processing.

			printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");

			return;

		}



		for(j = 0 ; j < pTriple->NumChnls; j++)

		{

			pDot11dInfo->channel_map[pTriple->FirstChnl + j] = 1;

			pDot11dInfo->MaxTxPwrDbmList[pTriple->FirstChnl + j] = pTriple->MaxTxPowerInDbm;

			MaxChnlNum = pTriple->FirstChnl + j;

		}



		pTriple = (PCHNL_TXPOWER_TRIPLE)((u8*)pTriple + 3);

	}

#if 1

	printk("Channel List:");

	for(i=1; i<= MAX_CHANNEL_NUMBER; i++)

		if(pDot11dInfo->channel_map[i] > 0)

			printk(" %d", i);

	printk("\n");

#endif



	UPDATE_CIE_SRC(dev, pTaddr);



	pDot11dInfo->CountryIeLen = CoutryIeLen;

	memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe,CoutryIeLen);

	pDot11dInfo->State = DOT11D_STATE_LEARNED;

}





u8

DOT11D_GetMaxTxPwrInDbm(

	struct ieee80211_device *dev,

	u8 Channel

	)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 MaxTxPwrInDbm = 255;



	if(MAX_CHANNEL_NUMBER < Channel)

	{

		printk("DOT11D_GetMaxTxPwrInDbm(): Invalid Channel\n");

		return MaxTxPwrInDbm;

	}

	if(pDot11dInfo->channel_map[Channel])

	{

		MaxTxPwrInDbm = pDot11dInfo->MaxTxPwrDbmList[Channel];

	}



	return MaxTxPwrInDbm;

}





void

DOT11D_ScanComplete(

	struct ieee80211_device * dev

	)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);



	switch(pDot11dInfo->State)

	{

	case DOT11D_STATE_LEARNED:

		pDot11dInfo->State = DOT11D_STATE_DONE;

		break;



	case DOT11D_STATE_DONE:

		if( GET_CIE_WATCHDOG(dev) == 0 )

		{ // Reset country IE if previous one is gone.

			Dot11d_Reset(dev);

		}

		break;

	case DOT11D_STATE_NONE:

		break;

	}

}



int IsLegalChannel(

	struct ieee80211_device * dev,

	u8 channel

)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);



	if(MAX_CHANNEL_NUMBER < channel)

	{

		printk("IsLegalChannel(): Invalid Channel\n");

		return 0;

	}

	if(pDot11dInfo->channel_map[channel] > 0)

		return 1;

	return 0;

}



int ToLegalChannel(

	struct ieee80211_device * dev,

	u8 channel

)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 default_chn = 0;

	u32 i = 0;



	for (i=1; i<= MAX_CHANNEL_NUMBER; i++)

	{

		if(pDot11dInfo->channel_map[i] > 0)

		{

			default_chn = i;

			break;

		}

	}



	if(MAX_CHANNEL_NUMBER < channel)

	{

		printk("IsLegalChannel(): Invalid Channel\n");

		return default_chn;

	}



	if(pDot11dInfo->channel_map[channel] > 0)

		return channel;



	return default_chn;

}

#endif