* [PATCH] Staging: rtl8192u: Convert comments from C99 to C89 style
@ 2015-02-23 19:15 Ksenija Stanojevic
0 siblings, 0 replies; 3+ messages in thread
From: Ksenija Stanojevic @ 2015-02-23 19:15 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Ksenija Stanojevic
Kernel style for comments is C89 style. Issue found by checkpatch.pl.
Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index 7ed7243..873969c 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -1,14 +1,14 @@
#ifndef _TSTYPE_H_
#define _TSTYPE_H_
#include "rtl819x_Qos.h"
-#define TS_SETUP_TIMEOUT 60 // In millisecond
+#define TS_SETUP_TIMEOUT 60 /* In millisecond */
#define TS_INACT_TIMEOUT 60
#define TS_ADDBA_DELAY 60
#define TOTAL_TS_NUM 16
#define TCLAS_NUM 4
-// This define the Tx/Rx directions
+/* This define the Tx/Rx directions */
typedef enum _TR_SELECT {
TX_DIR = 0,
RX_DIR = 1,
@@ -28,9 +28,9 @@ typedef struct _TS_COMMON_INFO{
typedef struct _TX_TS_RECORD{
TS_COMMON_INFO TsCommonInfo;
u16 TxCurSeq;
- BA_RECORD TxPendingBARecord; // For BA Originator
- BA_RECORD TxAdmittedBARecord; // For BA Originator
-// QOS_DL_RECORD DLRecord;
+ BA_RECORD TxPendingBARecord; /* For BA Originator */
+ BA_RECORD TxAdmittedBARecord; /* For BA Originator */
+/* QOS_DL_RECORD DLRecord; */
u8 bAddBaReqInProgress;
u8 bAddBaReqDelayed;
u8 bUsingBa;
@@ -44,11 +44,11 @@ typedef struct _RX_TS_RECORD {
u16 RxTimeoutIndicateSeq;
struct list_head RxPendingPktList;
struct timer_list RxPktPendingTimer;
- BA_RECORD RxAdmittedBARecord; // For BA Recipient
+ BA_RECORD RxAdmittedBARecord; /* For BA Recipient */
u16 RxLastSeqNum;
u8 RxLastFragNum;
u8 num;
-// QOS_DL_RECORD DLRecord;
+/* QOS_DL_RECORD DLRecord; */
} RX_TS_RECORD, *PRX_TS_RECORD;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Staging: rtl8192u: Convert comments from C99 to C89 style
@ 2015-02-21 20:02 Ksenija Stanojevic
0 siblings, 0 replies; 3+ messages in thread
From: Ksenija Stanojevic @ 2015-02-21 20:02 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Ksenija Stanojevic
Kernel style for comments is C89 style. Issue found by checkpatch.pl.
Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 120 ++++++++++-----------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index acaa723..f6272c0 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -5,20 +5,20 @@
static void TsSetupTimeOut(unsigned long data)
{
- // Not implement yet
- // This is used for WMMSA and ACM , that would send ADDTSReq frame.
+ /* Not implement yet */
+ /* This is used for WMMSA and ACM , that would send ADDTSReq frame. */
}
static void TsInactTimeout(unsigned long data)
{
- // Not implement yet
- // This is used for WMMSA and ACM.
- // This function would be call when TS is no Tx/Rx for some period of time.
+ /* Not implement yet */
+ /* This is used for WMMSA and ACM. */
+ /* This function would be call when TS is no Tx/Rx for some period of time. */
}
/********************************************************************************************************************
*function: I still not understand this function, so wait for further implementation
- * input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer
+ * input: unsigned long data /* acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer */
* return: NULL
* notice:
********************************************************************************************************************/
@@ -29,7 +29,7 @@ static void RxPktPendingTimeout(unsigned long data)
PRX_REORDER_ENTRY pReorderEntry = NULL;
- //u32 flags = 0;
+ /* u32 flags = 0; */
unsigned long flags = 0;
struct ieee80211_rxb *stats_IndicateArray[REORDER_WIN_SIZE];
u8 index = 0;
@@ -37,11 +37,11 @@ static void RxPktPendingTimeout(unsigned long data)
spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
- //PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK);
+ /* PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK); */
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"==================>%s()\n",__func__);
if(pRxTs->RxTimeoutIndicateSeq != 0xffff)
{
- // Indicate the pending packets sequentially according to SeqNum until meet the gap.
+ /* Indicate the pending packets sequentially according to SeqNum until meet the gap. */
while(!list_empty(&pRxTs->RxPendingPktList))
{
pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
@@ -72,10 +72,10 @@ static void RxPktPendingTimeout(unsigned long data)
if(index>0)
{
- // Set RxTimeoutIndicateSeq to 0xffff to indicate no pending packets in buffer now.
+ /* Set RxTimeoutIndicateSeq to 0xffff to indicate no pending packets in buffer now. */
pRxTs->RxTimeoutIndicateSeq = 0xffff;
- // Indicate packets
+ /* Indicate packets */
if(index > REORDER_WIN_SIZE){
IEEE80211_DEBUG(IEEE80211_DL_ERR, "RxReorderIndicatePacket(): Rx Reorer buffer full!! \n");
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
@@ -90,12 +90,12 @@ static void RxPktPendingTimeout(unsigned long data)
mod_timer(&pRxTs->RxPktPendingTimer, jiffies + MSECS(ieee->pHTInfo->RxReorderPendingTime));
}
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
- //PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK);
+ /* PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK); */
}
/********************************************************************************************************************
*function: Add BA timer function
- * input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer
+ * input: unsigned long data /* acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer */
* return: NULL
* notice:
********************************************************************************************************************/
@@ -126,16 +126,16 @@ static void ResetTxTsEntry(PTX_TS_RECORD pTS)
pTS->bAddBaReqInProgress = false;
pTS->bAddBaReqDelayed = false;
pTS->bUsingBa = false;
- ResetBaEntry(&pTS->TxAdmittedBARecord); //For BA Originator
+ ResetBaEntry(&pTS->TxAdmittedBARecord); /* For BA Originator */
ResetBaEntry(&pTS->TxPendingBARecord);
}
static void ResetRxTsEntry(PRX_TS_RECORD pTS)
{
ResetTsCommonInfo(&pTS->TsCommonInfo);
- pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!!
- pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!!
- ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient
+ pTS->RxIndicateSeq = 0xffff; /* This indicate the RxIndicateSeq is not used now!! */
+ pTS->RxTimeoutIndicateSeq = 0xffff; /* This indicate the RxTimeoutIndicateSeq is not used now!! */
+ ResetBaEntry(&pTS->RxAdmittedBARecord); /* For BA Recipient */
}
void TSInitialize(struct ieee80211_device *ieee)
@@ -145,17 +145,17 @@ void TSInitialize(struct ieee80211_device *ieee)
PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry;
u8 count = 0;
IEEE80211_DEBUG(IEEE80211_DL_TS, "==========>%s()\n", __func__);
- // Initialize Tx TS related info.
+ /* Initialize Tx TS related info. */
INIT_LIST_HEAD(&ieee->Tx_TS_Admit_List);
INIT_LIST_HEAD(&ieee->Tx_TS_Pending_List);
INIT_LIST_HEAD(&ieee->Tx_TS_Unused_List);
for(count = 0; count < TOTAL_TS_NUM; count++)
{
- //
+ /* */
pTxTS->num = count;
- // The timers for the operation of Traffic Stream and Block Ack.
- // DLS related timer will be add here in the future!!
+ /* The timers for the operation of Traffic Stream and Block Ack. */
+ /* DLS related timer will be add here in the future!! */
init_timer(&pTxTS->TsCommonInfo.SetupTimer);
pTxTS->TsCommonInfo.SetupTimer.data = (unsigned long)pTxTS;
pTxTS->TsCommonInfo.SetupTimer.function = TsSetupTimeOut;
@@ -181,7 +181,7 @@ void TSInitialize(struct ieee80211_device *ieee)
pTxTS++;
}
- // Initialize Rx TS related info.
+ /* Initialize Rx TS related info. */
INIT_LIST_HEAD(&ieee->Rx_TS_Admit_List);
INIT_LIST_HEAD(&ieee->Rx_TS_Pending_List);
INIT_LIST_HEAD(&ieee->Rx_TS_Unused_List);
@@ -210,9 +210,9 @@ void TSInitialize(struct ieee80211_device *ieee)
list_add_tail(&pRxTS->TsCommonInfo.List, &ieee->Rx_TS_Unused_List);
pRxTS++;
}
- // Initialize unused Rx Reorder List.
+ /* Initialize unused Rx Reorder List. */
INIT_LIST_HEAD(&ieee->RxReorder_Unused_List);
-//#ifdef TO_DO_LIST
+/* #ifdef TO_DO_LIST */
for(count = 0; count < REORDER_ENTRY_NUM; count++)
{
list_add_tail( &pRxReorderEntry->List,&ieee->RxReorder_Unused_List);
@@ -220,7 +220,7 @@ void TSInitialize(struct ieee80211_device *ieee)
break;
pRxReorderEntry = &ieee->RxReorderEntry[count+1];
}
-//#endif
+/* #endif */
}
@@ -239,12 +239,12 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee,
u8 *Addr, u8 TID,
TR_SELECT TxRxSelect)
{
- //DIRECTION_VALUE dir;
+ /* DIRECTION_VALUE dir; */
u8 dir;
bool search_dir[4] = {0};
- struct list_head *psearch_list; //FIXME
+ struct list_head *psearch_list; /* FIXME */
PTS_COMMON_INFO pRet = NULL;
- if(ieee->iw_mode == IW_MODE_MASTER) //ap mode
+ if(ieee->iw_mode == IW_MODE_MASTER) /* ap mode */
{
if(TxRxSelect == TX_DIR)
{
@@ -285,18 +285,18 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee,
else
psearch_list = &ieee->Rx_TS_Admit_List;
- //for(dir = DIR_UP; dir <= DIR_BI_DIR; dir++)
+ /* for(dir = DIR_UP; dir <= DIR_BI_DIR; dir++) */
for(dir = 0; dir <= DIR_BI_DIR; dir++)
{
if(search_dir[dir] ==false )
continue;
list_for_each_entry(pRet, psearch_list, List){
- // IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection);
+ /* IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection); */
if (memcmp(pRet->Addr, Addr, 6) == 0)
if (pRet->TSpec.f.TSInfo.field.ucTSID == TID)
if(pRet->TSpec.f.TSInfo.field.ucDirection == dir)
{
- // printk("Bingo! got it\n");
+ /* printk("Bingo! got it\n"); */
break;
}
@@ -339,15 +339,15 @@ bool GetTs(
PTS_COMMON_INFO *ppTS,
u8 *Addr,
u8 TID,
- TR_SELECT TxRxSelect, //Rx:1, Tx:0
+ TR_SELECT TxRxSelect, /* Rx:1, Tx:0 */
bool bAddNewTs
)
{
u8 UP = 0;
- //
- // We do not build any TS for Broadcast or Multicast stream.
- // So reject these kinds of search here.
- //
+ /* */
+ /* We do not build any TS for Broadcast or Multicast stream. */
+ /* So reject these kinds of search here. */
+ /* */
if (is_multicast_ether_addr(Addr))
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, "get TS for Broadcast or Multicast\n");
@@ -358,7 +358,7 @@ bool GetTs(
UP = 0;
else
{
- // In WMM case: we use 4 TID only
+ /* In WMM case: we use 4 TID only */
if (!IsACValid(TID))
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, " in %s(), TID(%d) is not valid\n", __func__, TID);
@@ -407,11 +407,11 @@ bool GetTs(
}
else
{
- //
- // Create a new Traffic stream for current Tx/Rx
- // This is for EDCA and WMM to add a new TS.
- // For HCCA or WMMSA, TS cannot be addmit without negotiation.
- //
+ /* */
+ /* Create a new Traffic stream for current Tx/Rx */
+ /* This is for EDCA and WMM to add a new TS. */
+ /* For HCCA or WMMSA, TS cannot be addmit without negotiation. */
+ /* */
TSPEC_BODY TSpec;
PQOS_TSINFO pTSInfo = &TSpec.f.TSInfo;
struct list_head *pUnusedList =
@@ -443,21 +443,21 @@ bool GetTs(
}
IEEE80211_DEBUG(IEEE80211_DL_TS, "to init current TS, UP:%d, Dir:%d, addr:%pM\n", UP, Dir, Addr);
- // Prepare TS Info releated field
- pTSInfo->field.ucTrafficType = 0; // Traffic type: WMM is reserved in this field
- pTSInfo->field.ucTSID = UP; // TSID
- pTSInfo->field.ucDirection = Dir; // Direction: if there is DirectLink, this need additional consideration.
- pTSInfo->field.ucAccessPolicy = 1; // Access policy
- pTSInfo->field.ucAggregation = 0; // Aggregation
- pTSInfo->field.ucPSB = 0; // Aggregation
- pTSInfo->field.ucUP = UP; // User priority
- pTSInfo->field.ucTSInfoAckPolicy = 0; // Ack policy
- pTSInfo->field.ucSchedule = 0; // Schedule
+ /* Prepare TS Info releated field */
+ pTSInfo->field.ucTrafficType = 0; /* Traffic type: WMM is reserved in this field */
+ pTSInfo->field.ucTSID = UP; /* TSID */
+ pTSInfo->field.ucDirection = Dir; /* Direction: if there is DirectLink, this need additional consideration. */
+ pTSInfo->field.ucAccessPolicy = 1; /* Access policy */
+ pTSInfo->field.ucAggregation = 0; /* Aggregation */
+ pTSInfo->field.ucPSB = 0; /* Aggregation */
+ pTSInfo->field.ucUP = UP; /* User priority */
+ pTSInfo->field.ucTSInfoAckPolicy = 0; /* Ack policy */
+ pTSInfo->field.ucSchedule = 0; /* Schedule */
MakeTSEntry(*ppTS, Addr, &TSpec, NULL, 0, 0);
AdmitTS(ieee, *ppTS, 0);
list_add_tail(&((*ppTS)->List), pAddmitList);
- // if there is DirectLink, we need to do additional operation here!!
+ /* if there is DirectLink, we need to do additional operation here!! */
return true;
}
@@ -473,7 +473,7 @@ bool GetTs(
static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
TR_SELECT TxRxSelect)
{
- //u32 flags = 0;
+ /* u32 flags = 0; */
unsigned long flags = 0;
del_timer_sync(&pTs->SetupTimer);
del_timer_sync(&pTs->InactTimer);
@@ -481,7 +481,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
if(TxRxSelect == RX_DIR)
{
-//#ifdef TO_DO_LIST
+/* #ifdef TO_DO_LIST */
PRX_REORDER_ENTRY pRxReorderEntry;
PRX_TS_RECORD pRxTS = (PRX_TS_RECORD)pTs;
if(timer_pending(&pRxTS->RxPktPendingTimer))
@@ -489,9 +489,9 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
while(!list_empty(&pRxTS->RxPendingPktList))
{
- // PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK);
+ /* PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK); */
spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
- //pRxReorderEntry = list_entry(&pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
+ /* pRxReorderEntry = list_entry(&pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List); */
pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
list_del_init(&pRxReorderEntry->List);
{
@@ -509,11 +509,11 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
prxb = NULL;
}
list_add_tail(&pRxReorderEntry->List,&ieee->RxReorder_Unused_List);
- //PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK);
+ /* PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK); */
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
}
-//#endif
+/* #endif */
}
else
{
@@ -615,7 +615,7 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, PTX_TS_RECORD pTxTS)
else
{
IEEE80211_DEBUG(IEEE80211_DL_BA,"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n");
- mod_timer(&pTxTS->TsAddBaTimer, jiffies+10); //set 10 ticks
+ mod_timer(&pTxTS->TsAddBaTimer, jiffies+10); /* set 10 ticks */
}
}
else
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Staging: rtl8192u: Convert comments from C99 to C89 style
@ 2015-02-21 19:54 Ksenija Stanojevic
0 siblings, 0 replies; 3+ messages in thread
From: Ksenija Stanojevic @ 2015-02-21 19:54 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Ksenija Stanojevic
Kernel style for comments is C89 style. Issue found by checkpatch.pl.
Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
---
.../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 304 ++++++++++-----------
1 file changed, 152 insertions(+), 152 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index d147187..1fe0103 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -103,12 +103,12 @@ static void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p)
{
u8 *tag = *tag_p;
- *tag++ = MFIE_TYPE_GENERIC; //0
+ *tag++ = MFIE_TYPE_GENERIC; /* 0 */
*tag++ = 7;
*tag++ = 0x00;
*tag++ = 0x50;
*tag++ = 0xf2;
- *tag++ = 0x02;//5
+ *tag++ = 0x02;/* 5 */
*tag++ = 0x00;
*tag++ = 0x01;
#ifdef SUPPORT_USPD
@@ -128,12 +128,12 @@ static void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p)
{
u8 *tag = *tag_p;
- *tag++ = MFIE_TYPE_GENERIC; //0
+ *tag++ = MFIE_TYPE_GENERIC; /* 0 */
*tag++ = 7;
*tag++ = 0x00;
*tag++ = 0xe0;
*tag++ = 0x4c;
- *tag++ = 0x01;//5
+ *tag++ = 0x01;/* 5 */
*tag++ = 0x02;
*tag++ = 0x11;
*tag++ = 0x00;
@@ -158,7 +158,7 @@ static void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb)
ieee->mgmt_queue_head = nh;
ieee->mgmt_queue_ring[nh] = skb;
- //return 0;
+ /* return 0; */
}
static struct sk_buff *dequeue_mgmt(struct ieee80211_device *ieee)
@@ -186,14 +186,14 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
u8 rate;
- // 2008/01/25 MH For broadcom, MGNT frame set as OFDM 6M.
+ /* 2008/01/25 MH For broadcom, MGNT frame set as OFDM 6M. */
if(pHTInfo->IOTAction & HT_IOT_ACT_MGNT_USE_CCK_6M)
rate = 0x0c;
else
rate = ieee->basic_rate & 0x7f;
if(rate == 0){
- // 2005.01.26, by rcnjko.
+ /* 2005.01.26, by rcnjko. */
if(ieee->mode == IEEE_A||
ieee->mode== IEEE_N_5G||
(ieee->mode== IEEE_N_24G&&!pHTInfo->bCurSuppCCK))
@@ -203,7 +203,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)
}
/*
- // Data rate of ProbeReq is already decided. Annie, 2005-03-31
+ /* Data rate of ProbeReq is already decided. Annie, 2005-03-31 */
if( pMgntInfo->bScanInProgress || (pMgntInfo->bDualModeScanStep!=0) )
{
if(pMgntInfo->dot11CurrentWirelessMode==WIRELESS_MODE_A)
@@ -251,7 +251,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee
/* avoid watchdog triggers */
ieee->dev->trans_start = jiffies;
ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
spin_unlock_irqrestore(&ieee->lock, flags);
@@ -277,9 +277,9 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee
printk("%s():insert to waitqueue!\n",__func__);
skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index], skb);
} else {
- //printk("TX packet!\n");
+ /* printk("TX packet!\n"); */
ieee->softmac_hard_start_xmit(skb, ieee->dev);
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags);
}
@@ -318,7 +318,7 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *i
ieee->softmac_hard_start_xmit(skb, ieee->dev);
}
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
@@ -341,7 +341,7 @@ inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
req = (struct ieee80211_probe_request *) skb_put(skb,sizeof(struct ieee80211_probe_request));
req->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
- req->header.duration_id = 0; //FIXME: is this OK ?
+ req->header.duration_id = 0; /* FIXME: is this OK ? */
memset(req->header.addr1, 0xff, ETH_ALEN);
memcpy(req->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
@@ -366,24 +366,24 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee)
struct sk_buff *skb;
if(!ieee->ieee_up)
return;
- //unsigned long flags;
+ /* unsigned long flags; */
skb = ieee80211_get_beacon_(ieee);
if (skb){
softmac_mgmt_xmit(skb, ieee);
ieee->softmac_stats.tx_beacons++;
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
-// ieee->beacon_timer.expires = jiffies +
-// (MSECS( ieee->current_network.beacon_interval -5));
+/* ieee->beacon_timer.expires = jiffies + */
+/* (MSECS( ieee->current_network.beacon_interval -5)); */
- //spin_lock_irqsave(&ieee->beacon_lock,flags);
+ /* spin_lock_irqsave(&ieee->beacon_lock,flags); */
if(ieee->beacon_txing && ieee->ieee_up){
-// if(!timer_pending(&ieee->beacon_timer))
-// add_timer(&ieee->beacon_timer);
+/* if(!timer_pending(&ieee->beacon_timer)) */
+/* add_timer(&ieee->beacon_timer); */
mod_timer(&ieee->beacon_timer,jiffies+(MSECS(ieee->current_network.beacon_interval-5)));
}
- //spin_unlock_irqrestore(&ieee->beacon_lock,flags);
+ /* spin_unlock_irqrestore(&ieee->beacon_lock,flags); */
}
@@ -407,7 +407,7 @@ static void ieee80211_send_probe(struct ieee80211_device *ieee)
if (skb){
softmac_mgmt_xmit(skb, ieee);
ieee->softmac_stats.tx_probe_rq++;
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
}
@@ -506,7 +506,7 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)
(ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER;
if (watchdog++ > MAX_CHANNEL_NUMBER)
{
- //if current channel is not in channel map, set to default channel.
+ /* if current channel is not in channel map, set to default channel. */
if (!channel_map[ieee->current_network.channel]) {
ieee->current_network.channel = 6;
goto out; /* no good chans */
@@ -580,12 +580,12 @@ EXPORT_SYMBOL(ieee80211_start_send_beacons);
static void ieee80211_softmac_stop_scan(struct ieee80211_device *ieee)
{
-// unsigned long flags;
+/* unsigned long flags; */
- //ieee->sync_scan_hurryup = 1;
+ /* ieee->sync_scan_hurryup = 1; */
down(&ieee->scan_sem);
-// spin_lock_irqsave(&ieee->lock, flags);
+/* spin_lock_irqsave(&ieee->lock, flags); */
if (ieee->scanning == 1){
ieee->scanning = 0;
@@ -593,7 +593,7 @@ static void ieee80211_softmac_stop_scan(struct ieee80211_device *ieee)
cancel_delayed_work(&ieee->softmac_scan_wq);
}
-// spin_unlock_irqrestore(&ieee->lock, flags);
+/* spin_unlock_irqrestore(&ieee->lock, flags); */
up(&ieee->scan_sem);
}
@@ -663,19 +663,19 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be
auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
- auth->header.duration_id = 0x013a; //FIXME
+ auth->header.duration_id = 0x013a; /* FIXME */
memcpy(auth->header.addr1, beacon->bssid, ETH_ALEN);
memcpy(auth->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
memcpy(auth->header.addr3, beacon->bssid, ETH_ALEN);
- //auth->algorithm = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
+ /* auth->algorithm = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY; */
if(ieee->auth_mode == 0)
auth->algorithm = WLAN_AUTH_OPEN;
else if(ieee->auth_mode == 1)
auth->algorithm = WLAN_AUTH_SHARED_KEY;
else if(ieee->auth_mode == 2)
- auth->algorithm = WLAN_AUTH_OPEN;//0x80;
+ auth->algorithm = WLAN_AUTH_OPEN;/* 0x80; */
printk("=================>%s():auth->algorithm is %d\n",__func__,auth->algorithm);
auth->transaction = cpu_to_le16(ieee->associate_seq);
ieee->associate_seq++;
@@ -730,7 +730,7 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
encrypt = ieee->host_encrypt && crypt && crypt->ops &&
((0 == strcmp(crypt->ops->name, "WEP") || wpa_ie_len));
- //HT ralated element
+ /* HT ralated element */
tmp_ht_cap_buf =(u8 *) &(ieee->pHTInfo->SelfHTCap);
tmp_ht_cap_len = sizeof(ieee->pHTInfo->SelfHTCap);
tmp_ht_info_buf =(u8 *) &(ieee->pHTInfo->SelfHTInfo);
@@ -745,19 +745,19 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
tmp_generic_ie_len = sizeof(ieee->pHTInfo->szRT2RTAggBuffer);
HTConstructRT2RTAggElement(ieee, tmp_generic_ie_buf, &tmp_generic_ie_len);
}
-// printk("===============>tmp_ht_cap_len is %d,tmp_ht_info_len is %d, tmp_generic_ie_len is %d\n",tmp_ht_cap_len,tmp_ht_info_len,tmp_generic_ie_len);
+/* printk("===============>tmp_ht_cap_len is %d,tmp_ht_info_len is %d, tmp_generic_ie_len is %d\n",tmp_ht_cap_len,tmp_ht_info_len,tmp_generic_ie_len); */
beacon_size = sizeof(struct ieee80211_probe_response)+2+
ssid_len
- +3 //channel
+ +3 /* channel */
+rate_len
+rate_ex_len
+atim_len
+erp_len
+wpa_ie_len
- // +tmp_ht_cap_len
- // +tmp_ht_info_len
- // +tmp_generic_ie_len
-// +wmm_len+2
+ /* +tmp_ht_cap_len */
+ /* +tmp_ht_info_len */
+ /* +tmp_generic_ie_len */
+/* +wmm_len+2 */
+ieee->tx_headroom;
skb = dev_alloc_skb(beacon_size);
if (!skb)
@@ -768,13 +768,13 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
memcpy (beacon_buf->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
memcpy (beacon_buf->header.addr3, ieee->current_network.bssid, ETH_ALEN);
- beacon_buf->header.duration_id = 0; //FIXME
+ beacon_buf->header.duration_id = 0; /* FIXME */
beacon_buf->beacon_interval =
cpu_to_le16(ieee->current_network.beacon_interval);
beacon_buf->capability =
cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_IBSS);
beacon_buf->capability |=
- cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE); //add short preamble here
+ cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE); /* add short preamble here */
if(ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT))
beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
@@ -827,14 +827,14 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
if (wpa_ie_len)
{
if (ieee->iw_mode == IW_MODE_ADHOC)
- {//as Windows will set pairwise key same as the group key which is not allowed in Linux, so set this for IOT issue. WB 2008.07.07
+ {/* as Windows will set pairwise key same as the group key which is not allowed in Linux, so set this for IOT issue. WB 2008.07.07 */
memcpy(&ieee->wpa_ie[14], &ieee->wpa_ie[8], 4);
}
memcpy(tag, ieee->wpa_ie, ieee->wpa_ie_len);
tag += wpa_ie_len;
}
- //skb->dev = ieee->dev;
+ /* skb->dev = ieee->dev; */
return skb;
}
@@ -983,16 +983,16 @@ static void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest)
inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beacon,struct ieee80211_device *ieee)
{
struct sk_buff *skb;
- //unsigned long flags;
+ /* unsigned long flags; */
struct ieee80211_assoc_request_frame *hdr;
- u8 *tag;//,*rsn_ie;
- //short info_addr = 0;
- //int i;
- //u16 suite_count = 0;
- //u8 suit_select = 0;
- //unsigned int wpa_len = beacon->wpa_ie_len;
- //for HT
+ u8 *tag;/* ,*rsn_ie; */
+ /* short info_addr = 0; */
+ /* int i; */
+ /* u16 suite_count = 0; */
+ /* u8 suit_select = 0; */
+ /* unsigned int wpa_len = beacon->wpa_ie_len; */
+ /* for HT */
u8 *ht_cap_buf = NULL;
u8 ht_cap_len=0;
u8 *realtek_ie_buf=NULL;
@@ -1015,7 +1015,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
crypt = ieee->crypt[ieee->tx_keyidx];
encrypt = ieee->host_encrypt && crypt && crypt->ops && ((0 == strcmp(crypt->ops->name,"WEP") || wpa_ie_len));
- //Include High Throuput capability && Realtek proprietary
+ /* Include High Throuput capability && Realtek proprietary */
if(ieee->pHTInfo->bCurrentHTSupport&&ieee->pHTInfo->bEnableHT)
{
ht_cap_buf = (u8 *)&(ieee->pHTInfo->SelfHTCap);
@@ -1047,8 +1047,8 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
#ifdef THOMAS_TURBO
len = sizeof(struct ieee80211_assoc_request_frame)+ 2
- + beacon->ssid_len//essid tagged val
- + rate_len//rates tagged val
+ + beacon->ssid_len/* essid tagged val */
+ + rate_len/* rates tagged val */
+ wpa_ie_len
+ wmm_info_len
+ turbo_info_len
@@ -1060,8 +1060,8 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
+ ieee->tx_headroom;
#else
len = sizeof(struct ieee80211_assoc_request_frame)+ 2
- + beacon->ssid_len//essid tagged val
- + rate_len//rates tagged val
+ + beacon->ssid_len/* essid tagged val */
+ + rate_len/* rates tagged val */
+ wpa_ie_len
+ wmm_info_len
+ ht_cap_len
@@ -1084,26 +1084,26 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ;
- hdr->header.duration_id= 37; //FIXME
+ hdr->header.duration_id= 37; /* FIXME */
memcpy(hdr->header.addr1, beacon->bssid, ETH_ALEN);
memcpy(hdr->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
memcpy(hdr->header.addr3, beacon->bssid, ETH_ALEN);
- memcpy(ieee->ap_mac_addr, beacon->bssid, ETH_ALEN);//for HW security, John
+ memcpy(ieee->ap_mac_addr, beacon->bssid, ETH_ALEN);/* for HW security, John */
hdr->capability = cpu_to_le16(WLAN_CAPABILITY_BSS);
if (beacon->capability & WLAN_CAPABILITY_PRIVACY )
hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
if (beacon->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
- hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE); //add short_preamble here
+ hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE); /* add short_preamble here */
if(ieee->short_slot)
hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
- if (wmm_info_len) //QOS
+ if (wmm_info_len) /* QOS */
hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_QOS);
- hdr->listen_interval = 0xa; //FIXME
+ hdr->listen_interval = 0xa; /* FIXME */
hdr->info_element[0].id = MFIE_TYPE_SSID;
@@ -1115,24 +1115,24 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
ieee80211_MFIE_Brate(ieee, &tag);
ieee80211_MFIE_Grate(ieee, &tag);
- // For CCX 1 S13, CKIP. Added by Annie, 2006-08-14.
+ /* For CCX 1 S13, CKIP. Added by Annie, 2006-08-14. */
if (beacon->bCkipSupported) {
- static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; // "4500-client"
+ static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; /* "4500-client" */
u8 CcxAironetBuf[30];
OCTET_STRING osCcxAironetIE;
memset(CcxAironetBuf, 0, 30);
osCcxAironetIE.Octet = CcxAironetBuf;
osCcxAironetIE.Length = sizeof(CcxAironetBuf);
- //
- // Ref. CCX test plan v3.61, 3.2.3.1 step 13.
- // We want to make the device type as "4500-client". 060926, by CCW.
- //
+ /* */
+ /* Ref. CCX test plan v3.61, 3.2.3.1 step 13. */
+ /* We want to make the device type as "4500-client". 060926, by CCW. */
+ /* */
memcpy(osCcxAironetIE.Octet, AironetIeOui, sizeof(AironetIeOui));
- // CCX1 spec V1.13, A01.1 CKIP Negotiation (page23):
- // "The CKIP negotiation is started with the associate request from the client to the access point,
- // containing an Aironet element with both the MIC and KP bits set."
+ /* CCX1 spec V1.13, A01.1 CKIP Negotiation (page23): */
+ /* "The CKIP negotiation is started with the associate request from the client to the access point, */
+ /* containing an Aironet element with both the MIC and KP bits set." */
osCcxAironetIE.Octet[IE_CISCO_FLAG_POSITION] |= (SUPPORT_CKIP_PK|SUPPORT_CKIP_MIC) ;
tag = skb_put(skb, ckip_ie_len);
*tag++ = MFIE_TYPE_AIRONET;
@@ -1167,7 +1167,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length);
tag += osCcxVerNum.Length;
}
- //HT cap element
+ /* HT cap element */
if(ieee->pHTInfo->bCurrentHTSupport&&ieee->pHTInfo->bEnableHT){
if(ieee->pHTInfo->ePeerHTSpecVer != HT_SPEC_VER_EWC)
{
@@ -1180,7 +1180,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
}
- //choose what wpa_supplicant gives to associate.
+ /* choose what wpa_supplicant gives to associate. */
tag = skb_put(skb, wpa_ie_len);
if (wpa_ie_len){
memcpy(tag, ieee->wpa_ie, ieee->wpa_ie_len);
@@ -1214,8 +1214,8 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
memcpy(tag, realtek_ie_buf,realtek_ie_len -2 );
}
}
-// printk("<=====%s(), %p, %p\n", __func__, ieee->dev, ieee->dev->dev_addr);
-// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len);
+/* printk("<=====%s(), %p, %p\n", __func__, ieee->dev, ieee->dev->dev_addr); */
+/* IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len); */
return skb;
}
@@ -1270,14 +1270,14 @@ static void ieee80211_associate_step1(struct ieee80211_device *ieee)
else{
ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATING ;
IEEE80211_DEBUG_MGMT("Sending authentication request\n");
- //printk(KERN_WARNING "Sending authentication request\n");
+ /* printk(KERN_WARNING "Sending authentication request\n"); */
softmac_mgmt_xmit(skb, ieee);
- //BUGON when you try to add_timer twice, using mod_timer may be better, john0709
+ /* BUGON when you try to add_timer twice, using mod_timer may be better, john0709 */
if(!timer_pending(&ieee->associate_timer)){
ieee->associate_timer.expires = jiffies + (HZ / 2);
add_timer(&ieee->associate_timer);
}
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
}
@@ -1288,7 +1288,7 @@ static void ieee80211_auth_challenge(struct ieee80211_device *ieee,
u8 *c;
struct sk_buff *skb;
struct ieee80211_network *beacon = &ieee->current_network;
-// int hlen = sizeof(struct ieee80211_authentication);
+/* int hlen = sizeof(struct ieee80211_authentication); */
ieee->associate_seq++;
ieee->softmac_stats.tx_auth_rq++;
@@ -1308,7 +1308,7 @@ static void ieee80211_auth_challenge(struct ieee80211_device *ieee,
softmac_mgmt_xmit(skb, ieee);
mod_timer(&ieee->associate_timer, jiffies + (HZ/2));
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
kfree(challenge);
}
@@ -1329,7 +1329,7 @@ static void ieee80211_associate_step2(struct ieee80211_device *ieee)
else{
softmac_mgmt_xmit(skb, ieee);
mod_timer(&ieee->associate_timer, jiffies + (HZ/2));
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
}
static void ieee80211_associate_complete_wq(struct work_struct *work)
@@ -1354,10 +1354,10 @@ static void ieee80211_associate_complete_wq(struct work_struct *work)
{
printk("Successfully associated, ht not enabled(%d, %d)\n", ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bEnableHT);
memset(ieee->dot11HTOperationalRateSet, 0, 16);
- //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
+ /* HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); */
}
ieee->LinkDetectInfo.SlotNum = 2 * (1 + ieee->current_network.beacon_interval/500);
- // To prevent the immediately calling watch_dog after association.
+ /* To prevent the immediately calling watch_dog after association. */
if(ieee->LinkDetectInfo.NumRecvBcnInPeriod==0||ieee->LinkDetectInfo.NumRecvDataInPeriod==0 )
{
ieee->LinkDetectInfo.NumRecvBcnInPeriod = 1;
@@ -1381,12 +1381,12 @@ static void ieee80211_associate_complete_wq(struct work_struct *work)
static void ieee80211_associate_complete(struct ieee80211_device *ieee)
{
-// int i;
-// struct net_device* dev = ieee->dev;
+/* int i; */
+/* struct net_device* dev = ieee->dev; */
del_timer_sync(&ieee->associate_timer);
ieee->state = IEEE80211_LINKED;
- //ieee->UpdateHalRATRTableHandler(dev, ieee->dot11HTOperationalRateSet);
+ /* ieee->UpdateHalRATRTableHandler(dev, ieee->dot11HTOperationalRateSet); */
queue_work(ieee->wq, &ieee->associate_complete_wq);
}
@@ -1401,7 +1401,7 @@ static void ieee80211_associate_procedure_wq(struct work_struct *work)
ieee80211_stop_scan(ieee);
printk("===>%s(), chan:%d\n", __func__, ieee->current_network.channel);
- //ieee->set_chan(ieee->dev, ieee->current_network.channel);
+ /* ieee->set_chan(ieee->dev, ieee->current_network.channel); */
HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
ieee->associate_seq = 1;
@@ -1435,8 +1435,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
* This could be obtained by beacons or, if the network does not
* broadcast it, it can be put manually.
*/
- apset = ieee->wap_set;//(memcmp(ieee->current_network.bssid, zero,ETH_ALEN)!=0 );
- ssidset = ieee->ssid_set;//ieee->current_network.ssid[0] != '\0';
+ apset = ieee->wap_set;/* (memcmp(ieee->current_network.bssid, zero,ETH_ALEN)!=0 ); */
+ ssidset = ieee->ssid_set;/* ieee->current_network.ssid[0] != '\0'; */
ssidbroad = !(net->ssid_len == 0 || net->ssid[0]== '\0');
apmatch = (memcmp(ieee->current_network.bssid, net->bssid, ETH_ALEN)==0);
ssidmatch = (ieee->current_network.ssid_len == net->ssid_len)&&\
@@ -1470,18 +1470,18 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
}
printk(KERN_INFO"Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d\n",ieee->current_network.ssid,ieee->current_network.channel, ieee->current_network.qos_data.supported, ieee->pHTInfo->bEnableHT, ieee->current_network.bssht.bdSupportHT);
- //ieee->pHTInfo->IOTAction = 0;
+ /* ieee->pHTInfo->IOTAction = 0; */
HTResetIOTSetting(ieee->pHTInfo);
if (ieee->iw_mode == IW_MODE_INFRA){
/* Join the network for the first time */
ieee->AsocRetryCount = 0;
- //for HT by amy 080514
+ /* for HT by amy 080514 */
if((ieee->current_network.qos_data.supported == 1) &&
- // (ieee->pHTInfo->bEnableHT && ieee->current_network.bssht.bdSupportHT))
+ /* (ieee->pHTInfo->bEnableHT && ieee->current_network.bssht.bdSupportHT)) */
ieee->current_network.bssht.bdSupportHT)
/*WB, 2008.09.09:bCurrentHTSupport and bEnableHT two flags are going to put together to check whether we are in HT now, so needn't to check bEnableHT flags here. That's is to say we will set to HT support whenever joined AP has the ability to support HT. And whether we are in HT or not, please check bCurrentHTSupport&&bEnableHT now please.*/
{
- // ieee->pHTInfo->bCurrentHTSupport = true;
+ /* ieee->pHTInfo->bCurrentHTSupport = true; */
HTResetSelfAndSavePeerSetting(ieee, &(ieee->current_network));
}
else
@@ -1503,7 +1503,7 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
printk(KERN_INFO"Using B rates\n");
}
memset(ieee->dot11HTOperationalRateSet, 0, 16);
- //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
+ /* HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); */
ieee->state = IEEE80211_LINKED;
}
@@ -1611,7 +1611,7 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb,
tag++; /* point to the next tag */
}
- //IEEE80211DMESG("Card MAC address is "MACSTR, MAC2STR(src));
+ /* IEEE80211DMESG("Card MAC address is "MACSTR, MAC2STR(src)); */
if (ssidlen == 0) return 1;
if (!ssid) return 1; /* ssid not found in tagged param */
@@ -1669,11 +1669,11 @@ ieee80211_rx_probe_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
{
u8 dest[ETH_ALEN];
- //IEEE80211DMESG("Rx probe");
+ /* IEEE80211DMESG("Rx probe"); */
ieee->softmac_stats.rx_probe_rq++;
- //DMESG("Dest is "MACSTR, MAC2STR(dest));
+ /* DMESG("Dest is "MACSTR, MAC2STR(dest)); */
if (probe_rq_parse(ieee, skb, dest)){
- //IEEE80211DMESG("Was for me!");
+ /* IEEE80211DMESG("Was for me!"); */
ieee->softmac_stats.tx_probe_rs++;
ieee80211_resp_to_probe(ieee, dest);
}
@@ -1684,14 +1684,14 @@ ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
{
u8 dest[ETH_ALEN];
int status;
- //IEEE80211DMESG("Rx probe");
+ /* IEEE80211DMESG("Rx probe"); */
ieee->softmac_stats.rx_auth_rq++;
status = auth_rq_parse(skb, dest);
if (status != -1) {
ieee80211_resp_to_auth(ieee, status, dest);
}
- //DMESG("Dest is "MACSTR, MAC2STR(dest));
+ /* DMESG("Dest is "MACSTR, MAC2STR(dest)); */
}
@@ -1700,7 +1700,7 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
{
u8 dest[ETH_ALEN];
- //unsigned long flags;
+ /* unsigned long flags; */
ieee->softmac_stats.rx_ass_rq++;
if (assoc_rq_parse(skb,dest) != -1){
@@ -1708,7 +1708,7 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
}
printk(KERN_INFO"New client associated: %pM\n", dest);
- //FIXME
+ /* FIXME */
}
static void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee,
@@ -1735,11 +1735,11 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,
return 0;
*/
dtim = ieee->current_network.dtim_data;
- //printk("DTIM\n");
+ /* printk("DTIM\n"); */
if(!(dtim & IEEE80211_DTIM_VALID))
return 0;
- timeout = ieee->current_network.beacon_interval; //should we use ps_timeout value or beacon_interval
- //printk("VALID\n");
+ timeout = ieee->current_network.beacon_interval; /* should we use ps_timeout value or beacon_interval */
+ /* printk("VALID\n"); */
ieee->current_network.dtim_data = IEEE80211_DTIM_INVALID;
if(dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps))
@@ -1786,7 +1786,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
ieee->iw_mode != IW_MODE_INFRA ||
ieee->state != IEEE80211_LINKED)){
- // #warning CHECK_LOCK_HERE
+ /* #warning CHECK_LOCK_HERE */
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
ieee80211_sta_wakeup(ieee, 1);
@@ -1805,7 +1805,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
ieee->enter_sleep_state(ieee->dev, th, tl);
else if(ieee->sta_sleep == 0){
- // printk("send null 1\n");
+ /* printk("send null 1\n"); */
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
if(ieee->ps_is_queue_empty(ieee->dev)){
@@ -1826,7 +1826,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
}else if(sleep == 2){
-//#warning CHECK_LOCK_HERE
+/* #warning CHECK_LOCK_HERE */
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
ieee80211_sta_wakeup(ieee, 1);
@@ -1897,7 +1897,7 @@ static void ieee80211_process_action(struct ieee80211_device *ieee,
struct ieee80211_hdr *header = (struct ieee80211_hdr *)skb->data;
u8 *act = ieee80211_get_payload(header);
u8 tmp = 0;
-// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len);
+/* IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len); */
if (act == NULL)
{
IEEE80211_DEBUG(IEEE80211_DL_ERR, "error to get payload of action frame\n");
@@ -1931,8 +1931,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
int chlen=0;
int aid;
struct ieee80211_assoc_response_frame *assoc_resp;
-// struct ieee80211_info_element *info_element;
- bool bSupportNmode = true, bHalfSupportNmode = false; //default support N mode, disable halfNmode
+/* struct ieee80211_info_element *info_element; */
+ bool bSupportNmode = true, bHalfSupportNmode = false; /* default support N mode, disable halfNmode */
if(!ieee->proto_started)
return 0;
@@ -1976,7 +1976,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
return 1;
}
else
- { //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network.
+ { /* filling the PeerHTCap. //maybe not necessary as we can get its info from current_network. */
memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen);
memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen);
}
@@ -2028,7 +2028,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
{
if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
{
- // WEP or TKIP encryption
+ /* WEP or TKIP encryption */
if(IsHTHalfNmodeAPs(ieee))
{
bSupportNmode = true;
@@ -2044,11 +2044,11 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
}
/* Dummy wirless mode setting to avoid encryption issue */
if(bSupportNmode) {
- //N mode setting
+ /* N mode setting */
ieee->SetWirelessMode(ieee->dev, \
ieee->current_network.mode);
}else{
- //b/g mode setting
+ /* b/g mode setting */
/*TODO*/
ieee->SetWirelessMode(ieee->dev, IEEE_G);
}
@@ -2100,7 +2100,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
ieee->softmac_stats.reassoc++;
notify_wx_assoc_event(ieee);
- //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
+ /* HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); */
RemovePeerTS(ieee, header->addr2);
queue_work(ieee->wq, &ieee->associate_procedure_wq);
}
@@ -2113,7 +2113,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
break;
}
- //dev_kfree_skb_any(skb);
+ /* dev_kfree_skb_any(skb); */
return 0;
}
@@ -2168,8 +2168,8 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *
/* as for the completion function, it does not need
* to check it any more.
* */
- //printk("error:no descriptor left@queue_index %d\n", queue_index);
- //ieee80211_stop_queue(ieee);
+ /* printk("error:no descriptor left@queue_index %d\n", queue_index); */
+ /* ieee80211_stop_queue(ieee); */
#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
skb_queue_tail(&ieee->skb_drv_aggQ[queue_index], txb->fragments[i]);
#else
@@ -2179,14 +2179,14 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *
ieee->softmac_data_hard_start_xmit(
txb->fragments[i],
ieee->dev, ieee->rate);
- //ieee->stats.tx_packets++;
- //ieee->stats.tx_bytes += txb->fragments[i]->len;
- //ieee->dev->trans_start = jiffies;
+ /* ieee->stats.tx_packets++; */
+ /* ieee->stats.tx_bytes += txb->fragments[i]->len; */
+ /* ieee->dev->trans_start = jiffies; */
}
}
ieee80211_txb_free(txb);
-//exit:
+/* exit: */
spin_unlock_irqrestore(&ieee->lock, flags);
}
@@ -2206,7 +2206,7 @@ static void ieee80211_resume_tx(struct ieee80211_device *ieee)
ieee->softmac_data_hard_start_xmit(
ieee->tx_pending.txb->fragments[i],
ieee->dev, ieee->rate);
- //(i+1)<ieee->tx_pending.txb->nr_frags);
+ /* (i+1)<ieee->tx_pending.txb->nr_frags); */
ieee->stats.tx_packets++;
ieee->dev->trans_start = jiffies;
}
@@ -2259,7 +2259,7 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee)
ieee->seq_ctrl[0]++;
ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
}
if (!ieee->queue_stop && ieee->tx_pending.txb)
@@ -2277,15 +2277,15 @@ EXPORT_SYMBOL(ieee80211_wake_queue);
void ieee80211_stop_queue(struct ieee80211_device *ieee)
{
- //unsigned long flags;
- //spin_lock_irqsave(&ieee->lock,flags);
+ /* unsigned long flags; */
+ /* spin_lock_irqsave(&ieee->lock,flags); */
if (! netif_queue_stopped(ieee->dev)){
netif_stop_queue(ieee->dev);
ieee->softmac_stats.swtxstop++;
}
ieee->queue_stop = 1;
- //spin_unlock_irqrestore(&ieee->lock,flags);
+ /* spin_unlock_irqrestore(&ieee->lock,flags); */
}
EXPORT_SYMBOL(ieee80211_stop_queue);
@@ -2361,7 +2361,7 @@ static void ieee80211_start_ibss_wq(struct work_struct *work)
ieee80211_softmac_check_all_nets(ieee);
-// if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK))
+/* if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) */
if (ieee->state == IEEE80211_NOLINK)
ieee->current_network.channel = 6;
/* if not then the state is not linked. Maybe the user swithced to
@@ -2417,7 +2417,7 @@ static void ieee80211_start_ibss_wq(struct work_struct *work)
ieee->rate = 22;
}
- // By default, WMM function will be disabled in IBSS mode
+ /* By default, WMM function will be disabled in IBSS mode */
ieee->current_network.QoS_Enable = 0;
ieee->SetWirelessMode(ieee->dev, IEEE_G);
ieee->current_network.atim_window = 0;
@@ -2452,10 +2452,10 @@ inline void ieee80211_start_ibss(struct ieee80211_device *ieee)
void ieee80211_start_bss(struct ieee80211_device *ieee)
{
unsigned long flags;
- //
- // Ref: 802.11d 11.1.3.3
- // STA shall not start a BSS unless properly formed Beacon frame including a Country IE.
- //
+ /* */
+ /* Ref: 802.11d 11.1.3.3 */
+ /* STA shall not start a BSS unless properly formed Beacon frame including a Country IE. */
+ /* */
if(IS_DOT11D_ENABLE(ieee) && !IS_COUNTRY_IE_VALID(ieee))
{
if(! ieee->bGlobalDomain)
@@ -2502,7 +2502,7 @@ void ieee80211_disassociate(struct ieee80211_device *ieee)
ieee->state = IEEE80211_NOLINK;
ieee->is_set_key = false;
ieee->link_change(ieee->dev);
- //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
+ /* HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); */
notify_wx_assoc_event(ieee);
}
@@ -2612,7 +2612,7 @@ void ieee80211_stop_protocol(struct ieee80211_device *ieee)
ieee80211_stop_scan(ieee);
ieee80211_disassociate(ieee);
- RemoveAllTS(ieee); //added as we disconnect from the previous BSS, Remove all TS
+ RemoveAllTS(ieee); /* added as we disconnect from the previous BSS, Remove all TS */
}
void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee)
@@ -2644,8 +2644,8 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee)
if (ieee->current_network.beacon_interval == 0)
ieee->current_network.beacon_interval = 100;
-// printk("===>%s(), chan:%d\n", __func__, ieee->current_network.channel);
-// ieee->set_chan(ieee->dev,ieee->current_network.channel);
+/* printk("===>%s(), chan:%d\n", __func__, ieee->current_network.channel); */
+/* ieee->set_chan(ieee->dev,ieee->current_network.channel); */
for(i = 0; i < 17; i++) {
ieee->last_rxseq_num[i] = -1;
@@ -2653,7 +2653,7 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee)
ieee->last_packet_time[i] = 0;
}
- ieee->init_wmmparam_flag = 0;//reinitialize AC_xx_PARAM registers.
+ ieee->init_wmmparam_flag = 0;/* reinitialize AC_xx_PARAM registers. */
/* if the user set the MAC of the ad-hoc cell and then
@@ -2689,7 +2689,7 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
ieee->pDot11dInfo = kzalloc(sizeof(RT_DOT11D_INFO), GFP_ATOMIC);
if (!ieee->pDot11dInfo)
IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc memory for DOT11D\n");
- //added for AP roaming
+ /* added for AP roaming */
ieee->LinkDetectInfo.SlotNum = 2;
ieee->LinkDetectInfo.NumRecvBcnInPeriod=0;
ieee->LinkDetectInfo.NumRecvDataInPeriod=0;
@@ -2697,7 +2697,7 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
ieee->assoc_id = 0;
ieee->queue_stop = 0;
ieee->scanning = 0;
- ieee->softmac_features = 0; //so IEEE2100-like driver are happy
+ ieee->softmac_features = 0; /* so IEEE2100-like driver are happy */
ieee->wap_set = 0;
ieee->ssid_set = 0;
ieee->proto_started = 0;
@@ -2705,10 +2705,10 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
ieee->rate = 22;
ieee->ps = IEEE80211_PS_DISABLED;
ieee->sta_sleep = 0;
- ieee->Regdot11HTOperationalRateSet[0]= 0xff;//support MCS 0~7
- ieee->Regdot11HTOperationalRateSet[1]= 0xff;//support MCS 8~15
+ ieee->Regdot11HTOperationalRateSet[0]= 0xff;/* support MCS 0~7 */
+ ieee->Regdot11HTOperationalRateSet[1]= 0xff;/* support MCS 8~15 */
ieee->Regdot11HTOperationalRateSet[4]= 0x01;
- //added by amy
+ /* added by amy */
ieee->actscanning = false;
ieee->beinretry = false;
ieee->is_set_key = false;
@@ -2798,7 +2798,7 @@ static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int re
switch (command) {
case IEEE_MLME_STA_DEAUTH:
- // silently ignore
+ /* silently ignore */
break;
case IEEE_MLME_STA_DISASSOC:
@@ -2870,8 +2870,8 @@ static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value)
if (ieee->set_security)
ieee->set_security(ieee->dev, &sec);
- //else
- // ret = -EOPNOTSUPP;
+ /* else */
+ /* ret = -EOPNOTSUPP; */
return 0;
}
@@ -2935,7 +2935,7 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 v
ieee->ieee802_1x=value;
break;
case IEEE_PARAM_WPAX_SELECT:
- // added for WPA2 mixed mode
+ /* added for WPA2 mixed mode */
spin_lock_irqsave(&ieee->wpax_suitlist_lock, flags);
ieee->wpax_type_set = 1;
ieee->wpax_type_notify = value;
@@ -2985,8 +2985,8 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
if (strcmp(param->u.crypt.alg, "none") == 0) {
if (crypt) {
sec.enabled = 0;
- // FIXME FIXME
- //sec.encrypt = 0;
+ /* FIXME FIXME */
+ /* sec.encrypt = 0; */
sec.level = SEC_LEVEL_0;
sec.flags |= SEC_ENABLED | SEC_LEVEL;
ieee80211_crypt_delayed_deinit(ieee, crypt);
@@ -2994,8 +2994,8 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
goto done;
}
sec.enabled = 1;
-// FIXME FIXME
-// sec.encrypt = 1;
+/* FIXME FIXME */
+/* sec.encrypt = 1; */
sec.flags |= SEC_ENABLED;
/* IPW HW cannot build TKIP MIC, host decryption still needed. */
@@ -3007,7 +3007,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
request_module("ieee80211_crypt_wep");
ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
- //set WEP40 first, it will be modified according to WEP104 or WEP40 at other place
+ /* set WEP40 first, it will be modified according to WEP104 or WEP40 at other place */
} else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
request_module("ieee80211_crypt_tkip");
ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
@@ -3142,7 +3142,7 @@ SendDisassociation(
skb = ieee80211_disassociate_skb(beacon,ieee,asRsn);
if (skb){
softmac_mgmt_xmit(skb, ieee);
- //dev_kfree_skb_any(skb);//edit by thomas
+ /* dev_kfree_skb_any(skb);//edit by thomas */
}
}
EXPORT_SYMBOL(SendDisassociation);
@@ -3153,7 +3153,7 @@ int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_poin
int ret=0;
down(&ieee->wx_sem);
- //IEEE_DEBUG_INFO("wpa_supplicant: len=%d\n", p->length);
+ /* IEEE_DEBUG_INFO("wpa_supplicant: len=%d\n", p->length); */
if (p->length < sizeof(struct ieee_param) || !p->pointer){
ret = -EINVAL;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-23 19:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-23 19:15 [PATCH] Staging: rtl8192u: Convert comments from C99 to C89 style Ksenija Stanojevic
-- strict thread matches above, loose matches on Subject: below --
2015-02-21 20:02 Ksenija Stanojevic
2015-02-21 19:54 Ksenija Stanojevic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.