Staging: rtl8192u - fixed block comments
v2 cover Staging: rtl8192u - fixed block comments
Fixed style of block comments across all of the rtl8192u driver
This driver has a lot of code commented out that could be deleted, I have not changed that.
Version #1 had a bug in 04/25 where I commented out valid code.
Derek Robson (25):
Staging: rtl8192u: r819xU_phy.c - style fix
Staging: rtl8192u: r819xU_firmware.c - style fix
Staging: rtl8192u: r819xU_cmdpkt.h - style fix
Staging: rtl8192u: r819xU_cmdpkt.c - style fix
Staging: rtl8192u: r8192U_hw.h - style fix
Staging: rtl8192u: r8192U_dm.c - style fix
Staging: rtl8192u: r8192U_core.c - style fix
Staging: rtl8192u: r8192U.h - style fix
Staging: rtl8192u: r8190_rtl8256.h - style fix
Staging: rtl8192u: r8190_rtl8256.c - style fix
Staging: rtl8192u: r8180_93cx6.c - style fix
Staging: rtl8192u: ieee80211: ieee80211_crypt_wep.c - style fix
Staging: rtl8192u: ieee80211: rtl819x_TSProc.c - style fix
Staging: rtl8192u: ieee80211: ieee80211_softmac.c - style fix
Staging: rtl8192u: ieee80211: ieee80211_module.c - style fix
Staging: rtl8192u: ieee80211: rtl819x_HTProc.c - style fix
Staging: rtl8192u: ieee80211: rtl819x_BAProc.c - style fix
Staging: rtl8192u: ieee80211: rtl819x_HT.h - style fix
Staging: rtl8192u: ieee80211: rtl819x_BA.h - style fix
Staging: rtl8192u: ieee80211: ieee80211_wx.c - style fix
Staging: rtl8192u: ieee80211: ieee80211_tx.c - style fix
Staging: rtl8192u: ieee80211: ieee80211_rx.c - style fix
Staging: rtl8192u: ieee80211: ieee80211_crypt.h - style fix
Staging: rtl8192u: ieee80211: ieee80211_crypt.c - style fix
Staging: rtl8192u: ieee80211: ieee80211.h - style fix
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 61 +++-- .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 3 +- .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 12 +- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 3 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 60 ++--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 91 ++++--- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 71 ++--- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 290 +++++++++++---------- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 87 ++++--- drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 12 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 28 +- drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 69 ++--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 164 ++++++------ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 +- drivers/staging/rtl8192u/r8180_93cx6.c | 36 +-- drivers/staging/rtl8192u/r8190_rtl8256.c | 16 +- drivers/staging/rtl8192u/r8190_rtl8256.h | 20 +- drivers/staging/rtl8192u/r8192U.h | 39 ++- drivers/staging/rtl8192u/r8192U_core.c | 70 ++--- drivers/staging/rtl8192u/r8192U_dm.c | 175 +++++++------ drivers/staging/rtl8192u/r8192U_hw.h | 28 +- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 82 +++--- drivers/staging/rtl8192u/r819xU_cmdpkt.h | 9 +- drivers/staging/rtl8192u/r819xU_firmware.c | 6 +- drivers/staging/rtl8192u/r819xU_phy.c | 41 ++- 25 files changed, 804 insertions(+), 673 deletions(-)
Signature · 1 line
2.11.1
PATCH v2 1/25 Staging: rtl8192u: r819xU_phy.c - style fix
Fixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r819xU_phy.c | 41 +++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 14 deletions(-)
drivers/staging/rtl8192u/r819xU_phy.c +27 -14
@@ -367,7 +367,8 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,/* Firmware RF Write control. * We can not execute the scheme in the initial step. * Otherwise, RF-R/W will waste much time. -* This is only for site survey. */ +* This is only for site survey. +*/ /* 1. Read operation need not insert data. bit 0-11 */ /* 2. Write RF register address. bit 12-19 */ data |= ((offset&0xFF )<<12 );
@@ -380,7 +381,8 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,read_nic_dword (dev,QPNR , &tmp);while (tmp &0x80000000 ) {/* If FW can not finish RF-R/W for more than ?? times. -We must reset FW. */ +* We must reset FW. +*/ if (time++ <100 ) {udelay (10 );read_nic_dword (dev,QPNR , &tmp);
@@ -394,7 +396,8 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,read_nic_dword (dev,QPNR , &tmp);while (tmp &0x80000000 ) {/* If FW can not finish RF-R/W for more than ?? times. -We must reset FW. */ +* We must reset FW. +*/ if (time++ <100 ) {udelay (10 );read_nic_dword (dev,QPNR , &tmp);
@@ -426,7 +429,8 @@ static void phy_FwRFSerialWrite(struct net_device *dev,/* Firmware RF Write control. * We can not execute the scheme in the initial step. * Otherwise, RF-R/W will waste much time. -* This is only for site survey. */ +* This is only for site survey. +*/ /* 1. Set driver write bit and 12 bit data. bit 0-11 */ /* 2. Write RF register address. bit 12-19 */
@@ -442,7 +446,8 @@ static void phy_FwRFSerialWrite(struct net_device *dev,read_nic_dword (dev,QPNR , &tmp);while (tmp &0x80000000 ) {/* If FW can not finish RF-R/W for more than ?? times. -We must reset FW. */ +* We must reset FW. +*/ if (time++ <100 ) {udelay (10 );read_nic_dword (dev,QPNR , &tmp);
@@ -451,10 +456,12 @@ static void phy_FwRFSerialWrite(struct net_device *dev, } }/* 7. No matter check bit. We always force the write. -Because FW will not accept the command. */ +* Because FW will not accept the command. +*/ write_nic_dword (dev,QPNR , data);/* According to test, we must delay 20us to wait firmware -to finish RF write operation. */ +* to finish RF write operation. +*/ /* We support delay in firmware side now. */ }
@@ -723,7 +730,8 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock, WriteAddr[HW90_BLOCK_RF ], bMask12Bits, WriteData[i]);/* TODO: we should not delay for such a long time. -Ask SD3 */ +* Ask SD3 +*/ usleep_range (1000 ,1000 ); reg = rtl8192_phy_QueryRFReg(dev, eRFPath, WriteAddr[HW90_BLOCK_RF],
@@ -820,7 +828,8 @@ static void rtl8192_BB_Config_ParaFile(struct net_device *dev) }/* Check if the CCK HighPower is turned ON. -This is used to calculate PWDB. */ +* This is used to calculate PWDB. +*/ priv->bCckHighPower = (u8 )rtl8192_QueryBBReg (dev, rFPGA0_XA_HSSIParameter2,0x200 );
@@ -839,7 +848,8 @@ void rtl8192_BBConfig(struct net_device *dev)rtl8192_InitBBRFRegDef (dev);/* config BB&RF. As hardCode based initialization has not been well * implemented, so use file first. -* FIXME: should implement it for hardcode? */ +* FIXME: should implement it for hardcode? +*/ rtl8192_BB_Config_ParaFile (dev); }
@@ -1158,7 +1168,8 @@ bool rtl8192_SetRFPowerState(struct net_device *dev,switch (pHalData->eRFPowerState) {case eRfOff:/* If Rf off reason is from IPS, -LED should blink with no link */ +* LED should blink with no link +*/ if (pMgntInfo->RfOffReason ==RF_CHANGE_BY_IPS ) Adapter->HalFunc.LedControlHandler (Adapter,LED_CTL_NO_LINK );else
@@ -1168,7 +1179,7 @@ bool rtl8192_SetRFPowerState(struct net_device *dev,case eRfOn:/* Turn on RF we are still linked, which might -happen when we quickly turn off and on HW RF. +* happen when we quickly turn off and on HW RF. */ if (pMgntInfo->bMediaConnect) Adapter->HalFunc.LedControlHandler (Adapter,LED_CTL_LINK );
@@ -1263,7 +1274,8 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,if (!IsLegalChannel (priv->ieee80211, channel)) {RT_TRACE (COMP_ERR ,"set to illegal channel: %d\n" , channel);/* return true to tell upper caller function this channel -setting is finished! Or it will in while loop. */ +* setting is finished! Or it will in while loop. +*/ return true; }/* FIXME: need to check whether channel is legal or not here */
@@ -1609,7 +1621,8 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) }/* Skip over setting of J-mode in BB register here. -Default value is "None J mode". */ +* Default value is "None J mode". +*/ /* <3> Set RF related register */ switch (priv->rf_chip) {
Signature · 1 line
2.11.1
PATCH v2 2/25 Staging: rtl8192u: r819xU_firmware.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r819xU_firmware.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/r819xU_firmware.c +3 -3
@@ -10,7 +10,7 @@* Returns: * NDIS_STATUS_FAILURE - the following initialization process should be terminated * NDIS_STATUS_SUCCESS - if firmware initialization process success -**************************************************************************************************/ +**************************************************************************************************/ #include "r8192U.h" #include "r8192U_hw.h"
@@ -62,7 +62,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,/* Allocate skb buffer to contain firmware info and tx descriptor info * add 4 to avoid packet appending overflow. -* */ +*/ skb =dev_alloc_skb (USB_HWDESC_HEADER_LEN + frag_length +4 );if (!skb)return false;
@@ -277,7 +277,7 @@ bool init_firmware(struct net_device *dev)* 2. each packet segment will be put in the skb_buff packet. * 3. each skb_buff packet data content will already include the firmware info * and Tx descriptor info -* */ +*/ rt_status =fw_download_code (dev, mapped_file, file_length);if (rst_opt ==OPT_SYSTEM_RESET )release_firmware (fw_entry);
Signature · 1 line
2.11.1
PATCH v2 3/25 Staging: rtl8192u: r819xU_cmdpkt.h - style fix
In reply to Derek RobsonFixed style of block comments.
Found using checkpatch
--- drivers/staging/rtl8192u/r819xU_cmdpkt.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/r819xU_cmdpkt.h +6 -3
@@ -55,7 +55,8 @@ typedef struct tag_cmd_pkt_tx_feedback { } cmpk_txfb_t;/* 2. RX side: Interrupt status packet. It includes Beacon State, -* Beacon Timer Interrupt and other useful informations in MAC ISR Reg. */ +* Beacon Timer Interrupt and other useful informations in MAC ISR Reg. +*/ typedef struct tag_cmd_pkt_interrupt_status { u8 element_id; /* Command packet type. */ u8 length; /* Command packet length. */
@@ -83,13 +84,15 @@ typedef struct tag_cmd_pkt_set_configuration { } cmpk_set_cfg_t;/* 4. Both side : TX/RX query configuraton packet. The query structure is the -same as set configuration. */ +* same as set configuration. +*/ #define cmpk_query_cfg_t cmpk_set_cfg_t/* 5. Multi packet feedback status. */ typedef struct tag_tx_stats_feedback { /* For endian transfer --> Driver will not the same as - firmware structure. */ + * firmware structure. + */ /* DW 0 */ u16 reserve1; u8 length; /* Command packet length */
Signature · 1 line
2.11.1
PATCH v2 4/25 Staging: rtl8192u: r819xU_cmdpkt.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
---
Version #1 had a problem where I commented out valid code.
drivers/staging/rtl8192u/r819xU_cmdpkt.c | 82 ++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 30 deletions(-)
drivers/staging/rtl8192u/r819xU_cmdpkt.c +52 -30
@@ -34,7 +34,8 @@ rt_status SendTxCommandPacket(struct net_device *dev, void *pData, u32 DataLen)unsigned char *ptr_buf;/* Get TCB and local buffer from common pool. -(It is shared by CmdQ, MgntQ, and USB coalesce DataQ) */ +* (It is shared by CmdQ, MgntQ, and USB coalesce DataQ) +*/ skb =dev_alloc_skb (USB_HWDESC_HEADER_LEN + DataLen +4 );if (!skb)return RT_STATUS_FAILURE ;
@@ -76,7 +77,8 @@ rt_status SendTxCommandPacket(struct net_device *dev, void *pData, u32 DataLen)* When Who Remark * 05/12/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_count_txstatistic (struct net_device *dev,cmpk_txfb_t *pstx_fb) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -87,8 +89,9 @@ static void cmpk_count_txstatistic(struct net_device *dev, cmpk_txfb_t *pstx_fb) (pu1Byte)(&rtState));/* When RF is off, we should not count the packet for hw/sw synchronize -reason, ie. there may be a duration while sw switch is changed and -hw switch is being changed. */ +* reason, ie. there may be a duration while sw switch is changed and +* hw switch is being changed. +*/ if (rtState == eRfOff)return ;#endif
@@ -98,8 +101,9 @@ static void cmpk_count_txstatistic(struct net_device *dev, cmpk_txfb_t *pstx_fb)return ;#endif /* We can not know the packet length and transmit type: -broadcast or uni or multicast. So the relative statistics -must be collected in tx feedback info. */ +* broadcast or uni or multicast. So the relative statistics +* must be collected in tx feedback info. +*/ if (pstx_fb->tok) { priv->stats.txfeedbackok++; priv->stats.txoktotal++;
@@ -155,7 +159,8 @@ static void cmpk_count_txstatistic(struct net_device *dev, cmpk_txfb_t *pstx_fb)* When Who Remark * 05/08/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_handle_tx_feedback (struct net_device *dev,u8 *pmsg) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -165,8 +170,9 @@ static void cmpk_handle_tx_feedback(struct net_device *dev, u8 *pmsg)/* 1. Extract TX feedback info from RFD to temp structure buffer. */ /* It seems that FW use big endian(MIPS) and DRV use little endian in -windows OS. So we have to read the content byte by byte or transfer -endian type before copy the message copy. */ +* windows OS. So we have to read the content byte by byte or transfer +* endian type before copy the message copy. +*/ /* Use pointer to transfer structure memory. */ memcpy ((u8 *)&rx_tx_fb, pmsg,sizeof (cmpk_txfb_t));/* 2. Use tx feedback info to count TX statistics. */
@@ -174,7 +180,8 @@ static void cmpk_handle_tx_feedback(struct net_device *dev, u8 *pmsg)/* Comment previous method for TX statistic function. */ /* Collect info TX feedback packet to fill TCB. */ /* We can not know the packet length and transmit type: broadcast or uni -or multicast. */ +* or multicast. +*/ }static void cmdpkt_beacontimerinterrupt_819xusb (struct net_device *dev)
@@ -215,7 +222,8 @@ static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)* When Who Remark * 05/12/2008 amy Add this for rtl8192 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_handle_interrupt_status (struct net_device *dev,u8 *pmsg) {cmpk_intr_sta_t rx_intr_status;/* */
@@ -225,8 +233,9 @@ static void cmpk_handle_interrupt_status(struct net_device *dev, u8 *pmsg)/* 1. Extract TX feedback info from RFD to temp structure buffer. */ /* It seems that FW use big endian(MIPS) and DRV use little endian in -windows OS. So we have to read the content byte by byte or transfer -endian type before copy the message copy. */ +* windows OS. So we have to read the content byte by byte or transfer +* endian type before copy the message copy. +*/ rx_intr_status.length = pmsg[1 ];if (rx_intr_status.length != (sizeof (cmpk_intr_sta_t) -2 )) {DMESG ("cmpk_Handle_Interrupt_Status: wrong length!\n" );
@@ -276,15 +285,17 @@ static void cmpk_handle_interrupt_status(struct net_device *dev, u8 *pmsg)* When Who Remark * 05/12/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_handle_query_config_rx (struct net_device *dev,u8 *pmsg) {cmpk_query_cfg_t rx_query_cfg;/* 1. Extract TX feedback info from RFD to temp structure buffer. */ /* It seems that FW use big endian(MIPS) and DRV use little endian in -windows OS. So we have to read the content byte by byte or transfer -endian type before copy the message copy. */ +* windows OS. So we have to read the content byte by byte or transfer +* endian type before copy the message copy. +*/ rx_query_cfg.cfg_action = (pmsg[4 ] &0x80000000 ) >>31 ; rx_query_cfg.cfg_type = (pmsg[4 ] &0x60 ) >>5 ; rx_query_cfg.cfg_size = (pmsg[4 ] &0x18 ) >>3 ;
@@ -312,7 +323,8 @@ static void cmpk_handle_query_config_rx(struct net_device *dev, u8 *pmsg)* When Who Remark * 05/12/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_count_tx_status (struct net_device *dev,cmpk_tx_status_t *pstx_status) {
@@ -326,8 +338,9 @@ static void cmpk_count_tx_status(struct net_device *dev, (pu1Byte)(&rtState));/* When RF is off, we should not count the packet for hw/sw synchronize -reason, ie. there may be a duration while sw switch is changed and -hw switch is being changed. */ +* reason, ie. there may be a duration while sw switch is changed and +* hw switch is being changed. +*/ if (rtState == eRfOff)return ;#endif
@@ -373,7 +386,8 @@ static void cmpk_count_tx_status(struct net_device *dev,* When Who Remark * 05/12/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_handle_tx_status (struct net_device *dev,u8 *pmsg) {cmpk_tx_status_t rx_tx_sts;
@@ -398,7 +412,8 @@ static void cmpk_handle_tx_status(struct net_device *dev, u8 *pmsg)* When Who Remark * 05/12/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void cmpk_handle_tx_rate_history (struct net_device *dev,u8 *pmsg) {cmpk_tx_rahis_t *ptxrate;
@@ -412,8 +427,9 @@ static void cmpk_handle_tx_rate_history(struct net_device *dev, u8 *pmsg) (pu1Byte)(&rtState));/* When RF is off, we should not count the packet for hw/sw synchronize -reason, ie. there may be a duration while sw switch is changed and -hw switch is being changed. */ +* reason, ie. there may be a duration while sw switch is changed and +* hw switch is being changed. +*/ if (rtState == eRfOff)return ;#endif
@@ -421,7 +437,8 @@ static void cmpk_handle_tx_rate_history(struct net_device *dev, u8 *pmsg) ptemp = (u32 *)pmsg;/* Do endian transfer to word alignment(16 bits) for windows system. -You must do different endian transfer for linux and MAC OS */ +* You must do different endian transfer for linux and MAC OS +*/ for (i =0 ; i < (length/4 ); i++) {u16 temp1, temp2;
@@ -468,7 +485,8 @@ static void cmpk_handle_tx_rate_history(struct net_device *dev, u8 *pmsg)* When Who Remark * 05/06/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ u32 cmpk_message_handle_rx (struct net_device *dev,struct ieee80211_rx_stats *pstats) {
@@ -478,7 +496,8 @@ u32 cmpk_message_handle_rx(struct net_device *dev,u8 *pcmd_buff;/* 0. Check inpt arguments. If is is a command queue message or -pointer is null. */ +* pointer is null. +*/ if (pstats ==NULL )return 0 ;/* This is not a command packet. */
@@ -492,10 +511,12 @@ u32 cmpk_message_handle_rx(struct net_device *dev, element_id = pcmd_buff[0 ];/* 4. Check every received command packet content according to different -element type. Because FW may aggregate RX command packet to -minimize transmit time between DRV and FW.*/ +* element type. Because FW may aggregate RX command packet to +* minimize transmit time between DRV and FW. +*/ /* Add a counter to prevent the lock in the loop from being held too -long */ +* long +*/ while (total_length >0 && exe_cnt++ <100 ) {/* We support aggregation of different cmd in the same packet */ element_id = pcmd_buff[0 ];
@@ -523,7 +544,8 @@ u32 cmpk_message_handle_rx(struct net_device *dev,case RX_TX_PER_PKT_FEEDBACK :/* You must at lease add a switch case element here, -Otherwise, we will jump to default case. */ +* Otherwise, we will jump to default case. +*/ cmd_length =CMPK_RX_TX_FB_SIZE ;break ;
Signature · 1 line
2.11.1
PATCH v2 5/25 Staging: rtl8192u: r8192U_hw.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8192U_hw.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/staging/rtl8192u/r8192U_hw.h +14 -14
@@ -1,18 +1,18 @@/* -This is part of rtl8187 OpenSource driver. -Copyright (C) Andrea Merello 2004-2005 <[email protected]> -Released under the terms of GPL (General Public Licence) - -Parts of this driver are based on the GPL part of the -official Realtek driver. -Parts of this driver are based on the rtl8180 driver skeleton -from Patric Schenke & Andres Salomon. -Parts of this driver are based on the Intel Pro Wireless -2100 GPL driver. - -We want to thank the Authors of those projects -and the Ndiswrapper project Authors. -*/ +* This is part of rtl8187 OpenSource driver. +* Copyright (C) Andrea Merello 2004-2005 <[email protected]> +* Released under the terms of GPL (General Public Licence) +* +* Parts of this driver are based on the GPL part of the +* official Realtek driver. +* Parts of this driver are based on the rtl8180 driver skeleton +* from Patric Schenke & Andres Salomon. +* Parts of this driver are based on the Intel Pro Wireless +* 2100 GPL driver. +* +* We want to thank the Authors of those projects +* and the Ndiswrapper project Authors. +*/ /* Mariusz Matuszek added full registers definition with Realtek's name */
Signature · 1 line
2.11.1
PATCH v2 6/25 Staging: rtl8192u: r8192U_dm.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8192U_dm.c | 175 +++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 78 deletions(-)
drivers/staging/rtl8192u/r8192U_dm.c +97 -78
@@ -1,18 +1,18 @@ -/*++ -Copyright-c Realtek Semiconductor Corp. All rights reserved. - -Module Name: -r8192U_dm.c - -Abstract: -HW dynamic mechanism. - -Major Change History: -When Who What ----------- --------------- ------------------------------- -2008-05-14 amy create version 0 porting from windows code. - ---*/ +/* +* Copyright-c Realtek Semiconductor Corp. All rights reserved. +* +* Module Name: +* r8192U_dm.c +* +* Abstract: +* HW dynamic mechanism. +* +* Major Change History: +* When Who What +* ---------- --------------- ------------------------------- +* 2008-05-14 amy create version 0 porting from windows code. +* +*/ #include "r8192U.h" #include "r8192U_dm.h" #include "r8192U_hw.h"
@@ -158,20 +158,20 @@ void dm_CheckRxAggregation(struct net_device *dev)unsigned long curRxOkCnt =0 ;/* -if (pHalData->bForcedUsbRxAggr) { -if (pHalData->ForcedUsbRxAggrInfo == 0) { -if (pHalData->bCurrentRxAggrEnable) { -Adapter->HalFunc.HalUsbRxAggrHandler(Adapter, FALSE); -} -} else { -if (!pHalData->bCurrentRxAggrEnable || (pHalData->ForcedUsbRxAggrInfo != pHalData->LastUsbRxAggrInfoSetting)) { -Adapter->HalFunc.HalUsbRxAggrHandler(Adapter, TRUE); -} -} -return; -} - -*/ +* if (pHalData->bForcedUsbRxAggr) { +* if (pHalData->ForcedUsbRxAggrInfo == 0) { +* if (pHalData->bCurrentRxAggrEnable) { +* Adapter->HalFunc.HalUsbRxAggrHandler(Adapter, FALSE); +* } +* } else { +* if (!pHalData->bCurrentRxAggrEnable || (pHalData->ForcedUsbRxAggrInfo != pHalData->LastUsbRxAggrInfoSetting)) { +* Adapter->HalFunc.HalUsbRxAggrHandler(Adapter, TRUE); +* } +* } +* return; +* } +* +*/ curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;
@@ -293,7 +293,8 @@ void init_rate_adaptive(struct net_device *dev)* When Who Remark * 05/26/08 amy Create version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_check_rate_adaptive (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -347,9 +348,10 @@ static void dm_check_rate_adaptive(struct net_device *dev) ((bshort_gi_enabled) ?BIT (31 ) :0 );/* 2007/10/08 MH We support RA smooth scheme now. When it is the first -time to link with AP. We will not change upper/lower threshold. If -STA stay in high or low level, we must change two different threshold -to prevent jumping frequently. */ +* time to link with AP. We will not change upper/lower threshold. If +* STA stay in high or low level, we must change two different threshold +* to prevent jumping frequently. +*/ if (pra->ratr_state ==DM_RATR_STA_HIGH ) { HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra; LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
@@ -391,7 +393,8 @@ static void dm_check_rate_adaptive(struct net_device *dev) ping_rssi_state =1 ; }/*else -DbgPrint("TestRSSI is between the range.\n");*/ +* DbgPrint("TestRSSI is between the range.\n"); +*/ }else {/*DbgPrint("TestRSSI Recover to 0x%x\n", targetRATR);*/ ping_rssi_state =0 ;
@@ -732,8 +735,9 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) tmpCCK40Mindex =0 ; }/*DbgPrint("%ddb, tmpOFDMindex = %d, tmpCCK20Mindex = %d, tmpCCK40Mindex = %d", -((u1Byte)tmpRegA - pHalData->ThermalMeter[0]), -tmpOFDMindex, tmpCCK20Mindex, tmpCCK40Mindex);*/ +* ((u1Byte)tmpRegA - pHalData->ThermalMeter[0]), +* tmpOFDMindex, tmpCCK20Mindex, tmpCCK40Mindex); +*/ if (priv->CurrentChannelBW !=HT_CHANNEL_WIDTH_20 )/* 40M */ tmpCCKindex = tmpCCK40Mindex;else
@@ -1623,7 +1627,8 @@ static void dm_bb_initialgain_backup(struct net_device *dev)* When Who Remark * 05/29/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ void dm_change_dynamic_initgain_thresh (struct net_device *dev,u32 dm_type,u32 dm_value)
@@ -1714,7 +1719,8 @@ void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type,* When Who Remark * 05/15/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_dig_init (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -1761,7 +1767,8 @@ static void dm_dig_init(struct net_device *dev)* Revised History: * When Who Remark * 05/27/2008 amy Create Version 0 porting from windows code. -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_ctrl_initgain_byrssi (struct net_device *dev) {if (!dm_digtable.dig_enable_flag)
@@ -1804,7 +1811,8 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi( dm_digtable.cur_connect_state =DIG_DISCONNECT ;/*DbgPrint("DM_DigTable.PreConnectState = %d, DM_DigTable.CurConnectState = %d\n", -DM_DigTable.PreConnectState, DM_DigTable.CurConnectState);*/ +* DM_DigTable.PreConnectState, DM_DigTable.CurConnectState); +*/ if (dm_digtable.dbg_mode ==DM_DBG_OFF ) dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb;
@@ -1846,14 +1854,17 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(/*DbgPrint("Dig by Fw False Alarm\n");*/ /*if (DM_DigTable.Dig_State == DM_STA_DIG_OFF)*/ -/*DbgPrint("DIG Check\n\r RSSI=%d LOW=%d HIGH=%d STATE=%d", -pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh, -DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State);*/ +/* DbgPrint("DIG Check\n\r RSSI=%d LOW=%d HIGH=%d STATE=%d", +* pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh, +* DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State); +*/ /* 1. When RSSI decrease, We have to judge if it is smaller than a threshold -and then execute the step below. */ +* and then execute the step below. +*/ if (priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh) {/* 2008/02/05 MH When we execute silent reset, the DIG PHY parameters -will be reset to init value. We must prevent the condition. */ +* will be reset to init value. We must prevent the condition. +*/ if (dm_digtable.dig_state ==DM_STA_DIG_OFF && (priv->reset_count == reset_cnt)) {return ;
@@ -1881,11 +1892,11 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(*/ write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x00 );/*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(pAdapter, rOFDM0_RxDetector1, 0x40); -else if (pAdapter->HardwareType == HARDWARE_TYPE_RTL8192E) -else -PlatformEFIOWrite1Byte(pAdapter, rOFDM0_RxDetector1, 0x40); -*/ +* write_nic_byte(pAdapter, rOFDM0_RxDetector1, 0x40); +*else if (pAdapter->HardwareType == HARDWARE_TYPE_RTL8192E) +*else +*PlatformEFIOWrite1Byte(pAdapter, rOFDM0_RxDetector1, 0x40); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x42 );
@@ -1899,7 +1910,8 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( }/* 2. When RSSI increase, We have to judge if it is larger than a threshold -and then execute the step below. */ +* and then execute the step below. +*/ if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) {u8 reset_flag =0 ;
@@ -1940,12 +1952,12 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(*/ write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x20 );/* -else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); -else if (pAdapter->HardwareType == HARDWARE_TYPE_RTL8192E) -else -PlatformEFIOWrite1Byte(pAdapter, rOFDM0_RxDetector1, 0x42); -*/ +*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) +* write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); +*else if (pAdapter->HardwareType == HARDWARE_TYPE_RTL8192E) +*else +*PlatformEFIOWrite1Byte(pAdapter, rOFDM0_RxDetector1, 0x42); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x44 );
@@ -1982,7 +1994,8 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(* When Who Remark * 05/28/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_ctrl_initgain_byrssi_highpwr (struct net_device *dev) {
@@ -2011,8 +2024,8 @@ static void dm_ctrl_initgain_byrssi_highpwr(write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x10 );/*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(dev, rOFDM0_RxDetector1, 0x41); -*/ +* write_nic_byte(dev, rOFDM0_RxDetector1, 0x41); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x43 );
@@ -2028,8 +2041,8 @@ static void dm_ctrl_initgain_byrssi_highpwr(if (priv->CurrentChannelBW !=HT_CHANNEL_WIDTH_20 ) {write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x20 );/*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); -*/ +* write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x44 );
@@ -2150,8 +2163,8 @@ static void dm_pd_th(*/ write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x00 );/*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(dev, rOFDM0_RxDetector1, 0x40); -*/ +* write_nic_byte(dev, rOFDM0_RxDetector1, 0x40); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x42 ); }else if (dm_digtable.curpd_thstate ==DIG_PD_AT_NORMAL_POWER ) {
@@ -2163,8 +2176,8 @@ static void dm_pd_th(*/ write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x20 );/*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); -*/ +* write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x44 ); }else if (dm_digtable.curpd_thstate ==DIG_PD_AT_HIGH_POWER ) {
@@ -2172,8 +2185,8 @@ static void dm_pd_th(if (priv->CurrentChannelBW !=HT_CHANNEL_WIDTH_20 ) {write_nic_byte (dev, (rOFDM0_XATxAFE+3 ),0x10 );/*else if (priv->card_8192 == HARDWARE_TYPE_RTL8190P) -write_nic_byte(dev, rOFDM0_RxDetector1, 0x41); -*/ +* write_nic_byte(dev, rOFDM0_RxDetector1, 0x41); +*/ }else write_nic_byte (dev, rOFDM0_RxDetector1,0x43 ); }
@@ -2366,10 +2379,10 @@ static void dm_ctstoself(struct net_device *dev)return ; }/* -1. Uplink -2. Linksys350/Linksys300N -3. <50 disable, >55 enable -*/ +* 1. Uplink +* 2. Linksys350/Linksys300N +* 3. <50 disable, >55 enable +*/ if (pHTInfo->IOTPeer ==HT_IOT_PEER_BROADCOM ) { curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;
@@ -2401,7 +2414,8 @@ static void dm_ctstoself(struct net_device *dev)* When Who Remark * 05/28/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_check_pbc_gpio (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -2437,7 +2451,8 @@ static void dm_check_pbc_gpio(struct net_device *dev)* When Who Remark * 01/30/2008 MHC Create Version 0. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ void dm_rf_pathcheck_workitemcallback (struct work_struct *work) {struct delayed_work *dwork =to_delayed_work (work);
@@ -2447,7 +2462,8 @@ void dm_rf_pathcheck_workitemcallback(struct work_struct *work)u8 rfpath =0 , i;/* 2008/01/30 MH After discussing with SD3 Jerry, 0xc04/0xd04 register will -always be the same. We only read 0xc04 now. */ +* always be the same. We only read 0xc04 now. +*/ read_nic_byte (dev,0xc04 , &rfpath);/* Check Bit 0-3, it means if RF A-D is enabled. */
@@ -2694,7 +2710,8 @@ static void dm_rxpath_sel_byrssi(struct net_device *dev)* When Who Remark * 05/28/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_check_rx_path_selection (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -3017,7 +3034,8 @@ void dm_check_fsync(struct net_device *dev)* When Who Remark * 05/29/2008 amy Create Version 0 porting from windows code. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ void dm_shadow_init (struct net_device *dev) {u8 page;
@@ -3056,7 +3074,8 @@ void dm_shadow_init(struct net_device *dev)* When Who Remark * 03/06/2008 Jacken Create Version 0. * -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static void dm_init_dynamic_txpower (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
Signature · 1 line
2.11.1
PATCH v2 7/25 Staging: rtl8192u: r8192U_core.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8192U_core.c | 70 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +35 -35
@@ -503,8 +503,7 @@ static void watch_dog_timer_callback(unsigned long data);/**************************************************************************** * -----------------------------PROCFS STUFF------------------------- -***************************************************************************** -*/ +****************************************************************************/ static struct proc_dir_entry *rtl8192_proc;
@@ -715,8 +714,8 @@ static void rtl8192_proc_remove_one(struct net_device *dev) }/**************************************************************************** ------------------------------MISC STUFF------------------------- -*****************************************************************************/ +* -----------------------------MISC STUFF------------------------- +*****************************************************************************/ short check_nic_enough_desc (struct net_device *dev,int queue_index) {
@@ -1328,7 +1327,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)* 2006.10.30 by Emily * * \param QUEUEID Software Queue -*/ +*/ static u8 MapHwQueueToFirmwareQueue (u8 QueueID) {u8 QueueSelect =0x0 ;/* default set to */
@@ -1499,7 +1498,7 @@ static void tx_zero_isr(struct urb *tx_urb)* The tx procedure is just as following, * skb->cb will contain all the following information, * priority, morefrag, rate, &dev. -* */ +*/ short rtl8192_tx (struct net_device *dev,struct sk_buff *skb) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -1840,8 +1839,8 @@ static void rtl8192_update_beacon(struct work_struct *work) }/* -* background support to run QoS activate functionality -*/ +* background support to run QoS activate functionality +*/ static int WDCAPARA_ADD [] = {EDCAPARA_BE ,EDCAPARA_BK ,EDCAPARA_VI ,EDCAPARA_VO };static void rtl8192_qos_activate (struct work_struct *work)
@@ -1946,10 +1945,10 @@ static int rtl8192_handle_beacon(struct net_device *dev, }/* -* handling the beaconing responses. if we get different QoS setting -* off the network from the associated setting, adjust the QoS -* setting -*/ +* handling the beaconing responses. if we get different QoS setting +* off the network from the associated setting, adjust the QoS +* setting +*/ static int rtl8192_qos_association_resp (struct r8192_priv *priv,struct ieee80211_network *network) {
@@ -3045,8 +3044,8 @@ static bool rtl8192_adapter_start(struct net_device *dev)* be used to stop beacon transmission */ /*************************************************************************** --------------------------------NET STUFF--------------------------- -***************************************************************************/ +* -------------------------------NET STUFF--------------------------- +***************************************************************************/ static struct net_device_stats *rtl8192_stats (struct net_device *dev) {
@@ -3074,9 +3073,9 @@ static bool HalTxCheckStuck819xUsb(struct net_device *dev) }/* -* <Assumption: RT_TX_SPINLOCK is acquired.> -* First added: 2006.11.19 by emily -*/ +* <Assumption: RT_TX_SPINLOCK is acquired.> +* First added: 2006.11.19 by emily +*/ static RESET_TYPE TxCheckStuck (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);
@@ -4156,7 +4155,8 @@ static void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,* Output: NONE * * Return: 0-100 percentage -*---------------------------------------------------------------------------*/ +*--------------------------------------------------------------------------- +*/ static u8 rtl819x_query_rxpwrpercentage (s8 antpower) {if ((antpower <=-100 ) || (antpower >=20 ))
@@ -4529,19 +4529,19 @@ static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb, }/** -* Function: UpdateReceivedRateHistogramStatistics -* Overview: Record the received data rate -* -* Input: -* struct net_device *dev -* struct ieee80211_rx_stats *stats -* -* Output: -* -* (priv->stats.ReceivedRateHistogram[] is updated) -* Return: -* None -*/ +* Function: UpdateReceivedRateHistogramStatistics +* Overview: Record the received data rate +* +* Input: +* struct net_device *dev +* struct ieee80211_rx_stats *stats +* +* Output: +* +* (priv->stats.ReceivedRateHistogram[] is updated) +* Return: +* None +*/ static void UpdateReceivedRateHistogramStatistics8190 (struct net_device *dev,struct ieee80211_rx_stats *stats)
@@ -4935,8 +4935,8 @@ static const struct net_device_ops rtl8192_netdev_ops = {/**************************************************************************** ----------------------------- USB_STUFF--------------------------- -*****************************************************************************/ +* ---------------------------- USB_STUFF--------------------------- +*****************************************************************************/ static int rtl8192_usb_probe (struct usb_interface *intf,const struct usb_device_id *id)
@@ -5177,7 +5177,7 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, }/*************************************************************************** -------------------- module init / exit stubs ---------------- -****************************************************************************/ +* ------------------- module init / exit stubs ---------------- +****************************************************************************/ module_init (rtl8192_usb_module_init);module_exit (rtl8192_usb_module_exit);
Signature · 1 line
2.11.1
PATCH v2 8/25 Staging: rtl8192u: r8192U.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8192U.h | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-)
drivers/staging/rtl8192u/r8192U.h +26 -13
@@ -626,7 +626,8 @@ typedef struct Stats {long signal_quality;long last_signal_strength_inpercent;/* Correct smoothed ss in dbm, only used in driver -* to report real power now */ +* to report real power now +*/ long recv_signal_power;u8 rx_rssi_percentage[4 ];u8 rx_evm_percentage[2 ];
@@ -672,32 +673,40 @@ typedef struct _BB_REGISTER_DEFINITION {/* Tx gain stage: 0x80c~0x80f [4 bytes] */ u32 rfTxGainStage;/* wire parameter control1: 0x820~0x823, 0x828~0x82b, -* 0x830~0x833, 0x838~0x83b [16 bytes] */ +* 0x830~0x833, 0x838~0x83b [16 bytes] +*/ u32 rfHSSIPara1;/* wire parameter control2: 0x824~0x827, 0x82c~0x82f, -* 0x834~0x837, 0x83c~0x83f [16 bytes] */ +* 0x834~0x837, 0x83c~0x83f [16 bytes] +*/ u32 rfHSSIPara2;/* Tx Rx antenna control: 0x858~0x85f [16 bytes] */ u32 rfSwitchControl;/* AGC parameter control1: 0xc50~0xc53, 0xc58~0xc5b, -* 0xc60~0xc63, 0xc68~0xc6b [16 bytes] */ +* 0xc60~0xc63, 0xc68~0xc6b [16 bytes] +*/ u32 rfAGCControl1;/* AGC parameter control2: 0xc54~0xc57, 0xc5c~0xc5f, -* 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] */ +* 0xc64~0xc67, 0xc6c~0xc6f [16 bytes] +*/ u32 rfAGCControl2;/* OFDM Rx IQ imbalance matrix: 0xc14~0xc17, 0xc1c~0xc1f, -* 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] */ +* 0xc24~0xc27, 0xc2c~0xc2f [16 bytes] +*/ u32 rfRxIQImbalance;/* Rx IQ DC offset and Rx digital filter, Rx DC notch filter: * 0xc10~0xc13, 0xc18~0xc1b, -* 0xc20~0xc23, 0xc28~0xc2b [16 bytes] */ +* 0xc20~0xc23, 0xc28~0xc2b [16 bytes] +*/ u32 rfRxAFE;/* OFDM Tx IQ imbalance matrix: 0xc80~0xc83, 0xc88~0xc8b, -* 0xc90~0xc93, 0xc98~0xc9b [16 bytes] */ +* 0xc90~0xc93, 0xc98~0xc9b [16 bytes] +*/ u32 rfTxIQImbalance;/* Tx IQ DC Offset and Tx DFIR type: * 0xc84~0xc87, 0xc8c~0xc8f, -* 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] */ +* 0xc94~0xc97, 0xc9c~0xc9f [16 bytes] +*/ u32 rfTxAFE;/* LSSI RF readback data: 0x8a0~0x8af [16 bytes] */ u32 rfLSSIReadBack;
@@ -776,7 +785,8 @@ typedef struct _phy_ofdm_rx_status_report_819xusb { typedef struct _phy_cck_rx_status_report_819xusb { /* For CCK rate descriptor. This is an unsigned 8:1 variable. * LSB bit presend 0.5. And MSB 7 bts presend a signed value. - * Range from -64~+63.5. */ + * Range from -64~+63.5. + */ u8 adc_pwdb_X[4]; u8 sq_rpt; u8 cck_agc_rpt;
@@ -991,7 +1001,8 @@ typedef struct r8192_priv {/* Control channel sub-carrier */ u8 nCur40MhzPrimeSC;/* Test for shorten RF configuration time. -* We save RF reg0 in this variable to reduce RF reading. */ +* We save RF reg0 in this variable to reduce RF reading. +*/ u32 RfReg0Value[4 ];u8 NumTotalRFPath;bool brfpath_rxenable[4 ];
@@ -1009,11 +1020,13 @@ typedef struct r8192_priv {bool bstore_last_dtpflag;/* Define to discriminate on High power State or -* on sitesurvey to change Tx gain index */ +* on sitesurvey to change Tx gain index +*/ bool bstart_txctrl_bydtp;rate_adaptive rate_adaptive;/* TX power tracking -* OPEN/CLOSE TX POWER TRACKING */ +* OPEN/CLOSE TX POWER TRACKING +*/ txbbgain_struct txbbgain_table[TxBBGainTableLength];u8 txpower_count;/* For 6 sec do tracking again */ bool btxpower_trackingInit;
Signature · 1 line
2.11.1
PATCH v2 9/25 Staging: rtl8192u: r8190_rtl8256.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8190_rtl8256.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8192u/r8190_rtl8256.h +10 -10
@@ -1,14 +1,14 @@/* -This is part of the rtl8180-sa2400 driver -released under the GPL (See file COPYING for details). -Copyright (c) 2005 Andrea Merello <[email protected]> - -This files contains programming code for the rtl8256 -radio frontend. - -*Many* thanks to Realtek Corp. for their great support! - -*/ +* This is part of the rtl8180-sa2400 driver +* released under the GPL (See file COPYING for details). +* Copyright (c) 2005 Andrea Merello <[email protected]> +* +* +* This files contains programming code for the rtl8256 +* radio frontend. +* +* *Many* thanks to Realtek Corp. for their great support! +*/ #ifndef RTL8225H #define RTL8225H
Signature · 1 line
2.11.1
PATCH v2 10/25 Staging: rtl8192u: r8190_rtl8256.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8190_rtl8256.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8192u/r8190_rtl8256.c +8 -8
@@ -1,12 +1,12 @@/* -* This is part of the rtl8192 driver -* released under the GPL (See file COPYING for details). -* -* This files contains programming code for the rtl8256 -* radio frontend. -* -* *Many* thanks to Realtek Corp. for their great support! -*/ +* This is part of the rtl8192 driver +* released under the GPL (See file COPYING for details). +* +* This files contains programming code for the rtl8256 +* radio frontend. +* +* *Many* thanks to Realtek Corp. for their great support! +*/ #include "r8192U.h" #include "r8192U_hw.h"
Signature · 1 line
2.11.1
PATCH v2 11/25 Staging: rtl8192u: r8180_93cx6.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/r8180_93cx6.c | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rtl8192u/r8180_93cx6.c +18 -18
@@ -1,22 +1,22 @@/* -This files contains card eeprom (93c46 or 93c56) programming routines, -memory is addressed by 16 bits words. - -This is part of rtl8180 OpenSource driver. -Copyright (C) Andrea Merello 2004 <[email protected]> -Released under the terms of GPL (General Public Licence) - -Parts of this driver are based on the GPL part of the -official realtek driver. - -Parts of this driver are based on the rtl8180 driver skeleton -from Patric Schenke & Andres Salomon. - -Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver. - -We want to thank the Authors of those projects and the Ndiswrapper -project Authors. -*/ +* This files contains card eeprom (93c46 or 93c56) programming routines, +* memory is addressed by 16 bits words. +* +* This is part of rtl8180 OpenSource driver. +* Copyright (C) Andrea Merello 2004 <[email protected]> +* Released under the terms of GPL (General Public Licence) +* +* Parts of this driver are based on the GPL part of the +* official realtek driver. +* +* Parts of this driver are based on the rtl8180 driver skeleton +* from Patric Schenke & Andres Salomon. +* +* Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver. +* +* We want to thank the Authors of those projects and the Ndiswrapper +* project Authors. +*/ #include "r8180_93cx6.h"
Signature · 1 line
2.11.1
PATCH v2 12/25 Staging: rtl8192u: ieee80211: ieee80211_crypt_wep.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +2 -1
@@ -109,7 +109,8 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)/* Fluhrer, Mantin, and Shamir have reported weaknesses in the key * scheduling algorithm of RC4. At least IVs (KeyByte + 3, 0xff, N) -* can be used to speedup attacks, so avoid using them. */ +* can be used to speedup attacks, so avoid using them. +*/ if ((wep->iv &0xff00 ) ==0xff00 ) {u8 B = (wep->iv >>16 ) &0xff ;
Signature · 1 line
2.11.1
PATCH v2 13/25 Staging: rtl8192u: ieee80211: rtl819x_TSProc.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +2 -2
@@ -21,7 +21,7 @@ static void TsInactTimeout(unsigned long data)* input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer * return: NULL * notice: -********************************************************************************************************************/ +********************************************************************************************************************/ static void RxPktPendingTimeout (unsigned long data) {PRX_TS_RECORD pRxTs = (PRX_TS_RECORD )data;
@@ -95,7 +95,7 @@ static void RxPktPendingTimeout(unsigned long data)* input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer * return: NULL * notice: -********************************************************************************************************************/ +********************************************************************************************************************/ static void TsAddBaProcess (unsigned long data) {PTX_TS_RECORD pTxTs = (PTX_TS_RECORD )data;
Signature · 1 line
2.11.1
PATCH v2 14/25 Staging: rtl8192u: ieee80211: ieee80211_softmac.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 71 +++++++++++----------- 1 file changed, 36 insertions(+), 35 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +36 -35
@@ -203,14 +203,14 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee) }/* -// Data rate of ProbeReq is already decided. Annie, 2005-03-31 -if( pMgntInfo->bScanInProgress || (pMgntInfo->bDualModeScanStep!=0) ) -{ -if(pMgntInfo->dot11CurrentWirelessMode==WIRELESS_MODE_A) -rate = 0x0c; -else -rate = 0x02; -} +* //Data rate of ProbeReq is already decided. Annie, 2005-03-31 +* if( pMgntInfo->bScanInProgress || (pMgntInfo->bDualModeScanStep!=0) ) +* { +* if(pMgntInfo->dot11CurrentWirelessMode==WIRELESS_MODE_A) +* rate = 0x0c; +* else +* rate = 0x02; +* } */ return rate; }
@@ -270,10 +270,10 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieeeif (!ieee->check_nic_enough_desc (ieee->dev,tcb_desc->queue_index)||\ (skb_queue_len (&ieee->skb_waitQ[tcb_desc->queue_index]) !=0 )||\ (ieee->queue_stop) ) { -/* insert the skb packet to the management queue */ -/* as for the completion function, it does not need +/* insert the skb packet to the management queue +* as for the completion function, it does not need * to check it any more. -* */ +*/ printk ("%s():insert to waitqueue!\n" ,__func__);skb_queue_tail (&ieee->skb_waitQ[tcb_desc->queue_index], skb); }else {
@@ -1455,8 +1455,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee (!apset && ssidset && ssidbroad && ssidmatch) ){/* if the essid is hidden replace it with the -* essid provided by the user. -*/ +* essid provided by the user. +*/ if (!ssidbroad) {strncpy (tmp_ssid, ieee->current_network.ssid,IW_ESSID_MAX_SIZE ); tmp_ssid_len = ieee->current_network.ssid_len;
@@ -1726,11 +1726,10 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,int timeout = ieee->ps_timeout;u8 dtim;/*if(ieee->ps == IEEE80211_PS_DISABLED || -ieee->iw_mode != IW_MODE_INFRA || -ieee->state != IEEE80211_LINKED) - -return 0; -*/ +* ieee->iw_mode != IW_MODE_INFRA || +* ieee->state != IEEE80211_LINKED) +* return 0; +*/ dtim = ieee->current_network.dtim_data;if (!(dtim &IEEE80211_DTIM_VALID ))return 0 ;
@@ -2092,8 +2091,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,case IEEE80211_STYPE_DISASSOC :case IEEE80211_STYPE_DEAUTH :/* FIXME for now repeat all the association procedure -* both for disassociation and deauthentication -*/ +* both for disassociation and deauthentication +*/ if ((ieee->softmac_features &IEEE_SOFTMAC_ASSOCIATE ) && ieee->state ==IEEE80211_LINKED && ieee->iw_mode ==IW_MODE_INFRA ){
@@ -2168,7 +2167,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device */* insert the skb packet to the wait queue */ /* 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); #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
@@ -2517,18 +2516,18 @@ static void ieee80211_associate_retry_wq(struct work_struct *work) goto exit;/* until we do not set the state to IEEE80211_NOLINK -* there are no possibility to have someone else trying -* to start an association procedure (we get here with -* ieee->state = IEEE80211_ASSOCIATING). -* When we set the state to IEEE80211_NOLINK it is possible -* that the RX path run an attempt to associate, but -* both ieee80211_softmac_check_all_nets and the -* RX path works with ieee->lock held so there are no -* problems. If we are still disassociated then start a scan. -* the lock here is necessary to ensure no one try to start -* an association procedure when we have just checked the -* state and we are going to start the scan. -*/ +* there are no possibility to have someone else trying +* to start an association procedure (we get here with +* ieee->state = IEEE80211_ASSOCIATING). +* When we set the state to IEEE80211_NOLINK it is possible +* that the RX path run an attempt to associate, but +* both ieee80211_softmac_check_all_nets and the +* RX path works with ieee->lock held so there are no +* problems. If we are still disassociated then start a scan. +* the lock here is necessary to ensure no one try to start +* an association procedure when we have just checked the +* state and we are going to start the scan. +*/ ieee->state =IEEE80211_NOLINK ;ieee80211_softmac_check_all_nets (ieee);
@@ -2765,7 +2764,8 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee)static int ieee80211_wpa_enable (struct ieee80211_device *ieee,int value) {/* This is called when wpa_supplicant loads and closes the driver -* interface. */ +* interface. +*/ printk ("%s WPA\n" , value ?"enabling" :"disabling" ); ieee->wpa_enabled = value;return 0 ;
@@ -3082,7 +3082,8 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,* generate new IEEE 802.11 authentication which may end up in looping * with IEEE 802.1X. If your hardware requires a reset after WEP * configuration (for example... Prism2), implement the reset_port in -* the callbacks structures used to initialize the 802.11 stack. */ +* the callbacks structures used to initialize the 802.11 stack. +*/ if (ieee->reset_on_keychange && ieee->iw_mode != IW_MODE_INFRA && ieee->reset_port &&
Signature · 1 line
2.11.1
PATCH v2 15/25 Staging: rtl8192u: ieee80211: ieee80211_module.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 60 +++++++++++----------- 1 file changed, 30 insertions(+), 30 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +30 -30
@@ -1,34 +1,34 @@/******************************************************************************* - -Copyright(c) 2004 Intel Corporation. All rights reserved. - -Portions of this file are based on the WEP enablement code provided by the -Host AP project hostap-drivers v0.1.3 -Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -<[email protected]> -Copyright (c) 2002-2003, Jouni Malinen <[email protected]> - -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 <[email protected]> -Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 - -*******************************************************************************/ +* +* Copyright(c) 2004 Intel Corporation. All rights reserved. +* +* Portions of this file are based on the WEP enablement code provided by the +* Host AP project hostap-drivers v0.1.3 +* Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen +* <[email protected]> +* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> +* +* 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 <[email protected]> +* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 +* +*******************************************************************************/ #include <linux/compiler.h> /* #include <linux/config.h> */
Signature · 1 line
2.11.1
PATCH v2 16/25 Staging: rtl8192u: ieee80211: rtl819x_HTProc.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 164 ++++++++++----------- 1 file changed, 82 insertions(+), 82 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +82 -82
@@ -217,8 +217,8 @@ void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString) }/* -* Return: true if station in half n mode and AP supports 40 bw -*/ +* Return: true if station in half n mode and AP supports 40 bw +*/ static bool IsHTHalfNmode40Bandwidth (struct ieee80211_device *ieee) {bool retValue = false;
@@ -412,7 +412,7 @@ static void HTIOTPeerDetermine(struct ieee80211_device *ieee)* u8 * PeerMacAddr * output: none * return: return 1 if driver should declare MCS13 only(otherwise return 0) -* *****************************************************************************************************************/ +******************************************************************************************************************/ static u8 HTIOTActIsDisableMCS14 (struct ieee80211_device *ieee,u8 *PeerMacAddr) {return 0 ;
@@ -420,17 +420,17 @@ static u8 HTIOTActIsDisableMCS14(struct ieee80211_device *ieee, u8 *PeerMacAddr)/** -* Function: HTIOTActIsDisableMCS15 -* -* Overview: Check whether driver should declare capability of receiving MCS15 -* -* Input: -* PADAPTER Adapter, -* -* Output: None -* Return: true if driver should disable MCS15 -* 2008.04.15 Emily -*/ +* Function: HTIOTActIsDisableMCS15 +* +* Overview: Check whether driver should declare capability of receiving MCS15 +* +* Input: +* PADAPTER Adapter, +* +* Output: None +* Return: true if driver should disable MCS15 +* 2008.04.15 Emily +*/ static bool HTIOTActIsDisableMCS15 (struct ieee80211_device *ieee) {bool retValue = false;
@@ -457,17 +457,17 @@ static bool HTIOTActIsDisableMCS15(struct ieee80211_device *ieee) }/** -* Function: HTIOTActIsDisableMCSTwoSpatialStream -* -* Overview: Check whether driver should declare capability of receiving All 2 ss packets -* -* Input: -* PADAPTER Adapter, -* -* Output: None -* Return: true if driver should disable all two spatial stream packet -* 2008.04.21 Emily -*/ +* Function: HTIOTActIsDisableMCSTwoSpatialStream +* +* Overview: Check whether driver should declare capability of receiving All 2 ss packets +* +* Input: +* PADAPTER Adapter, +* +* Output: None +* Return: true if driver should disable all two spatial stream packet +* 2008.04.21 Emily +*/ static bool HTIOTActIsDisableMCSTwoSpatialStream (struct ieee80211_device *ieee,u8 *PeerMacAddr) {
@@ -483,7 +483,7 @@ static bool HTIOTActIsDisableMCSTwoSpatialStream(struct ieee80211_device *ieee,* u8* PeerMacAddr * output: none * return: return 1 if driver should disable EDCA turbo mode(otherwise return 0) -* *****************************************************************************************************************/ +******************************************************************************************************************/ static u8 HTIOTActIsDisableEDCATurbo (struct ieee80211_device *ieee,u8 *PeerMacAddr) {/* default enable EDCA Turbo mode. */
@@ -495,7 +495,7 @@ static u8 HTIOTActIsDisableEDCATurbo(struct ieee80211_device *ieee,* input: struct ieee80211_network *network //current network we live * output: none * return: return 1 if true -* *****************************************************************************************************************/ +*****************************************************************************************************************/ static u8 HTIOTActIsMgntUseCCK6M (struct ieee80211_network *network) {u8 retValue =0 ;
@@ -542,7 +542,7 @@ void HTResetIOTSetting(* output: none * return: none * notice: posHTCap can't be null and should be initialized before. -* *****************************************************************************************************************/ +******************************************************************************************************************/ void HTConstructCapabilityElement (struct ieee80211_device *ieee,u8 *posHTCap,u8 *len,u8 IsEncrypt) {PRT_HIGH_THROUGHPUT pHT = ieee->pHTInfo;
@@ -660,7 +660,7 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u* output: none * return: none * notice: posHTCap can't be null and be initialized before. only AP and IBSS sta should do this -* *****************************************************************************************************************/ +******************************************************************************************************************/ void HTConstructInfoElement (struct ieee80211_device *ieee,u8 *posHTInfo,u8 *len,u8 IsEncrypt) {PRT_HIGH_THROUGHPUT pHT = ieee->pHTInfo;
@@ -707,23 +707,23 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *le }/* -* According to experiment, Realtek AP to STA (based on rtl8190) may achieve best performance -* if both STA and AP set limitation of aggregation size to 32K, that is, set AMPDU density to 2 -* (Ref: IEEE 11n specification). However, if Realtek STA associates to other AP, STA should set -* limitation of aggregation size to 8K, otherwise, performance of traffic stream from STA to AP -* will be much less than the traffic stream from AP to STA if both of the stream runs concurrently -* at the same time. -* -* Frame Format -* Element ID Length OUI Type1 Reserved -* 1 byte 1 byte 3 bytes 1 byte 1 byte -* -* OUI = 0x00, 0xe0, 0x4c, -* Type = 0x02 -* Reserved = 0x00 -* -* 2007.8.21 by Emily -*/ +* According to experiment, Realtek AP to STA (based on rtl8190) may achieve best performance +* if both STA and AP set limitation of aggregation size to 32K, that is, set AMPDU density to 2 +* (Ref: IEEE 11n specification). However, if Realtek STA associates to other AP, STA should set +* limitation of aggregation size to 8K, otherwise, performance of traffic stream from STA to AP +* will be much less than the traffic stream from AP to STA if both of the stream runs concurrently +* at the same time. +* +* Frame Format +* Element ID Length OUI Type1 Reserved +* 1 byte 1 byte 3 bytes 1 byte 1 byte +* +* OUI = 0x00, 0xe0, 0x4c, +* Type = 0x02 +* Reserved = 0x00 +* +* 2007.8.21 by Emily +*/ /******************************************************************************************************************** *function: Construct Information Element in Beacon... in RT2RT condition * input: struct ieee80211_device* ieee
@@ -732,7 +732,7 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *le* output: none * return: none * notice: -* *****************************************************************************************************************/ +******************************************************************************************************************/ void HTConstructRT2RTAggElement (struct ieee80211_device *ieee,u8 *posRT2RTAgg,u8 *len) {if (posRT2RTAgg ==NULL ) {
@@ -745,7 +745,7 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg, *posRT2RTAgg++ =0x4c ; *posRT2RTAgg++ =0x02 ; *posRT2RTAgg++ =0x01 ; - *posRT2RTAgg =0x10 ;//*posRT2RTAgg = 0x02; + *posRT2RTAgg =0x10 ;// *posRT2RTAgg = 0x02; if (ieee->bSupportRemoteWakeUp) { *posRT2RTAgg |=0x08 ;//RT_HT_CAP_USE_WOW;
@@ -756,16 +756,16 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg,#ifdef TODO #if (HAL_CODE_BASE ==RTL8192 &&DEV_BUS_TYPE ==USB_INTERFACE )/* -//Emily. If it is required to Ask Realtek AP to send AMPDU during AES mode, enable this -section of code. -if(IS_UNDER_11N_AES_MODE(Adapter)) -{ -posRT2RTAgg->Octet[5] |=RT_HT_CAP_USE_AMPDU; -}else -{ -posRT2RTAgg->Octet[5] &= 0xfb; -} -*/ +* Emily. If it is required to Ask Realtek AP to send AMPDU during AES mode, enable this +* section of code. +* if(IS_UNDER_11N_AES_MODE(Adapter)) +* { +* posRT2RTAgg->Octet[5] |=RT_HT_CAP_USE_AMPDU; +* } else +* { +* posRT2RTAgg->Octet[5] &= 0xfb; +* } +*/ #else // Do Nothing
@@ -786,7 +786,7 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg,* u8* pOperateMCS //A pointer to MCS rate bitmap * return: always we return true * notice: -* *****************************************************************************************************************/ +******************************************************************************************************************/ static u8 HT_PickMCSRate (struct ieee80211_device *ieee,u8 *pOperateMCS) {u8 i;
@@ -832,16 +832,16 @@ static u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS) }/* -* Description: -* This function will get the highest speed rate in input MCS set. -* -* /param Adapter Pionter to Adapter entity -* pMCSRateSet Pointer to MCS rate bitmap -* pMCSFilter Pointer to MCS rate filter -* -* /return Highest MCS rate included in pMCSRateSet and filtered by pMCSFilter. -* -*/ +* Description: +* This function will get the highest speed rate in input MCS set. +* +* /param Adapter Pionter to Adapter entity +* pMCSRateSet Pointer to MCS rate bitmap +* pMCSFilter Pointer to MCS rate filter +* +* /return Highest MCS rate included in pMCSRateSet and filtered by pMCSFilter. +* +*/ /******************************************************************************************************************** *function: This function will get the highest speed rate in input MCS set. * input: struct ieee80211_device* ieee
@@ -849,7 +849,7 @@ static u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS)* u8* pMCSFilter //Pointer to MCS rate filter * return: Highest MCS rate included in pMCSRateSet and filtered by pMCSFilter * notice: -* *****************************************************************************************************************/ +******************************************************************************************************************/ u8 HTGetHighestMCSRate (struct ieee80211_device *ieee,u8 *pMCSRateSet,u8 *pMCSFilter) {u8 i, j;
@@ -894,14 +894,14 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSF/* -** -**1.Filter our operation rate set with AP's rate set -**2.shall reference channel bandwidth, STBC, Antenna number -**3.generate rate adative table for firmware -**David 20060906 -** -** \pHTSupportedCap: the connected STA's supported rate Capability element -*/ +* +*1.Filter our operation rate set with AP's rate set +*2.shall reference channel bandwidth, STBC, Antenna number +*3.generate rate adative table for firmware +*David 20060906 +* +* \pHTSupportedCap: the connected STA's supported rate Capability element +*/ static u8 HTFilterMCSRate (struct ieee80211_device *ieee,u8 *pSupportMCS,u8 *pOperateMCS) {
@@ -1117,7 +1117,7 @@ void HTSetConnectBwModeCallback(struct ieee80211_device *ieee);* output: none * return: none * notice: This function is called when * (1) MPInitialization Phase * (2) Receiving of Deauthentication from AP -********************************************************************************************************************/ +********************************************************************************************************************/ // TODO: Should this funciton be called when receiving of Disassociation? void HTInitializeHTInfo (struct ieee80211_device *ieee) {
@@ -1186,7 +1186,7 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee)* output: none * return: none * notice: This function is called when initialize network structure -********************************************************************************************************************/ +********************************************************************************************************************/ void HTInitializeBssDesc (PBSS_HT pBssHT) {
@@ -1208,7 +1208,7 @@ void HTInitializeBssDesc(PBSS_HT pBssHT)* output: none * return: none * notice: This function should ONLY be called before association -********************************************************************************************************************/ +********************************************************************************************************************/ void HTResetSelfAndSavePeerSetting (struct ieee80211_device *ieee,struct ieee80211_network *pNetwork) {PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
@@ -1320,7 +1320,7 @@ EXPORT_SYMBOL(HTUpdateSelfAndPeerSetting);* output: none * return: return true if HT control field exists(false otherwise) * notice: -********************************************************************************************************************/ +********************************************************************************************************************/ u8 HTCCheck (struct ieee80211_device *ieee,u8 *pFrame) {if (ieee->pHTInfo->bCurrentHTSupport)
Signature · 1 line
2.11.1
PATCH v2 17/25 Staging: rtl8192u: ieee80211: rtl819x_BAProc.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +14 -14
@@ -14,7 +14,7 @@* input: PBA_RECORD pBA //BA entry to be enabled * u16 Time //indicate time delay. * output: none -********************************************************************************************************************/ +********************************************************************************************************************/ static void ActivateBAEntry (struct ieee80211_device *ieee,PBA_RECORD pBA,u16 Time) { pBA->bValid = true;
@@ -26,7 +26,7 @@ static void ActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA, u16 T*function: deactivate BA entry, including its timer. * input: PBA_RECORD pBA //BA entry to be disabled * output: none -********************************************************************************************************************/ +********************************************************************************************************************/ static void DeActivateBAEntry (struct ieee80211_device *ieee,PBA_RECORD pBA) { pBA->bValid = false;
@@ -38,7 +38,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)* PTX_TS_RECORD pTxTs //Tx Ts which is to deactivate BA entry. * output: none * notice: As PTX_TS_RECORD structure will be defined in QOS, so wait to be merged. //FIXME -********************************************************************************************************************/ +********************************************************************************************************************/ static u8 TxTsDeleteBA (struct ieee80211_device *ieee,PTX_TS_RECORD pTxTs) {PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord;//These two BA entries must exist in TS structure
@@ -68,7 +68,7 @@ static u8 TxTsDeleteBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTxTs)* PRX_TS_RECORD pRxTs //Rx Ts which is to deactivate BA entry. * output: none * notice: As PRX_TS_RECORD structure will be defined in QOS, so wait to be merged. //FIXME, same with above -********************************************************************************************************************/ +********************************************************************************************************************/ static u8 RxTsDeleteBA (struct ieee80211_device *ieee,PRX_TS_RECORD pRxTs) {PBA_RECORD pBa = &pRxTs->RxAdmittedBARecord;
@@ -88,7 +88,7 @@ static u8 RxTsDeleteBA(struct ieee80211_device *ieee, PRX_TS_RECORD pRxTs)* input: * PBA_RECORD pBA //entry to be reset * output: none -********************************************************************************************************************/ +********************************************************************************************************************/ void ResetBaEntry (PBA_RECORD pBA) { pBA->bValid = false;
@@ -106,7 +106,7 @@ void ResetBaEntry(PBA_RECORD pBA)* u8 type //indicate whether it's RSP(ACT_ADDBARSP) ow REQ(ACT_ADDBAREQ) * output: none * return: sk_buff* skb //return constructed skb to xmit -*******************************************************************************************************************************/ +*******************************************************************************************************************************/ static struct sk_buff *ieee80211_ADDBA (struct ieee80211_device *ieee,u8 *Dst,PBA_RECORD pBA,u16 StatusCode,u8 type) {struct sk_buff *skb =NULL ;
@@ -184,7 +184,7 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, P* u16 ReasonCode //status code. * output: none * return: sk_buff* skb //return constructed skb to xmit -********************************************************************************************************************/ +********************************************************************************************************************/ static struct sk_buff *ieee80211_DELBA( struct ieee80211_device *ieee, u8 *dst,
@@ -250,7 +250,7 @@ static struct sk_buff *ieee80211_DELBA(* PBA_RECORD pBA //BA_RECORD entry which stores the necessary information for BA * output: none * notice: If any possible, please hide pBA in ieee. And temporarily use Manage Queue as softmac_mgmt_xmit() usually does -********************************************************************************************************************/ +********************************************************************************************************************/ static void ieee80211_send_ADDBAReq (struct ieee80211_device *ieee,u8 *dst,PBA_RECORD pBA) {
@@ -278,7 +278,7 @@ static void ieee80211_send_ADDBAReq(struct ieee80211_device *ieee,* u16 StatusCode //RSP StatusCode * output: none * notice: If any possible, please hide pBA in ieee. And temporarily use Manage Queue as softmac_mgmt_xmit() usually does -********************************************************************************************************************/ +********************************************************************************************************************/ static void ieee80211_send_ADDBARsp (struct ieee80211_device *ieee,u8 *dst,PBA_RECORD pBA,u16 StatusCode) {
@@ -305,7 +305,7 @@ static void ieee80211_send_ADDBARsp(struct ieee80211_device *ieee, u8 *dst,* u16 ReasonCode //DEL ReasonCode * output: none * notice: If any possible, please hide pBA in ieee. And temporarily use Manage Queue as softmac_mgmt_xmit() usually does -********************************************************************************************************************/ +********************************************************************************************************************/ static void ieee80211_send_DELBA(struct ieee80211_device *ieee, u8 *dst, PBA_RECORD pBA, TR_SELECT TxRxSelect,
@@ -330,7 +330,7 @@ static void ieee80211_send_DELBA(struct ieee80211_device *ieee, u8 *dst,* input: struct sk_buff * skb //incoming ADDBAReq skb. * return: 0(pass), other(fail) * notice: As this function need support of QOS, I comment some code out. And when qos is ready, this code need to be support. -********************************************************************************************************************/ +********************************************************************************************************************/ int ieee80211_rx_ADDBAReq (struct ieee80211_device *ieee,struct sk_buff *skb) {struct rtl_80211_hdr_3addr *req =NULL ;
@@ -432,7 +432,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)* input: struct sk_buff * skb //incoming ADDBAReq skb. * return: 0(pass), other(fail) * notice: As this function need support of QOS, I comment some code out. And when qos is ready, this code need to be support. -********************************************************************************************************************/ +********************************************************************************************************************/ int ieee80211_rx_ADDBARsp (struct ieee80211_device *ieee,struct sk_buff *skb) {struct rtl_80211_hdr_3addr *rsp =NULL ;
@@ -566,7 +566,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)* input: struct sk_buff * skb //incoming ADDBAReq skb. * return: 0(pass), other(fail) * notice: As this function need support of QOS, I comment some code out. And when qos is ready, this code need to be support. -********************************************************************************************************************/ +********************************************************************************************************************/ int ieee80211_rx_DELBA (struct ieee80211_device *ieee,struct sk_buff *skb) {struct rtl_80211_hdr_3addr *delba =NULL ;
@@ -703,7 +703,7 @@ TsInitDelBA( struct ieee80211_device *ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SE* input: unsigned long data //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer * return: NULL * notice: -********************************************************************************************************************/ +********************************************************************************************************************/ void BaSetupTimeOut (unsigned long data) {PTX_TS_RECORD pTxTs = (PTX_TS_RECORD )data;
Signature · 1 line
2.11.1
PATCH v2 18/25 Staging: rtl8192u: ieee80211: rtl819x_HT.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 69 +++++++++++++------------ 1 file changed, 35 insertions(+), 34 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +35 -34
@@ -86,38 +86,38 @@ typedef enum _CHNLOP{ ((_pHTInfo)->ChnlOp >CHNLOP_NONE ) ? TRUE : FALSE/* -typedef union _HT_CAPABILITY{ -u16 ShortData; -u8 CharData[2]; -struct -{ -u16 AdvCoding:1; -u16 ChlWidth:1; -u16 MimoPwrSave:2; -u16 GreenField:1; -u16 ShortGI20Mhz:1; -u16 ShortGI40Mhz:1; -u16 STBC:1; -u16 BeamForm:1; -u16 DelayBA:1; -u16 MaxAMSDUSize:1; -u16 DssCCk:1; -u16 PSMP:1; -u16 Rsvd:3; -}Field; -}HT_CAPABILITY, *PHT_CAPABILITY; - -typedef union _HT_CAPABILITY_MACPARA{ -u8 ShortData; -u8 CharData[1]; -struct -{ -u8 MaxRxAMPDU:2; -u8 MPDUDensity:2; -u8 Rsvd:4; -}Field; -}HT_CAPABILITY_MACPARA, *PHT_CAPABILITY_MACPARA; -*/ +* typedef union _HT_CAPABILITY{ +* u16 ShortData; +* u8 CharData[2]; +* struct +* { +* u16 AdvCoding:1; +* u16 ChlWidth:1; +* u16 MimoPwrSave:2; +* u16 GreenField:1; +* u16 ShortGI20Mhz:1; +* u16 ShortGI40Mhz:1; +* u16 STBC:1; +* u16 BeamForm:1; +* u16 DelayBA:1; +* u16 MaxAMSDUSize:1; +* u16 DssCCk:1; +* u16 PSMP:1; +* u16 Rsvd:3; +* }Field; +* }HT_CAPABILITY, *PHT_CAPABILITY; +* +* typedef union _HT_CAPABILITY_MACPARA{ +* u8 ShortData; +* u8 CharData[1]; +* struct +* { +* u8 MaxRxAMPDU:2; +* u8 MPDUDensity:2; +* u8 Rsvd:4; +* }Field; +* }HT_CAPABILITY_MACPARA, *PHT_CAPABILITY_MACPARA; + */ typedef enum _HT_ACTION{ ACT_RECOMMAND_WIDTH = 0,
@@ -421,8 +421,9 @@ extern u8 MCS_FILTER_ALL[16];extern u8 MCS_FILTER_1SS [16 ];/* 2007/07/11 MH Modify the macro. Becaus STA may link with a N-AP. If we set -STA in A/B/G mode and AP is still in N mode. The macro will be wrong. We have -to add a macro to judge wireless mode. */ +* STA in A/B/G mode and AP is still in N mode. The macro will be wrong. We have +* to add a macro to judge wireless mode. +*/ #define PICK_RATE (_nLegacyRate, _nMcsRate) \ (_nMcsRate==0)?(_nLegacyRate&0x7f):(_nMcsRate)/* 2007/07/12 MH We only define legacy and HT wireless mode now. */
Signature · 1 line
2.11.1
PATCH v2 19/25 Staging: rtl8192u: ieee80211: rtl819x_BA.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h +6 -6
@@ -19,12 +19,12 @@#define DELBA_REASON_UNKNOWN_BA 38#define DELBA_REASON_TIMEOUT 39/* whether need define BA Action frames here? -struct ieee80211_ADDBA_Req{ -struct ieee80211_header_data header; -u8 category; -u8 -} __attribute__ ((packed)); -*/ +*struct ieee80211_ADDBA_Req{ +* struct ieee80211_header_data header; +* u8 category; +* u8 +*} __attribute__ ((packed)); +*/ //Is this need?I put here just to make it easier to define structure BA_RECORD //WB typedef union _SEQUENCE_CONTROL{ u16 ShortData;
Signature · 1 line
2.11.1
PATCH v2 20/25 Staging: rtl8192u: ieee80211: ieee80211_wx.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 87 ++++++++++++----------- 1 file changed, 47 insertions(+), 40 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +47 -40
@@ -1,34 +1,34 @@/****************************************************************************** - -Copyright(c) 2004 Intel Corporation. All rights reserved. - -Portions of this file are based on the WEP enablement code provided by the -Host AP project hostap-drivers v0.1.3 -Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -<[email protected]> -Copyright (c) 2002-2003, Jouni Malinen <[email protected]> - -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 <[email protected]> -Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 - -******************************************************************************/ +* +* Copyright(c) 2004 Intel Corporation. All rights reserved. +* +* Portions of this file are based on the WEP enablement code provided by the +* Host AP project hostap-drivers v0.1.3 +* Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen +* <[email protected]> +* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> +* +* 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 <[email protected]> +* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 +* +******************************************************************************/ #include <linux/wireless.h> #include <linux/kmod.h> #include <linux/slab.h>
@@ -108,7 +108,8 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,/* Add frequency/channel */ iwe.cmd =SIOCGIWFREQ ;/* iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode); -iwe.u.freq.e = 3; */ +* iwe.u.freq.e = 3; +*/ iwe.u.freq.m = network->channel; iwe.u.freq.e =0 ; iwe.u.freq.i =0 ;
@@ -227,7 +228,8 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,/* Add EXTRA: Age to display seconds since last beacon/probe response -* for given network. */ +* for given network. +*/ iwe.cmd =IWEVCUSTOM ; p = custom; p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
@@ -325,7 +327,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,IEEE80211_DEBUG_WX ("Disabling encryption.\n" );/* Check all the keys to see if any are still configured, -* and if no key index was provided, de-init them all */ +* and if no key index was provided, de-init them all +*/ for (i =0 ; i <WEP_KEYS ; i++) {if (ieee->crypt[i] !=NULL ) {if (key_provided)
@@ -352,7 +355,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,if (*crypt !=NULL && (*crypt)->ops !=NULL &&strcmp ((*crypt)->ops->name,"WEP" ) !=0 ) {/* changing to use WEP; deinit previously used algorithm -* on this key */ +* on this key +*/ ieee80211_crypt_delayed_deinit (ieee, crypt); }
@@ -399,7 +403,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, (*crypt)->priv); sec.flags |= (1 << key);/* This ensures a key will be activated if no key is -* explicitely set */ +* explicitely set +*/ if (key == sec.active_key) sec.flags |=SEC_ACTIVE_KEY ; ieee->tx_keyidx = key;
@@ -440,7 +445,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, "OPEN" : "SHARED KEY");/* For now we just support WEP, so only set that security level... - * TODO: When WPA is added this is one place that needs to change */ +* TODO: When WPA is added this is one place that needs to change + */ sec.flags |=SEC_LEVEL ; sec.level =SEC_LEVEL_1 ;/* 40 and 104 bit WEP */
@@ -451,7 +457,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,* generate new IEEE 802.11 authentication which may end up in looping * with IEEE 802.1X. If your hardware requires a reset after WEP * configuration (for example... Prism2), implement the reset_port in -* the callbacks structures used to initialize the 802.11 stack. */ +* the callbacks structures used to initialize the 802.11 stack. +*/ if (ieee->reset_on_keychange && ieee->iw_mode !=IW_MODE_INFRA && ieee->reset_port && ieee->reset_port (dev)) {
@@ -761,9 +768,9 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,case IW_AUTH_CIPHER_GROUP :case IW_AUTH_KEY_MGMT :/* -* * Host AP driver does not use these parameters and allows -* * wpa_supplicant to control them internally. -* */ +* Host AP driver does not use these parameters and allows +* wpa_supplicant to control them internally. +*/ break ;case IW_AUTH_TKIP_COUNTERMEASURES : ieee->tkip_countermeasures = data->value;
Signature · 1 line
2.11.1
PATCH v2 21/25 Staging: rtl8192u: ieee80211: ieee80211_tx.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 290 +++++++++++----------- 1 file changed, 150 insertions(+), 140 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +150 -140
@@ -1,35 +1,34 @@/****************************************************************************** - -Copyright(c) 2003 - 2004 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 <[email protected]> -Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 - -****************************************************************************** - -Few modifications for Realtek's Wi-Fi drivers by -Andrea Merello <[email protected]> - -A special thanks goes to Realtek for their support ! - -******************************************************************************/ +* +* Copyright(c) 2003 - 2004 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 <[email protected]> +* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 +* +* +* Few modifications for Realtek's Wi-Fi drivers by +* Andrea Merello <[email protected]> +* +* A special thanks goes to Realtek for their support ! +* +******************************************************************************/ #include <linux/compiler.h> #include <linux/errno.h>
@@ -55,101 +54,101 @@/* - - -802.11 Data Frame - - -802.11 frame_contorl for data frames - 2 bytes -,-----------------------------------------------------------------------------------------. -bits | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | a | b | c | d | e | -|----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|------| -val | 0 | 0 | 0 | 1 | x | 0 | 0 | 0 | 1 | 0 | x | x | x | x | x | -|----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|------| -desc | ^-ver-^ | ^type-^ | ^-----subtype-----^ | to |from |more |retry| pwr |more |wep | -| | | x=0 data,x=1 data+ack | DS | DS |frag | | mgm |data | | -'-----------------------------------------------------------------------------------------' -/\ -| -802.11 Data Frame | -,--------- 'ctrl' expands to >-----------' -| -,--'---,-------------------------------------------------------------. -Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | -|------|------|---------|---------|---------|------|---------|------| -Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | Frame | fcs | -| | tion | (BSSID) | | | ence | data | | -`--------------------------------------------------| |------' -Total: 28 non-data bytes `----.----' -| -.- 'Frame data' expands to <---------------------------' -| -V -,---------------------------------------------------. -Bytes | 1 | 1 | 1 | 3 | 2 | 0-2304 | -|------|------|---------|----------|------|---------| -Desc. | SNAP | SNAP | Control |Eth Tunnel| Type | IP | -| DSAP | SSAP | | | | Packet | -| 0xAA | 0xAA |0x03 (UI)|0x00-00-F8| | | -`-----------------------------------------| | -Total: 8 non-data bytes `----.----' -| -.- 'IP Packet' expands, if WEP enabled, to <--' -| -V -,-----------------------. -Bytes | 4 | 0-2296 | 4 | -|-----|-----------|-----| -Desc. | IV | Encrypted | ICV | -| | IP Packet | | -`-----------------------' -Total: 8 non-data bytes - - -802.3 Ethernet Data Frame - -,-----------------------------------------. -Bytes | 6 | 6 | 2 | Variable | 4 | -|-------|-------|------|-----------|------| -Desc. | Dest. | Source| Type | IP Packet | fcs | -| MAC | MAC | | | | -`-----------------------------------------' -Total: 18 non-data bytes - -In the event that fragmentation is required, the incoming payload is split into -N parts of size ieee->fts. The first fragment contains the SNAP header and the -remaining packets are just data. - -If encryption is enabled, each fragment payload size is reduced by enough space -to add the prefix and postfix (IV and ICV totalling 8 bytes in the case of WEP) -So if you have 1500 bytes of payload with ieee->fts set to 500 without -encryption it will take 3 frames. With WEP it will take 4 frames as the -payload of each frame is reduced to 492 bytes. - -* SKB visualization -* -* ,- skb->data -* | -* | ETHERNET HEADER ,-<-- PAYLOAD -* | | 14 bytes from skb->data -* | 2 bytes for Type --> ,T. | (sizeof ethhdr) -* | | | | -* |,-Dest.--. ,--Src.---. | | | -* | 6 bytes| | 6 bytes | | | | -* v | | | | | | -* 0 | v 1 | v | v 2 -* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 -* ^ | ^ | ^ | -* | | | | | | -* | | | | `T' <---- 2 bytes for Type -* | | | | -* | | '---SNAP--' <-------- 6 bytes for SNAP -* | | -* `-IV--' <-------------------- 4 bytes for IV (WEP) -* -* SNAP HEADER -* -*/ +* +* +* 802.11 Data Frame +* +* +* 802.11 frame_contorl for data frames - 2 bytes +* ,-----------------------------------------------------------------------------------------. +* bits | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | a | b | c | d | e | +* |----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|------| +* val | 0 | 0 | 0 | 1 | x | 0 | 0 | 0 | 1 | 0 | x | x | x | x | x | +* |----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|------| +* desc | ^-ver-^ | ^type-^ | ^-----subtype-----^ | to |from |more |retry| pwr |more |wep | +* | | | x=0 data,x=1 data+ack | DS | DS |frag | | mgm |data | | +* '-----------------------------------------------------------------------------------------' +* /\ +* | +* 802.11 Data Frame | +* ,--------- 'ctrl' expands to >-----------' +* | +* ,--'---,-------------------------------------------------------------. +* Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | +* |------|------|---------|---------|---------|------|---------|------| +* Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | Frame | fcs | +* | | tion | (BSSID) | | | ence | data | | +* `--------------------------------------------------| |------' +* Total: 28 non-data bytes `----.----' +* | +* .- 'Frame data' expands to <---------------------------' +* | +* V +* ,---------------------------------------------------. +* Bytes | 1 | 1 | 1 | 3 | 2 | 0-2304 | +* |------|------|---------|----------|------|---------| +* Desc. | SNAP | SNAP | Control |Eth Tunnel| Type | IP | +* | DSAP | SSAP | | | | Packet | +* | 0xAA | 0xAA |0x03 (UI)|0x00-00-F8| | | +* `-----------------------------------------| | +* Total: 8 non-data bytes `----.----' +* | +* .- 'IP Packet' expands, if WEP enabled, to <--' +* | +* V +* ,-----------------------. +* Bytes | 4 | 0-2296 | 4 | +* |-----|-----------|-----| +* Desc. | IV | Encrypted | ICV | +* | | IP Packet | | +* `-----------------------' +* Total: 8 non-data bytes +* +* +* 802.3 Ethernet Data Frame +* +* ,-----------------------------------------. +* Bytes | 6 | 6 | 2 | Variable | 4 | +* |-------|-------|------|-----------|------| +* Desc. | Dest. | Source| Type | IP Packet | fcs | +* | MAC | MAC | | | | +* `-----------------------------------------' +* Total: 18 non-data bytes +* +* In the event that fragmentation is required, the incoming payload is split into +* N parts of size ieee->fts. The first fragment contains the SNAP header and the +* remaining packets are just data. +* +* If encryption is enabled, each fragment payload size is reduced by enough space +* to add the prefix and postfix (IV and ICV totalling 8 bytes in the case of WEP) +* So if you have 1500 bytes of payload with ieee->fts set to 500 without +* encryption it will take 3 frames. With WEP it will take 4 frames as the +* payload of each frame is reduced to 492 bytes. +* +* SKB visualization +* +* ,- skb->data +* | +* | ETHERNET HEADER ,-<-- PAYLOAD +* | | 14 bytes from skb->data +* | 2 bytes for Type --> ,T. | (sizeof ethhdr) +* | | | | +* |,-Dest.--. ,--Src.---. | | | +* | 6 bytes| | 6 bytes | | | | +* v | | | | | | +* 0 | v 1 | v | v 2 +* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 +* ^ | ^ | ^ | +* | | | | | | +* | | | | `T' <---- 2 bytes for Type +* | | | | +* | | '---SNAP--' <-------- 6 bytes for SNAP +* | | +* `-IV--' <-------------------- 4 bytes for IV (WEP) +* +* SNAP HEADER +* +*/ static u8 P802_1H_OUI [P80211_OUI_LEN ] = {0x00 ,0x00 ,0xf8 };static u8 RFC1042_OUI [P80211_OUI_LEN ] = {0x00 ,0x00 ,0x00 };
@@ -205,11 +204,13 @@ int ieee80211_encrypt_fragment( }/* To encrypt, frame format is: -* IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */ +* IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) +*/ // PR: FIXME: Copied from hostap. Check fragmentation/MSDU/MPDU encryption. /* Host-based IEEE 802.11 fragmentation for TX is not yet supported, so -* call both MSDU and MPDU encryption functions from here. */ +* call both MSDU and MPDU encryption functions from here. +*/ atomic_inc (&crypt->refcnt); res =0 ;if (crypt->ops->encrypt_msdu)
@@ -620,7 +621,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)spin_lock_irqsave (&ieee->lock, flags);/* If there is no driver handler to take the TXB, dont' bother -* creating it... */ +* creating it... +*/ if ((!ieee->hard_start_xmit && !(ieee->softmac_features &IEEE_SOFTMAC_TX_QUEUE ))|| ((!ieee->softmac_data_hard_start_xmit && (ieee->softmac_features &IEEE_SOFTMAC_TX_QUEUE )))) { printk(KERN_WARNING "%s: No xmit handler.\n",
@@ -683,13 +685,15 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)if (ieee->iw_mode ==IW_MODE_INFRA ) { fc |=IEEE80211_FCTL_TODS ;/* To DS: Addr1 = BSSID, Addr2 = SA, -Addr3 = DA */ +* Addr3 = DA +*/ memcpy (&header.addr1, ieee->current_network.bssid,ETH_ALEN );memcpy (&header.addr2, &src,ETH_ALEN );memcpy (&header.addr3, &dest,ETH_ALEN ); }else if (ieee->iw_mode ==IW_MODE_ADHOC ) {/* not From/To DS: Addr1 = DA, Addr2 = SA, -Addr3 = BSSID */ +* Addr3 = BSSID +*/ memcpy (&header.addr1, dest,ETH_ALEN );memcpy (&header.addr2, src,ETH_ALEN );memcpy (&header.addr3, ieee->current_network.bssid,ETH_ALEN );
@@ -698,7 +702,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) header.frame_ctl =cpu_to_le16 (fc);/* Determine fragmentation size based on destination (multicast -* and broadcast are not fragmented) */ +* and broadcast are not fragmented) +*/ if (is_multicast_ether_addr (header.addr1)) { frag_size =MAX_FRAG_THRESHOLD ; qos_ctl |=QOS_CTL_NOTCONTAIN_ACK ;
@@ -720,9 +725,10 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) hdr_len =IEEE80211_3ADDR_LEN ; }/* Determine amount of payload per fragment. Regardless of if -* this stack is providing the full 802.11 header, one will -* eventually be affixed to this fragment -- so we must account for -* it when determining the amount of payload space. */ +* this stack is providing the full 802.11 header, one will +* eventually be affixed to this fragment -- so we must account for +* it when determining the amount of payload space. +*/ bytes_per_frag = frag_size - hdr_len;if (ieee->config & (CFG_IEEE80211_COMPUTE_FCS |CFG_IEEE80211_RESERVE_FCS ))
@@ -734,7 +740,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) crypt->ops->extra_postfix_len;/* Number of fragments is the total bytes_per_frag / -* payload_per_fragment */ +* payload_per_fragment +*/ nr_frags = bytes / bytes_per_frag; bytes_last_frag = bytes % bytes_per_frag;if (bytes_last_frag)
@@ -743,8 +750,9 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) bytes_last_frag = bytes_per_frag;/* When we allocate the TXB we allocate enough space for the reserve -* and full fragment bytes (bytes_per_frag doesn't include prefix, -* postfix, header, FCS, etc.) */ +* and full fragment bytes (bytes_per_frag doesn't include prefix, +* postfix, header, FCS, etc.) +*/ txb =ieee80211_alloc_txb (nr_frags, frag_size + ieee->tx_headroom,GFP_ATOMIC );if (unlikely (!txb)) { printk(KERN_WARNING "%s: Could not allocate TXB\n",
@@ -791,7 +799,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)memcpy (frag_hdr, &header, hdr_len);/* If this is not the last fragment, then add the MOREFRAGS -* bit to the frame control */ +* bit to the frame control +*/ if (i != nr_frags -1 ) { frag_hdr->frame_ctl =cpu_to_le16 ( fc |IEEE80211_FCTL_MOREFRAGS );
@@ -824,7 +833,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)skb_pull (skb, bytes);/* Encryption routine will move the header forward in order -* to insert the IV between the header and the payload */ +* to insert the IV between the header and the payload +*/ if (encrypt)ieee80211_encrypt_fragment (ieee, skb_frag, hdr_len); if (ieee->config &
Signature · 1 line
2.11.1
PATCH v2 22/25 Staging: rtl8192u: ieee80211: ieee80211_rx.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 91 +++++++++++++++-------- 1 file changed, 58 insertions(+), 33 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +58 -33
@@ -148,7 +148,8 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,memcpy (entry->dst_addr, hdr->addr1,ETH_ALEN ); }else {/* received a fragment of a frame for which the head fragment -* should have already been received */ +* should have already been received +*/ entry =ieee80211_frag_cache_find (ieee, seq, frag, tid,hdr->addr2, hdr->addr1);if (entry !=NULL ) {
@@ -207,7 +208,8 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,* * Responsible for handling management control frames * -* Called by ieee80211_rx */ +* Called by ieee80211_rx +*/ static inline int ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats, u16 type,
@@ -240,8 +242,9 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb, ieee->dev->name);return 0 ;/* -hostap_update_sta_ps(ieee, (struct hostap_ieee80211_hdr_4addr *) -skb->data);*/ +* hostap_update_sta_ps(ieee, (struct hostap_ieee80211_hdr_4addr *) +* skb->data); +*/ }if (ieee->hostapd && type ==IEEE80211_TYPE_MGMT ) {
@@ -249,14 +252,16 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb, ieee->iw_mode == IW_MODE_MASTER) {struct sk_buff *skb2;/* Process beacon frames also in kernel driver to -* update STA(AP) table statistics */ +* update STA(AP) table statistics +*/ skb2 =skb_clone (skb,GFP_ATOMIC );if (skb2)hostap_rx (skb2->dev, skb2, rx_stats); }/* send management frames to the user space daemon for -* processing */ +* processing +*/ ieee->apdevstats.rx_packets++; ieee->apdevstats.rx_bytes += skb->len;prism2_rx_80211 (ieee->apdev, skb, rx_stats,PRISM2_RX_MGMT );
@@ -554,7 +559,8 @@ void ieee80211_indicate_packets(struct ieee80211_device *ieee, struct ieee80211_ ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) || memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE) == 0)) {/* remove RFC1042 or Bridge-Tunnel encapsulation and -* replace EtherType */ +* replace EtherType +*/ skb_pull (sub_skb,SNAP_SIZE );memcpy (skb_push (sub_skb,ETH_ALEN ), prxb->src,ETH_ALEN );memcpy (skb_push (sub_skb,ETH_ALEN ), prxb->dst,ETH_ALEN );
@@ -885,7 +891,8 @@ static u8 parse_subframe(struct sk_buff *skb,/* All received frames are sent to this function. @skb contains the frame in * IEEE 802.11 format, i.e., in the format it was sent over air. -* This function is called only as a tasklet (software IRQ). */ +* This function is called only as a tasklet (software IRQ). +*/ int ieee80211_rx (struct ieee80211_device *ieee,struct sk_buff *skb,struct ieee80211_rx_stats *rx_stats) {
@@ -949,7 +956,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,//IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len); #ifdef NOT_YET /* Put this code here so that we avoid duplicating it in all - * Rx paths. - Jean II */ + * Rx paths. - Jean II + */ #ifdef IW_WIRELESS_SPY /* defined in iw_handler.h */ /* If spy monitoring on */ if (iface->spy_data.spy_number > 0) {
@@ -984,7 +992,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,* bcrx_sta_key parameter is set, station specific key is used * even with broad/multicast targets (this is against IEEE * 802.11, but makes it easier to use different keys with -* stations that do not support WEP key mapping). */ +* stations that do not support WEP key mapping). +*/ if (!(hdr->addr1[0 ] &0x01 ) || local->bcrx_sta_key) (void) hostap_handle_sta_crypto(local, hdr, &crypt,
@@ -992,7 +1001,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,#endif /* allow NULL decrypt to indicate an station specific override -* for default encryption */ +* for default encryption +*/ if (crypt && (crypt->ops ==NULL || crypt->ops->decrypt_mpdu ==NULL )) crypt =NULL ;
@@ -1001,7 +1011,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,/* This seems to be triggered by some (multicast?) * frames from other than current BSS, so just drop the * frames silently instead of filling system log with -* these reports. */ +* these reports. +*/ IEEE80211_DEBUG_DROP ("Decryption failed (not set)" " (SA=%pM)\n" , hdr->addr2);
@@ -1121,7 +1132,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,#endif //IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len); /* Nullfunc frames may have PS-bit set, so they must be passed to -* hostap_handle_sta_rx() before being dropped here. */ +* hostap_handle_sta_rx() before being dropped here. +*/ if (stype != IEEE80211_STYPE_DATA && stype != IEEE80211_STYPE_DATA_CFACK && stype != IEEE80211_STYPE_DATA_CFPOLL &&
@@ -1181,11 +1193,13 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,if (frag ==0 ) {/* copy first fragment (including full headers) into -* beginning of the fragment cache skb */ +* beginning of the fragment cache skb +*/ memcpy (skb_put (frag_skb, flen), skb->data, flen); }else {/* append frame payload to the end of the fragment -* cache skb */ +* cache skb +*/ memcpy (skb_put (frag_skb, flen), skb->data + hdrlen, flen); }
@@ -1195,19 +1209,22 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,if (fc &IEEE80211_FCTL_MOREFRAGS ) {/* more fragments expected - leave the skb in fragment * cache for now; it will be delivered to upper layers -* after all fragments have been received */ +* after all fragments have been received +*/ goto rx_exit; }/* this was the last fragment and the frame will be -* delivered, so remove skb from fragment cache */ +* delivered, so remove skb from fragment cache +*/ skb = frag_skb; hdr = (struct rtl_80211_hdr_4addr *) skb->data;ieee80211_frag_cache_invalidate (ieee, hdr); }/* skb: hdr + (possible reassembled) full MSDU payload; possibly still -* encrypted/authenticated */ +* encrypted/authenticated +*/ if (ieee->host_decrypt && (fc &IEEE80211_FCTL_WEP ) &&ieee80211_rx_frame_decrypt_msdu (ieee, skb, keyidx, crypt)) {
@@ -1226,7 +1243,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,#ifdef CONFIG_IEEE80211_DEBUG /* pass unencrypted EAPOL frames even if encryption is -* configured */ +* configured +*/ struct eapol *eap = (struct eapol *)(skb->data +24 ); IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",
@@ -1261,10 +1279,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, goto rx_dropped; }/* -if(ieee80211_is_eapol_frame(ieee, skb, hdrlen)) { -printk(KERN_WARNING "RX: IEEE802.1X EPAOL frame!\n"); -} -*/ +* if(ieee80211_is_eapol_frame(ieee, skb, hdrlen)) { +* printk(KERN_WARNING "RX: IEEE802.1X EPAOL frame!\n"); +* } +*/ //added by amy for reorder if (ieee->current_network.qos_data.active &&IsQoSDataFrame (skb->data) && !is_multicast_ether_addr (hdr->addr1))
@@ -1310,7 +1328,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) || memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE) == 0)) {/* remove RFC1042 or Bridge-Tunnel encapsulation and -* replace EtherType */ +* replace EtherType +*/ skb_pull (sub_skb,SNAP_SIZE );memcpy (skb_push (sub_skb,ETH_ALEN ), src,ETH_ALEN );memcpy (skb_push (sub_skb,ETH_ALEN ), dst,ETH_ALEN );
@@ -1366,7 +1385,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,/* Returning 0 indicates to caller that we have not handled the SKB-- * so it is still allocated and can be used again by underlying -* hardware as a DMA target */ +* hardware as a DMA target +*/ return 0 ; }EXPORT_SYMBOL (ieee80211_rx);
@@ -1376,9 +1396,9 @@ EXPORT_SYMBOL(ieee80211_rx);static u8 qos_oui[QOS_OUI_LEN ] = {0x00 ,0x50 ,0xF2 };/* -* Make the structure we read from the beacon packet to have -* the right values -*/ +* Make the structure we read from the beacon packet to have +* the right values +*/ static int ieee80211_verify_qos_info (struct ieee80211_qos_information_element *info_element,int sub_type) {
@@ -1631,7 +1651,8 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, length, info_element->id);/* We stop processing but don't return an error here * because some misbehaviour APs break this rule. ie. -* Orinoco AP1000. */ +* Orinoco AP1000. +*/ break ; }
@@ -2255,7 +2276,8 @@ static inline int is_same_network(struct ieee80211_network *src,/* A network is only a duplicate if the channel, BSSID, ESSID * and the capability field (in particular IBSS and BSS) all match. * We treat all <hidden> with the same BSSID and channel -* as one network */ +* as one network +*/ return //((src->ssid_len == dst->ssid_len) && (((src->ssid_len == dst->ssid_len) || (ieee->iw_mode == IW_MODE_INFRA)) && (src->channel == dst->channel) &&
@@ -2491,10 +2513,12 @@ static inline void ieee80211_process_probe_response(* * NOTE: This search is definitely not optimized. Once its doing * the "right thing" we'll optimize it for efficiency if -* necessary */ +* necessary +*/ /* Search for this entry in the list and update it if it is -* already there. */ +* already there. +*/ spin_lock_irqsave (&ieee->lock, flags);
@@ -2525,7 +2549,8 @@ static inline void ieee80211_process_probe_response( }/* If we didn't find a match, then get a new network slot to initialize -* with this beacon's information */ +* with this beacon's information +*/ if (&target->list == &ieee->network_list) {if (list_empty (&ieee->network_free_list)) {/* If there are no more slots, expire the oldest */
Signature · 1 line
2.11.1
PATCH v2 23/25 Staging: rtl8192u: ieee80211: ieee80211_crypt.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h +8 -4
@@ -30,7 +30,8 @@ struct ieee80211_crypto_ops {/* init new crypto context (e.g., allocate private data space, * select IV, etc.); returns NULL on failure or pointer to allocated -* private data on success */ +* private data on success +*/ void * (*init)(int keyidx);/* deinitialize crypto context and free allocated private data */
@@ -46,7 +47,8 @@ struct ieee80211_crypto_ops {int (*decrypt_mpdu)(struct sk_buff *skb,int hdr_len,void *priv);/* These functions are called for full MSDUs, i.e. full frames. -* These can be NULL if full MSDU operations are not needed. */ +* These can be NULL if full MSDU operations are not needed. +*/ int (*encrypt_msdu)(struct sk_buff *skb,int hdr_len,void *priv);int (*decrypt_msdu)(struct sk_buff *skb,int keyidx,int hdr_len,void *priv);
@@ -55,14 +57,16 @@ struct ieee80211_crypto_ops {int (*get_key)(void *key,int len,u8 *seq,void *priv);/* procfs handler for printing out key information and possible -* statistics */ +* statistics +*/ char * (*print_stats)(char *p,void *priv);/* maximum number of bytes added by encryption; encrypt buf is * allocated with extra_prefix_len bytes, copy of in_buf, and * extra_postfix_len; encrypt need not use all this space, but * the result must start at the beginning of the buffer and correct -* length must be returned */ +* length must be returned +*/ int extra_prefix_len, extra_postfix_len;struct module *owner;
Signature · 1 line
2.11.1
PATCH v2 24/25 Staging: rtl8192u: ieee80211: ieee80211_crypt.c - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c +2 -1
@@ -88,7 +88,8 @@ void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,/* must not run ops->deinit() while there may be pending encrypt or * decrypt operations. Use a list of delayed deinits to avoid needing -* locking. */ +* locking. +*/ spin_lock_irqsave (&ieee->lock, flags);list_add (&tmp->list, &ieee->crypt_deinit_list);
Signature · 1 line
2.11.1
PATCH v2 25/25 Staging: rtl8192u: ieee80211: ieee80211.h - style fix
In reply to Derek RobsonFixed style of block comments
Found using checkpatch
--- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 61 +++++++++++++++----------- 1 file changed, 36 insertions(+), 25 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +36 -25
@@ -329,12 +329,13 @@ typedef struct ieee_param {// linux under 2.6.9 release may not support it, so modify it for common use #define IEEE80211_DATA_LEN 2304/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section -6.2.1.1.2. - -The figure in section 7.1.2 suggests a body size of up to 2312 -bytes is allowed, which is a bit confusing, I suspect this -represents the 2304 bytes of real data, plus a possible 8 bytes of -WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */ +* 6.2.1.1.2. +* +* The figure in section 7.1.2 suggests a body size of up to 2312 +* bytes is allowed, which is a bit confusing, I suspect this +* represents the 2304 bytes of real data, plus a possible 8 bytes of +* WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) +*/ #define IEEE80211_1ADDR_LEN 10#define IEEE80211_2ADDR_LEN 16#define IEEE80211_3ADDR_LEN 24
@@ -685,7 +686,8 @@ struct ieee_ibss_seq {/* NOTE: This data is for statistical purposes; not all hardware provides this * information for frames received. Not setting these will not cause -* any adverse affects. */ +* any adverse affects. +*/ struct ieee80211_rx_stats {u32 mac_time[2 ];s8 rssi;
@@ -754,7 +756,8 @@ struct ieee80211_rx_stats {/* IEEE 802.11 requires that STA supports concurrent reception of at least * three fragmented frames. This define can be increased to support more * concurrent frames, but it should be noted that each entry can consume about -* 2 kB of RAM and increasing cache size will slow down frame reassembly. */ +* 2 kB of RAM and increasing cache size will slow down frame reassembly. +*/ #define IEEE80211_FRAG_CACHE_LEN 4struct ieee80211_frag_entry {
@@ -836,15 +839,15 @@ struct ieee80211_security {/* -802.11 data frame from AP -,-------------------------------------------------------------------. -Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | -|------|------|---------|---------|---------|------|---------|------| -Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | frame | fcs | -| | tion | (BSSID) | | | ence | data | | -`-------------------------------------------------------------------' -Total: 28-2340 bytes -*/ +* 802.11 data frame from AP +* ,-------------------------------------------------------------------. +* Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | +* |------|------|---------|---------|---------|------|---------|------| +* Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | frame | fcs | +* | | tion | (BSSID) | | | ence | data | | +* `-------------------------------------------------------------------' +* Total: 28-2340 bytes +*/ /* Management Frame Information Element Types */ enum ieee80211_mfie {
@@ -882,7 +885,8 @@ enum ieee80211_mfie {/* Minimal header; can be used for passing 802.11 frames with sufficient * information to determine what type of underlying data type is actually -* stored in the data. */ +* stored in the data. +*/ struct rtl_80211_hdr {__le16 frame_ctl;__le16 duration_id;
@@ -980,7 +984,8 @@ struct ieee80211_probe_response {__le16 beacon_interval;__le16 capability;/* SSID, supported rates, FH params, DS params, -* CF params, IBSS params, TIM (if beacon), RSN */ +* CF params, IBSS params, TIM (if beacon), RSN +*/ struct ieee80211_info_element info_element[0 ]; } __packed;
@@ -1055,7 +1060,8 @@ typedef union _frameqos {/* MAX_RATES_LENGTH needs to be 12. The spec says 8, and many APs * only use 8, and then use extended rates for the remaining supported * rates. Other APs, however, stick all of their supported rates on the -* main rates information element... */ +* main rates information element... +*/ #define MAX_RATES_LENGTH ((u8)12)#define MAX_RATES_EX_LENGTH ((u8)16)#define MAX_NETWORK_COUNT 128
@@ -1677,14 +1683,16 @@ struct ieee80211_device {spinlock_t wpax_suitlist_lock;int tx_headroom;/* Set to size of any additional room needed at front -* of allocated Tx SKBs */ +* of allocated Tx SKBs +*/ u32 config;/* WEP and other encryption related settings at the device level */ int open_wep;/* Set to 1 to allow unencrypted frames */ int auth_mode;int reset_on_keychange;/* Set to 1 if the HW needs to be reset on -* WEP key changes */ +* WEP key changes +*/ /* If the host performs {en,de}cryption, then set to 1 */ int host_encrypt;
@@ -1719,7 +1727,8 @@ struct ieee80211_device {int crypt_quiesced;int bcrx_sta_key;/* use individual keys to override default keys even -* with RX of broad/multicast frames */ +* with RX of broad/multicast frames +*/ /* Fragmentation structures */ // each streaming contain a entry
@@ -2004,7 +2013,8 @@ struct ieee80211_device {void (*InitialGainHandler)(struct net_device *dev,u8 Operation);/* This must be the last item so that it points to the data -* allocated beyond this structure by alloc_ieee80211 */ +* allocated beyond this structure by alloc_ieee80211 +*/ u8 priv[0 ]; };
@@ -2033,7 +2043,8 @@ struct ieee80211_device {/* The ieee802.11 stack will manages the netif queue * wake/stop for the driver, taking care of 802.11 -* fragmentation. See softmac.c for details. */ +* fragmentation. See softmac.c for details. +*/ #define IEEE_SOFTMAC_TX_QUEUE (1<<7)/* Uses only the softmac_data_hard_start_xmit
Signature · 1 line
2.11.1
Greg KH
maintainerRe: [PATCH v2 01/25] Staging: rtl8192u: r819xU_phy.c - style fix
In reply to Derek RobsonQuoted 7 lines · Derek Robson
Fixed style of block comments
Found using checkpatchSigned-off-by Derek Robson <[email protected]>--- drivers/staging/rtl8192u/r819xU_phy.c | 41 +++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 14 deletions(-)
This patch is already in my tree. Please rebase your series against my latest tree and resend only the ones that I need to apply.
thanks,
greg k-h