Staging: rtl8187se: Fix C99 style commenting in dot11d.c
This patch fixes the following checkpatch.pl issues in ieee80211/dot11d.c- ERROR: do not use C99 // comments Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0c4c9350c1
commit
8e0e3aeede
|
@ -1,11 +1,10 @@
|
||||||
//-----------------------------------------------------------------------------
|
/*
|
||||||
// File:
|
* File:
|
||||||
// Dot11d.c
|
* Dot11d.c
|
||||||
//
|
*
|
||||||
// Description:
|
* Description:
|
||||||
// Implement 802.11d.
|
* Implement 802.11d
|
||||||
//
|
*/
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "dot11d.h"
|
#include "dot11d.h"
|
||||||
|
|
||||||
|
@ -25,20 +24,20 @@ Dot11d_Init(struct ieee80211_device *ieee)
|
||||||
printk("Dot11d_Init()\n");
|
printk("Dot11d_Init()\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
/*
|
||||||
// Description:
|
* Description:
|
||||||
// Reset to the state as we are just entering a regulatory domain.
|
* Reset to the state as we are just entering a regulatory domain.
|
||||||
//
|
*/
|
||||||
void
|
void
|
||||||
Dot11d_Reset(struct ieee80211_device *ieee)
|
Dot11d_Reset(struct ieee80211_device *ieee)
|
||||||
{
|
{
|
||||||
u32 i;
|
u32 i;
|
||||||
PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
|
PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
|
||||||
|
|
||||||
// Clear old channel map
|
/* Clear old channel map */
|
||||||
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
|
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
|
||||||
memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
|
memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
|
||||||
// Set new channel map
|
/* Set new channel map */
|
||||||
for (i = 1; i <= 11; i++)
|
for (i = 1; i <= 11; i++)
|
||||||
(pDot11dInfo->channel_map)[i] = 1;
|
(pDot11dInfo->channel_map)[i] = 1;
|
||||||
|
|
||||||
|
@ -48,22 +47,20 @@ Dot11d_Reset(struct ieee80211_device *ieee)
|
||||||
pDot11dInfo->State = DOT11D_STATE_NONE;
|
pDot11dInfo->State = DOT11D_STATE_NONE;
|
||||||
pDot11dInfo->CountryIeLen = 0;
|
pDot11dInfo->CountryIeLen = 0;
|
||||||
RESET_CIE_WATCHDOG(ieee);
|
RESET_CIE_WATCHDOG(ieee);
|
||||||
|
|
||||||
//printk("Dot11d_Reset()\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
/*
|
||||||
// Description:
|
* Description:
|
||||||
// Update country IE from Beacon or Probe Response
|
* Update country IE from Beacon or Probe Response and configure PHY for
|
||||||
// and configure PHY for operation in the regulatory domain.
|
* operation in the regulatory domain.
|
||||||
//
|
*
|
||||||
// TODO:
|
* TODO:
|
||||||
// Configure Tx power.
|
* Configure Tx power.
|
||||||
//
|
*
|
||||||
// Assumption:
|
* Assumption:
|
||||||
// 1. IS_DOT11D_ENABLE() is TRUE.
|
* 1. IS_DOT11D_ENABLE() is TRUE.
|
||||||
// 2. Input IE is an valid one.
|
* 2. Input IE is an valid one.
|
||||||
//
|
*/
|
||||||
void
|
void
|
||||||
Dot11d_UpdateCountryIe(
|
Dot11d_UpdateCountryIe(
|
||||||
struct ieee80211_device *dev,
|
struct ieee80211_device *dev,
|
||||||
|
@ -85,17 +82,23 @@ Dot11d_UpdateCountryIe(
|
||||||
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
|
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
|
||||||
memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
|
memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
|
||||||
MaxChnlNum = 0;
|
MaxChnlNum = 0;
|
||||||
NumTriples = (CoutryIeLen - 3) / 3; // skip 3-byte country string.
|
NumTriples = (CoutryIeLen - 3) / 3; /* skip 3-byte country string. */
|
||||||
pTriple = (PCHNL_TXPOWER_TRIPLE)(pCoutryIe + 3);
|
pTriple = (PCHNL_TXPOWER_TRIPLE)(pCoutryIe + 3);
|
||||||
for (i = 0; i < NumTriples; i++) {
|
for (i = 0; i < NumTriples; i++) {
|
||||||
if (MaxChnlNum >= pTriple->FirstChnl) {
|
if (MaxChnlNum >= pTriple->FirstChnl) {
|
||||||
// It is not in a monotonically increasing order, so stop processing.
|
/*
|
||||||
|
* It is not in a monotonically increasing order,
|
||||||
|
* so stop processing.
|
||||||
|
*/
|
||||||
printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");
|
printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");
|
||||||
Dot11d_Reset(dev);
|
Dot11d_Reset(dev);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl + pTriple->NumChnls)) {
|
if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl + pTriple->NumChnls)) {
|
||||||
// It is not a valid set of channel id, so stop processing.
|
/*
|
||||||
|
* It is not a valid set of channel id,
|
||||||
|
* so stop processing
|
||||||
|
*/
|
||||||
printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");
|
printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");
|
||||||
Dot11d_Reset(dev);
|
Dot11d_Reset(dev);
|
||||||
return;
|
return;
|
||||||
|
@ -110,7 +113,6 @@ Dot11d_UpdateCountryIe(
|
||||||
pTriple = (PCHNL_TXPOWER_TRIPLE)((u8 *)pTriple + 3);
|
pTriple = (PCHNL_TXPOWER_TRIPLE)((u8 *)pTriple + 3);
|
||||||
}
|
}
|
||||||
#if 1
|
#if 1
|
||||||
//printk("Dot11d_UpdateCountryIe(): Channel List:\n");
|
|
||||||
printk("Channel List:");
|
printk("Channel List:");
|
||||||
for (i = 1; i <= MAX_CHANNEL_NUMBER; i++)
|
for (i = 1; i <= MAX_CHANNEL_NUMBER; i++)
|
||||||
if (pDot11dInfo->channel_map[i] > 0)
|
if (pDot11dInfo->channel_map[i] > 0)
|
||||||
|
@ -160,7 +162,7 @@ DOT11D_ScanComplete(
|
||||||
|
|
||||||
case DOT11D_STATE_DONE:
|
case DOT11D_STATE_DONE:
|
||||||
if (GET_CIE_WATCHDOG(dev) == 0) {
|
if (GET_CIE_WATCHDOG(dev) == 0) {
|
||||||
// Reset country IE if previous one is gone.
|
/* Reset country IE if previous one is gone. */
|
||||||
Dot11d_Reset(dev);
|
Dot11d_Reset(dev);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue