OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192u: fixed some coding style issues in r8192U_core.c 

This patch fixes some coding style issues. in r8192U_core.c
No logic is changed.

Signed-off-by: Patrik Kårlin <patrik.karlin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Patrik Karlin 2013-01-09 09:39:44 +01:00 committed by Greg Kroah-Hartman
parent 0fb3321321
commit f00c493b51
1 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -189,53 +189,47 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
struct ieee80211_device* ieee = priv->ieee80211; struct ieee80211_device* ieee = priv->ieee80211;
switch (channel_plan) switch (channel_plan)
{ {
case COUNTRY_CODE_FCC: case COUNTRY_CODE_FCC:
case COUNTRY_CODE_IC: case COUNTRY_CODE_IC:
case COUNTRY_CODE_ETSI: case COUNTRY_CODE_ETSI:
case COUNTRY_CODE_SPAIN: case COUNTRY_CODE_SPAIN:
case COUNTRY_CODE_FRANCE: case COUNTRY_CODE_FRANCE:
case COUNTRY_CODE_MKK: case COUNTRY_CODE_MKK:
case COUNTRY_CODE_MKK1: case COUNTRY_CODE_MKK1:
case COUNTRY_CODE_ISRAEL: case COUNTRY_CODE_ISRAEL:
case COUNTRY_CODE_TELEC: case COUNTRY_CODE_TELEC:
case COUNTRY_CODE_MIC: case COUNTRY_CODE_MIC:
{ Dot11d_Init(ieee);
Dot11d_Init(ieee); ieee->bGlobalDomain = false;
ieee->bGlobalDomain = false; //actually 8225 & 8256 rf chips only support B,G,24N mode
//actually 8225 & 8256 rf chips only support B,G,24N mode if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) {
if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) min_chan = 1;
{ max_chan = 14;
min_chan = 1; }
max_chan = 14; else {
} RT_TRACE(COMP_ERR, "unknown rf chip, can't set channel map in function:%s()\n", __FUNCTION__);
else }
{ if (ChannelPlan[channel_plan].Len != 0) {
RT_TRACE(COMP_ERR, "unknown rf chip, can't set channel map in function:%s()\n", __FUNCTION__); // Clear old channel map
} memset(GET_DOT11D_INFO(ieee)->channel_map, 0, sizeof(GET_DOT11D_INFO(ieee)->channel_map));
if (ChannelPlan[channel_plan].Len != 0){ // Set new channel map
// Clear old channel map for (i=0;i<ChannelPlan[channel_plan].Len;i++) {
memset(GET_DOT11D_INFO(ieee)->channel_map, 0, sizeof(GET_DOT11D_INFO(ieee)->channel_map)); if (ChannelPlan[channel_plan].Channel[i] < min_chan || ChannelPlan[channel_plan].Channel[i] > max_chan)
// Set new 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; break;
GET_DOT11D_INFO(ieee)->channel_map[ChannelPlan[channel_plan].Channel[i]] = 1; GET_DOT11D_INFO(ieee)->channel_map[ChannelPlan[channel_plan].Channel[i]] = 1;
}
} }
break;
} }
case COUNTRY_CODE_GLOBAL_DOMAIN: break;
{
GET_DOT11D_INFO(ieee)->bEnabled = 0;//this flag enabled to follow 11d country IE setting, otherwise, it shall follow global domain settings. case COUNTRY_CODE_GLOBAL_DOMAIN:
Dot11d_Reset(ieee); GET_DOT11D_INFO(ieee)->bEnabled = 0;//this flag enabled to follow 11d country IE setting, otherwise, it shall follow global domain settings.
ieee->bGlobalDomain = true; Dot11d_Reset(ieee);
break; ieee->bGlobalDomain = true;
} break;
default:
break; default:
break;
} }
return;
} }