staging: rtl8192u: Use __func__ instead of hardcoded string - Style
PATCH v2 1/9 staging: rtl8192u: Use __func__ instead of hardcoded string - Style
Changed logging statements to use %s and __func__ instead of hard coding the function name in a string.
--- .../rtl8192u/ieee80211/rtl819x_HTProc.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +18 -6
@@ -534,7 +534,9 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u//u8 bIsDeclareMCS13; if (!posHTCap || !pHT) { -IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posHTCap or pHTInfo can't be null in HTConstructCapabilityElement()\n" ); +IEEE80211_DEBUG (IEEE80211_DL_ERR , +"posHTCap or pHTInfo can't be null in %s\n" , + __func__);return ; }memset (posHTCap,0 , *len);
@@ -645,7 +647,9 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *lePHT_INFORMATION_ELE pHTInfoEle = (PHT_INFORMATION_ELE )posHTInfo;if (!posHTInfo || !pHTInfoEle) { -IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posHTInfo or pHTInfoEle can't be null in HTConstructInfoElement()\n" ); +IEEE80211_DEBUG (IEEE80211_DL_ERR , +"posHTInfo or pHTInfoEle can't be null in %s\n" , + __func__);return ; }
@@ -709,7 +713,9 @@ void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *levoid HTConstructRT2RTAggElement (struct ieee80211_device *ieee,u8 *posRT2RTAgg,u8 *len) {if (!posRT2RTAgg) { -IEEE80211_DEBUG (IEEE80211_DL_ERR ,"posRT2RTAgg can't be null in HTConstructRT2RTAggElement()\n" ); +IEEE80211_DEBUG (IEEE80211_DL_ERR , +"posRT2RTAgg can't be null in %s\n" , + __func__);return ; }memset (posRT2RTAgg,0 , *len);
@@ -758,7 +764,9 @@ static u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS)u8 i;if (!pOperateMCS) { -IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pOperateMCS can't be null in HT_PickMCSRate()\n" ); +IEEE80211_DEBUG (IEEE80211_DL_ERR , +"pOperateMCS can't be null in %s\n" , + __func__);return false; }
@@ -820,7 +828,9 @@ u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFu8 availableMcsRate[16 ];if (!pMCSRateSet || !pMCSFilter) { -IEEE80211_DEBUG (IEEE80211_DL_ERR ,"pMCSRateSet or pMCSFilter can't be null in HTGetHighestMCSRate()\n" ); +IEEE80211_DEBUG (IEEE80211_DL_ERR , +"pMCSRateSet or pMCSFilter can't be null in %s\n" , + __func__);return false; }for (i =0 ; i <16 ; i++)
@@ -900,7 +910,9 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)static u8 EWC11NHTInfo[] = {0x00 ,0x90 ,0x4c ,0x34 };// For 11n EWC definition, 2007.07.17, by Emily if (!pHTInfo->bCurrentHTSupport) { -IEEE80211_DEBUG (IEEE80211_DL_ERR ,"<=== HTOnAssocRsp(): HT_DISABLE\n" ); +IEEE80211_DEBUG (IEEE80211_DL_ERR , +"<=== %s: HT_DISABLE\n" , + __func__);return ; }IEEE80211_DEBUG (IEEE80211_DL_HT ,"===> HTOnAssocRsp_wq(): HT_ENABLE\n" );
Signature · 1 line
2.17.1
PATCH v2 2/9 staging: rtl8192u: Use memset to initialize memory, instead of loop.
Replaced memory initialising loop with memset instead.
--- drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +1 -4
@@ -761,8 +761,6 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg,*/ static u8 HT_PickMCSRate (struct ieee80211_device *ieee,u8 *pOperateMCS) { -u8 i; -if (!pOperateMCS) { IEEE80211_DEBUG(IEEE80211_DL_ERR, "pOperateMCS can't be null in %s\n",
@@ -777,8 +775,7 @@ static u8 HT_PickMCSRate(struct ieee80211_device *ieee, u8 *pOperateMCS)//legacy rate routine handled at selectedrate //no MCS rate -for (i =0 ; i <=15 ; i++) - pOperateMCS[i] =0 ; +memset (pOperateMCS,0 ,16 );break ;case IEEE_N_24G ://assume CCK rate ok
Signature · 1 line
2.17.1
PATCH v2 3/9 staging: rtl8192u: Remove redundant definitions in header
In reply to John WhitmoreTruncated header file removing definitions which aren't used.
--- .../staging/rtl8192u/ieee80211/rtl819x_HT.h | 117 ------------------ 1 file changed, 117 deletions(-)
drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +0 -117
@@ -7,21 +7,10 @@// reassociation request and probe response frames //------------------------------------------------------------ -// -// Operation mode value -// -#define HT_OPMODE_NO_PROTECT 0 -#define HT_OPMODE_OPTIONAL 1 -#define HT_OPMODE_40MHZ_PROTECT 2 -#define HT_OPMODE_MIXED 3 -// // MIMO Power Save Settings // #define MIMO_PS_STATIC 0 -#define MIMO_PS_DYNAMIC 1 -#define MIMO_PS_NOLIMIT 3 -// // There should be 128 bits to cover all of the MCS rates. However, since
@@ -35,27 +24,6 @@#define HT_SUPPORTED_MCS_2SS_BITMAP 0x0000ff00#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP HT_MCS_1SS_BITMAP|HT_MCS_1SS_2SS_BITMAP - -typedef enum _HT_MCS_RATE { -HT_MCS0 =0x00000001 , -HT_MCS1 =0x00000002 , -HT_MCS2 =0x00000004 , -HT_MCS3 =0x00000008 , -HT_MCS4 =0x00000010 , -HT_MCS5 =0x00000020 , -HT_MCS6 =0x00000040 , -HT_MCS7 =0x00000080 , -HT_MCS8 =0x00000100 , -HT_MCS9 =0x00000200 , -HT_MCS10 =0x00000400 , -HT_MCS11 =0x00000800 , -HT_MCS12 =0x00001000 , -HT_MCS13 =0x00002000 , -HT_MCS14 =0x00004000 , -HT_MCS15 =0x00008000 , -// Do not define MCS32 here although 8190 support MCS32 -}HT_MCS_RATE , *PHT_MCS_RATE ; -// // Represent Channel Width in HT Capabilities //
@@ -120,28 +88,6 @@ typedef union _HT_CAPABILITY_MACPARA{}HT_CAPABILITY_MACPARA, *PHT_CAPABILITY_MACPARA; */ -typedef enum _HT_ACTION { -ACT_RECOMMAND_WIDTH =0 , -ACT_MIMO_PWR_SAVE =1 , -ACT_PSMP =2 , -ACT_SET_PCO_PHASE =3 , -ACT_MIMO_CHL_MEASURE =4 , -ACT_RECIPROCITY_CORRECT =5 , -ACT_MIMO_CSI_MATRICS =6 , -ACT_MIMO_NOCOMPR_STEER =7 , -ACT_MIMO_COMPR_STEER =8 , -ACT_ANTENNA_SELECT =9 , -}HT_ACTION , *PHT_ACTION ; - - -/* 2007/06/07 MH Define sub-carrier mode for 40MHZ. */ -typedef enum _HT_Bandwidth_40MHZ_Sub_Carrier { -SC_MODE_DUPLICATE =0 , -SC_MODE_LOWER =1 , -SC_MODE_UPPER =2 , -SC_MODE_FULL40MHZ =3 , -}HT_BW40_SC_E ; - typedef struct _HT_CAPABILITY_ELE { //HT capability info
@@ -212,16 +158,6 @@ typedef struct _HT_INFORMATION_ELE {u8 BasicMSC[16 ]; } __attribute__ ((packed)) HT_INFORMATION_ELE, *PHT_INFORMATION_ELE; -// -// MIMO Power Save control field. -// This is appear in MIMO Power Save Action Frame -// -typedef struct _MIMOPS_CTRL { -u8 MimoPsEnable:1 ; -u8 MimoPsMode:1 ; -u8 Reserved:6 ; -}MIMOPS_CTRL , *PMIMOPS_CTRL ; - typedef enum _HT_SPEC_VER { HT_SPEC_VER_IEEE = 0, HT_SPEC_VER_EWC = 1,
@@ -342,37 +278,6 @@ typedef struct _RT_HIGH_THROUGHPUT {u32 IOTAction; } __attribute__ ((packed)) RT_HIGH_THROUGHPUT, *PRT_HIGH_THROUGHPUT; - -//------------------------------------------------------------ -// The Data structure is used to keep HT related variable for "each Sta" -// when card is configured as "AP mode" -//------------------------------------------------------------ - -typedef struct _RT_HTINFO_STA_ENTRY { -u8 bEnableHT; - -u8 bSupportCck; - -u16 AMSDU_MaxSize; - -u8 AMPDU_Factor; -u8 MPDU_Density; - -u8 HTHighestOperaRate; - -u8 bBw40MHz; - -u8 MimoPs; - -u8 McsRateSet[16 ]; - - -}RT_HTINFO_STA_ENTRY , *PRT_HTINFO_STA_ENTRY ; - - - - -//------------------------------------------------------------ // The Data structure is used to keep HT related variable for "each AP" // when card is configured as "STA mode"
@@ -396,28 +301,6 @@ typedef struct _BSS_HT {u8 bdRT2RTLongSlotTime; } __attribute__ ((packed)) BSS_HT, *PBSS_HT; -typedef struct _MIMO_RSSI { -u32 EnableAntenna; -u32 AntennaA; -u32 AntennaB; -u32 AntennaC; -u32 AntennaD; -u32 Average; -}MIMO_RSSI , *PMIMO_RSSI ; - -typedef struct _MIMO_EVM { -u32 EVM1; -u32 EVM2; -}MIMO_EVM , *PMIMO_EVM ; - -typedef struct _FALSE_ALARM_STATISTICS { -u32 Cnt_Parity_Fail; -u32 Cnt_Rate_Illegal; -u32 Cnt_Crc8_fail; -u32 Cnt_all; -}FALSE_ALARM_STATISTICS , *PFALSE_ALARM_STATISTICS ; - -extern u8 MCS_FILTER_ALL [16 ];extern u8 MCS_FILTER_1SS [16 ];
Signature · 1 line
2.17.1
PATCH v2 4/9 staging: rtl8192u: Remove superfluous blank lines - Coding Style
In reply to John WhitmoreRemoval of extra blank lines from the ieee80211_softmac.c file
--- .../rtl8192u/ieee80211/ieee80211_softmac.c | 105 ------------------ 1 file changed, 105 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -105
@@ -12,8 +12,6 @@* * released under the GPL */ - -#include "ieee80211.h" #include <linux/random.h>
@@ -98,7 +96,6 @@ static void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p) *tag_p = tag; } -static void ieee80211_WMM_Info (struct ieee80211_device *ieee,u8 **tag_p) {u8 *tag = *tag_p;
@@ -216,7 +213,6 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)return rate; } -void ieee80211_sta_wakeup (struct ieee80211_device *ieee,short nl);inline void softmac_mgmt_xmit (struct sk_buff *skb,struct ieee80211_device *ieee)
@@ -289,14 +285,11 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieeestatic inline void softmac_ps_mgmt_xmit (struct sk_buff *skb,struct ieee80211_device *ieee) { -short single = ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ;struct rtl_80211_hdr_3addr *header = (struct rtl_80211_hdr_3addr *) skb->data; -if (single){ - header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF )
@@ -307,7 +300,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)/* avoid watchdog triggers */ netif_trans_update (ieee->dev); ieee->softmac_data_hard_start_xmit (skb,ieee->dev,ieee->basic_rate); - }else { header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );
@@ -318,7 +310,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee) ieee->seq_ctrl[0 ]++; ieee->softmac_hard_start_xmit (skb, ieee->dev); - }//dev_kfree_skb_any(skb);//edit by thomas }
@@ -390,7 +381,6 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee)//spin_unlock_irqrestore(&ieee->beacon_lock,flags); } -static void ieee80211_send_beacon_cb (struct timer_list *t) { struct ieee80211_device *ieee =
@@ -402,7 +392,6 @@ static void ieee80211_send_beacon_cb(struct timer_list *t)spin_unlock_irqrestore (&ieee->beacon_lock, flags); } -static void ieee80211_send_probe (struct ieee80211_device *ieee) {struct sk_buff *skb;
@@ -436,7 +425,6 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)while (1 ) { - do{ ch++; if (ch > MAX_CHANNEL_NUMBER)
@@ -475,7 +463,6 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) goto out;msleep_interruptible (IEEE80211_SOFTMAC_SCAN_TIME ); - } out:if (ieee->state <IEEE80211_LINKED ){
@@ -520,7 +507,6 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)if (channel_map[ieee->current_network.channel] ==1 )ieee80211_send_probe_requests (ieee); -schedule_delayed_work (&ieee->softmac_scan_wq,IEEE80211_SOFTMAC_SCAN_TIME );mutex_unlock (&ieee->scan_mutex);
@@ -534,8 +520,6 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)mutex_unlock (&ieee->scan_mutex); } - -static void ieee80211_beacons_start (struct ieee80211_device *ieee) {unsigned long flags;
@@ -557,10 +541,8 @@ static void ieee80211_beacons_stop(struct ieee80211_device *ieee)del_timer_sync (&ieee->beacon_timer);spin_unlock_irqrestore (&ieee->beacon_lock, flags); - } -void ieee80211_stop_send_beacons (struct ieee80211_device *ieee) {if (ieee->stop_send_beacons)
@@ -624,7 +606,6 @@ static void ieee80211_start_scan(struct ieee80211_device *ieee) } }else ieee->start_scan (ieee->dev); - }/* called with wx_mutex held */
@@ -642,7 +623,6 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)ieee80211_softmac_scan_syncro (ieee); else ieee->scan_syncro(ieee->dev); - }EXPORT_SYMBOL (ieee80211_start_scan_syncro);
@@ -654,7 +634,6 @@ ieee80211_authentication_req(struct ieee80211_network *beacon,struct ieee80211_authentication *auth;int len =sizeof (struct ieee80211_authentication ) + challengelen + ieee->tx_headroom; - skb =dev_alloc_skb (len);if (!skb)return NULL ;
@@ -687,10 +666,8 @@ ieee80211_authentication_req(struct ieee80211_network *beacon, auth->status =cpu_to_le16 (WLAN_STATUS_SUCCESS );return skb; - } -static struct sk_buff *ieee80211_probe_resp (struct ieee80211_device *ieee,u8 *dest) {u8 *tag;
@@ -728,10 +705,8 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *delse erp_len =0 ; - crypt = ieee->crypt[ieee->tx_keyidx]; - encrypt = ieee->host_encrypt && crypt && crypt->ops && ((0 ==strcmp (crypt->ops->name,"WEP" ) || wpa_ie_len));/* HT ralated element */
@@ -742,7 +717,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dHTConstructCapabilityElement (ieee, tmp_ht_cap_buf, &tmp_ht_cap_len,encrypt);HTConstructInfoElement (ieee,tmp_ht_info_buf,&tmp_ht_info_len, encrypt); -if (pHTInfo->bRegRT2RTAggregation) { tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;
@@ -787,7 +761,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dif (encrypt) beacon_buf->capability |=cpu_to_le16 (WLAN_CAPABILITY_PRIVACY ); - beacon_buf->header.frame_ctl =cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ); beacon_buf->info_element[0 ].id =MFIE_TYPE_SSID ; beacon_buf->info_element[0 ].len = ssid_len;
@@ -842,7 +815,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dreturn skb; } -static struct sk_buff *ieee80211_assoc_resp (struct ieee80211_device *ieee,u8 *dest) {
@@ -872,7 +844,6 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, assoc->capability =cpu_to_le16 (ieee->iw_mode ==IW_MODE_MASTER ?WLAN_CAPABILITY_BSS :WLAN_CAPABILITY_IBSS ); -if (ieee->short_slot) assoc->capability |=cpu_to_le16 (WLAN_CAPABILITY_SHORT_SLOT );
@@ -923,8 +894,6 @@ static struct sk_buff *ieee80211_auth_resp(struct ieee80211_device *ieee,memcpy (auth->header.addr1, dest,ETH_ALEN ); auth->header.frame_ctl =cpu_to_le16 (IEEE80211_STYPE_AUTH );return skb; - - } static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee,
@@ -949,11 +918,8 @@ static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee, (pwr ? IEEE80211_FCTL_PM:0));return skb; - - } -static void ieee80211_resp_to_assoc_rq (struct ieee80211_device *ieee,u8 *dest) {struct sk_buff *buf =ieee80211_assoc_resp (ieee, dest);
@@ -962,7 +928,6 @@ static void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest)softmac_mgmt_xmit (buf, ieee); } -static void ieee80211_resp_to_auth (struct ieee80211_device *ieee,int s,u8 *dest) {
@@ -972,17 +937,13 @@ static void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s,softmac_mgmt_xmit (buf, ieee); } -static void ieee80211_resp_to_probe (struct ieee80211_device *ieee,u8 *dest) { - -struct sk_buff *buf =ieee80211_probe_resp (ieee, dest);if (buf)softmac_mgmt_xmit (buf, ieee); } -static inline struct sk_buff *ieee80211_association_req (struct ieee80211_network *beacon,struct ieee80211_device *ieee)
@@ -1031,14 +992,12 @@ ieee80211_association_req(struct ieee80211_network *beacon, realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; realtek_ie_len =sizeof ( ieee->pHTInfo->szRT2RTAggBuffer);HTConstructRT2RTAggElement (ieee, realtek_ie_buf, &realtek_ie_len); - } }if (ieee->qos_support) { wmm_info_len = beacon->qos_data.supported?9 :0 ; } -if (beacon->bCkipSupported) { ckip_ie_len =30 +2 ;
@@ -1076,7 +1035,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, + cxvernum_ie_len + ieee->tx_headroom;#endif - skb =dev_alloc_skb (len);if (!skb)
@@ -1086,7 +1044,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, hdr =skb_put (skb,sizeof (struct ieee80211_assoc_request_frame ) +2 ); - hdr->header.frame_ctl =IEEE80211_STYPE_ASSOC_REQ ; hdr->header.duration_id =cpu_to_le16 (37 );memcpy (hdr->header.addr1, beacon->bssid,ETH_ALEN );
@@ -1182,7 +1139,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, } } -//choose what wpa_supplicant gives to associate. if (wpa_ie_len) {skb_put_data (skb, ieee->wpa_ie, wpa_ie_len);
@@ -1223,7 +1179,6 @@ ieee80211_association_req(struct ieee80211_network *beacon,void ieee80211_associate_abort (struct ieee80211_device *ieee) { -unsigned long flags;spin_lock_irqsave (&ieee->lock, flags);
@@ -1258,7 +1213,6 @@ static void ieee80211_associate_abort_cb(struct timer_list *t)ieee80211_associate_abort (dev); } -static void ieee80211_associate_step1 (struct ieee80211_device *ieee) {struct ieee80211_network *beacon = &ieee->current_network;
@@ -1430,7 +1384,6 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieeeif ((ieee->iw_mode ==IW_MODE_ADHOC ) && !(net->capability &WLAN_CAPABILITY_IBSS ))return ; -if (ieee->iw_mode ==IW_MODE_INFRA || ieee->iw_mode ==IW_MODE_ADHOC ) {/* if the user specified the AP MAC, we need also the essid * This could be obtained by beacons or, if the network does not
@@ -1443,7 +1396,6 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ssidmatch = (ieee->current_network.ssid_len == net->ssid_len)&&\ (!strncmp (ieee->current_network.ssid, net->ssid, net->ssid_len)); - if ( /* if the user set the AP check if match.* if the network does not broadcast essid we check the user supplyed ANY essid * if the network does broadcast and the user does not set essid it is OK
@@ -1505,10 +1457,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee//HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); ieee->state =IEEE80211_LINKED ; } - } } - }void ieee80211_softmac_check_all_nets (struct ieee80211_device *ieee)
@@ -1532,10 +1482,8 @@ void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee) }spin_unlock_irqrestore (&ieee->lock, flags); - } -static inline u16 auth_parse (struct sk_buff *skb,u8 **challenge,int *chlen) {struct ieee80211_authentication *a;
@@ -1558,10 +1506,8 @@ static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen) }return le16_to_cpu (a->status); - } -static int auth_rq_parse (struct sk_buff *skb,u8 *dest) {struct ieee80211_authentication *a;
@@ -1615,7 +1561,6 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb,if (!ssid)return 1 ;/* ssid not found in tagged param */ return (!strncmp (ssid, ieee->current_network.ssid, ssidlen)); - }static int assoc_rq_parse (struct sk_buff *skb,u8 *dest)
@@ -1697,7 +1642,6 @@ ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb)static inline void ieee80211_rx_assoc_rq (struct ieee80211_device *ieee,struct sk_buff *skb) { -u8 dest[ETH_ALEN ];//unsigned long flags;
@@ -1713,7 +1657,6 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)static void ieee80211_sta_ps_send_null_frame (struct ieee80211_device *ieee,short pwr) { -struct sk_buff *buf =ieee80211_null_func (ieee, pwr);if (buf)
@@ -1767,13 +1710,10 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, }return 1 ; - - }static inline void ieee80211_sta_ps (struct ieee80211_device *ieee) { -u32 th, tl;short sleep;
@@ -1799,7 +1739,6 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) goto out;if (sleep ==1 ){ -if (ieee->sta_sleep ==1 ) ieee->enter_sleep_state (ieee->dev, th, tl);
@@ -1808,8 +1747,6 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)spin_lock_irqsave (&ieee->mgmt_tx_lock, flags2);if (ieee->ps_is_queue_empty (ieee->dev)){ - - ieee->sta_sleep =2 ; ieee->ps_request_tx_ack (ieee->dev);
@@ -1820,10 +1757,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) ieee->ps_tl = tl; }spin_unlock_irqrestore (&ieee->mgmt_tx_lock, flags2); - } - - }else if (sleep ==2 ){//#warning CHECK_LOCK_HERE spin_lock_irqsave (&ieee->mgmt_tx_lock, flags2);
@@ -1832,10 +1766,8 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)spin_unlock_irqrestore (&ieee->mgmt_tx_lock, flags2); } - out:spin_unlock_irqrestore (&ieee->lock, flags); - }void ieee80211_sta_wakeup (struct ieee80211_device *ieee,short nl)
@@ -1847,7 +1779,6 @@ void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl)ieee80211_sta_ps_send_null_frame (ieee,0 ); }return ; - }if (ieee->sta_sleep ==1 )
@@ -1879,7 +1810,6 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success) }/* 21112005 - tx again null without PS bit if lost */ else { -if ((ieee->sta_sleep ==0 ) && !success) {spin_lock_irqsave (&ieee->mgmt_tx_lock, flags2);ieee80211_sta_ps_send_null_frame (ieee,0 );
@@ -1917,7 +1847,6 @@ static void ieee80211_process_action(struct ieee80211_device *ieee,break ; }return ; - } static void ieee80211_check_auth_response(struct ieee80211_device *ieee,
@@ -2004,10 +1933,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, ieee->last_rx_ps_time = jiffies;switch (WLAN_FC_GET_STYPE (header->frame_ctl)) { -case IEEE80211_STYPE_ASSOC_RESP :case IEEE80211_STYPE_REASSOC_RESP : -IEEE80211_DEBUG_MGMT ("received [RE]ASSOCIATION RESPONSE (%d)\n" ,WLAN_FC_GET_STYPE (header->frame_ctl)); if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
@@ -2060,7 +1987,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,case IEEE80211_STYPE_ASSOC_REQ :case IEEE80211_STYPE_REASSOC_REQ : -if ((ieee->softmac_features &IEEE_SOFTMAC_ASSOCIATE ) && ieee->iw_mode ==IW_MODE_MASTER )
@@ -2068,7 +1994,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,break ;case IEEE80211_STYPE_AUTH : -if (ieee->softmac_features &IEEE_SOFTMAC_ASSOCIATE ) {if (ieee->state ==IEEE80211_ASSOCIATING_AUTHENTICATING && ieee->iw_mode ==IW_MODE_INFRA ) {
@@ -2082,7 +2007,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,break ;case IEEE80211_STYPE_PROBE_REQ : - if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && ((ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER) &&
@@ -2140,7 +2064,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,*/ void ieee80211_softmac_xmit (struct ieee80211_txb *txb,struct ieee80211_device *ieee) { -unsigned int queue_index = txb->queue_index;unsigned long flags;int i;
@@ -2215,12 +2138,10 @@ static void ieee80211_resume_tx(struct ieee80211_device *ieee) } } -ieee80211_txb_free (ieee->tx_pending.txb); ieee->tx_pending.txb =NULL ; } -void ieee80211_reset_queue (struct ieee80211_device *ieee) {unsigned long flags;
@@ -2233,13 +2154,11 @@ void ieee80211_reset_queue(struct ieee80211_device *ieee) } ieee->queue_stop =0 ;spin_unlock_irqrestore (&ieee->lock, flags); - }EXPORT_SYMBOL (ieee80211_reset_queue);void ieee80211_wake_queue (struct ieee80211_device *ieee) { -unsigned long flags;struct sk_buff *skb;struct rtl_80211_hdr_3addr *header;
@@ -2272,7 +2191,6 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee) ieee->softmac_stats.swtxawake++;netif_wake_queue (ieee->dev); } - exit :spin_unlock_irqrestore (&ieee->lock, flags); }
@@ -2289,7 +2207,6 @@ void ieee80211_stop_queue(struct ieee80211_device *ieee) } ieee->queue_stop =1 ;//spin_unlock_irqrestore(&ieee->lock,flags); - }EXPORT_SYMBOL (ieee80211_stop_queue);
@@ -2332,7 +2249,6 @@ static void ieee80211_start_monitor_mode(struct ieee80211_device *ieee) }static void ieee80211_start_ibss_wq (struct work_struct *work) { -struct delayed_work *dwork =to_delayed_work (work); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq);/* iwconfig mode ad-hoc will schedule this and return
@@ -2357,7 +2273,6 @@ static void ieee80211_start_ibss_wq(struct work_struct *work)/* check if we have this cell in our network list */ ieee80211_softmac_check_all_nets (ieee); -// if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) if (ieee->state ==IEEE80211_NOLINK ) ieee->current_network.channel =6 ;
@@ -2392,7 +2307,6 @@ static void ieee80211_start_ibss_wq(struct work_struct *work) ieee->current_network.rates[1 ] =IEEE80211_BASIC_RATE_MASK |IEEE80211_CCK_RATE_2MB ; ieee->current_network.rates[2 ] =IEEE80211_BASIC_RATE_MASK |IEEE80211_CCK_RATE_5MB ; ieee->current_network.rates[3 ] =IEEE80211_BASIC_RATE_MASK |IEEE80211_CCK_RATE_11MB ; - }else ieee->current_network.rates_len =0 ;
@@ -2486,8 +2400,6 @@ void ieee80211_start_bss(struct ieee80211_device *ieee)/* called only in userspace context */ void ieee80211_disassociate (struct ieee80211_device *ieee) { - -netif_carrier_off (ieee->dev);if (ieee->softmac_features &IEEE_SOFTMAC_TX_QUEUE )ieee80211_reset_queue (ieee);
@@ -2501,7 +2413,6 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) ieee->link_change (ieee->dev);//HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); notify_wx_assoc_event (ieee); - }EXPORT_SYMBOL (ieee80211_disassociate);
@@ -2562,7 +2473,6 @@ struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee) b->header.frame_ctl =cpu_to_le16 (IEEE80211_STYPE_BEACON );return skb; - }struct sk_buff *ieee80211_get_beacon (struct ieee80211_device *ieee)
@@ -2653,7 +2563,6 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) ieee->init_wmmparam_flag =0 ;//reinitialize AC_xx_PARAM registers. -/* if the user set the MAC of the ad-hoc cell and then * switch to managed mode, shall we make sure that association * attempts does not fail just because the user provide the essid
@@ -2672,7 +2581,6 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee)ieee80211_start_monitor_mode (ieee); } -#define DRV_NAME "Ieee80211"void ieee80211_softmac_init (struct ieee80211_device *ieee) {
@@ -2724,7 +2632,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)timer_setup (&ieee->beacon_timer, ieee80211_send_beacon_cb,0 ); -INIT_DELAYED_WORK (&ieee->start_ibss_wq, ieee80211_start_ibss_wq);INIT_WORK (&ieee->associate_complete_wq, ieee80211_associate_complete_wq);INIT_WORK (&ieee->associate_procedure_wq, ieee80211_associate_procedure_wq);
@@ -2732,7 +2639,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)INIT_DELAYED_WORK (&ieee->associate_retry_wq, ieee80211_associate_retry_wq);INIT_WORK (&ieee->wx_sync_scan_wq, ieee80211_wx_sync_scan_wq); -mutex_init (&ieee->wx_mutex);mutex_init (&ieee->scan_mutex);
@@ -2742,7 +2648,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)tasklet_init (&ieee->ps_task, (void (*)(unsigned long )) ieee80211_sta_ps, (unsigned long )ieee); - }void ieee80211_softmac_free (struct ieee80211_device *ieee)
@@ -2761,8 +2666,6 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee)* Start of WPA code. * * this is stolen from the ipw2200 driver * ********************************************************/ - -static int ieee80211_wpa_enable (struct ieee80211_device *ieee,int value) {/* This is called when wpa_supplicant loads and closes the driver
@@ -2772,7 +2675,6 @@ static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value)return 0 ; } -static void ieee80211_wpa_assoc_frame (struct ieee80211_device *ieee,char *wpa_ie,int wpa_ie_len) {
@@ -2782,10 +2684,8 @@ static void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee,ieee80211_disassociate (ieee); } -static int ieee80211_wpa_mlme (struct ieee80211_device *ieee,int command,int reason) { -int ret =0 ;switch (command) {
@@ -2805,7 +2705,6 @@ static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int rereturn ret; } -static int ieee80211_wpa_set_wpa_ie (struct ieee80211_device *ieee,struct ieee_param *param,int plen) {
@@ -2839,7 +2738,6 @@ static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,static int ieee80211_wpa_set_auth_algs (struct ieee80211_device *ieee,int value) { -struct ieee80211_security sec = { .flags =SEC_AUTH_MODE , };
@@ -2859,7 +2757,6 @@ static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value) ieee->auth_mode =2 ; } -if (ieee->set_security) ieee->set_security (ieee->dev, &sec);//else
@@ -2943,7 +2840,6 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 v }/* implementation borrowed from hostap driver */ -static int ieee80211_wpa_set_encryption (struct ieee80211_device *ieee,struct ieee_param *param,int param_len) {
@@ -3117,7 +3013,6 @@ static inline struct sk_buff *ieee80211_disassociate_skb(return skb; } - void SendDisassociation( struct ieee80211_device *ieee,
Signature · 1 line
2.17.1
PATCH v2 5/9 staging: rtl8192u: Add space required around '==' opeartor - Style
In reply to John WhitmoreSimple addition of the coding style required spaces around '==' operator.
--- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +7 -7
@@ -193,8 +193,8 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)if (rate ==0 ) {/* 2005.01.26, by rcnjko. */ if (ieee->mode ==IEEE_A || - ieee->mode==IEEE_N_5G || - (ieee->mode==IEEE_N_24G &&!pHTInfo->bCurSuppCCK)) + ieee->mode ==IEEE_N_5G || + (ieee->mode ==IEEE_N_24G &&!pHTInfo->bCurSuppCCK)) rate =0x0c ;else rate =0x02 ;
@@ -1315,7 +1315,7 @@ static void ieee80211_associate_complete_wq(struct work_struct *work) } ieee->LinkDetectInfo.SlotNum =2 * (1 + ieee->current_network.beacon_interval/500 );// To prevent the immediately calling watch_dog after association. -if (ieee->LinkDetectInfo.NumRecvBcnInPeriod==0 ||ieee->LinkDetectInfo.NumRecvDataInPeriod==0 ) +if (ieee->LinkDetectInfo.NumRecvBcnInPeriod ==0 ||ieee->LinkDetectInfo.NumRecvDataInPeriod ==0 ) { ieee->LinkDetectInfo.NumRecvBcnInPeriod =1 ; ieee->LinkDetectInfo.NumRecvDataInPeriod=1 ;
@@ -1391,8 +1391,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee*/ apset = ieee->wap_set;//(memcmp(ieee->current_network.bssid, zero,ETH_ALEN)!=0 ); ssidset = ieee->ssid_set;//ieee->current_network.ssid[0] != '\0'; - ssidbroad = !(net->ssid_len ==0 || net->ssid[0 ]=='\0' ); - apmatch = (memcmp (ieee->current_network.bssid, net->bssid,ETH_ALEN )==0 ); + ssidbroad = !(net->ssid_len ==0 || net->ssid[0 ] =='\0' ); + apmatch = (memcmp (ieee->current_network.bssid, net->bssid,ETH_ALEN ) ==0 ); ssidmatch = (ieee->current_network.ssid_len == net->ssid_len)&&\ (!strncmp (ieee->current_network.ssid, net->ssid, net->ssid_len));
@@ -1595,8 +1595,8 @@ static inline u16 assoc_parse(struct ieee80211_device *ieee, struct sk_buff *skb *aid =le16_to_cpu (response_head->aid) &0x3fff ; status_code =le16_to_cpu (response_head->status); -if ((status_code==WLAN_STATUS_ASSOC_DENIED_RATES || \ - status_code==WLAN_STATUS_CAPS_UNSUPPORTED )&& +if ((status_code ==WLAN_STATUS_ASSOC_DENIED_RATES || \ + status_code ==WLAN_STATUS_CAPS_UNSUPPORTED )&& ((ieee->mode ==IEEE_G ) && (ieee->current_network.mode ==IEEE_N_24G ) && (ieee->AsocRetryCount++ < (RT_ASOC_RETRY_LIMIT -1 )))) {
Signature · 1 line
2.17.1
PATCH v2 6/9 staging: rtl8192u: Add required spaces around '||' operator - Sytle
In reply to John WhitmoreAdditon of the coding style required spaces around the '||' operator.
--- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +6 -6
@@ -192,8 +192,8 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)if (rate ==0 ) {/* 2005.01.26, by rcnjko. */ -if (ieee->mode ==IEEE_A || - ieee->mode ==IEEE_N_5G || +if (ieee->mode ==IEEE_A || + ieee->mode ==IEEE_N_5G || (ieee->mode ==IEEE_N_24G &&!pHTInfo->bCurSuppCCK)) rate =0x0c ;else
@@ -265,8 +265,8 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee ieee->seq_ctrl[0 ]++;/* check whether the managed packet queued greater than 5 */ -if (!ieee->check_nic_enough_desc (ieee->dev,tcb_desc->queue_index)||\ - (skb_queue_len (&ieee->skb_waitQ[tcb_desc->queue_index]) !=0 )||\ +if (!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
@@ -1315,7 +1315,7 @@ static void ieee80211_associate_complete_wq(struct work_struct *work) } ieee->LinkDetectInfo.SlotNum =2 * (1 + ieee->current_network.beacon_interval/500 );// To prevent the immediately calling watch_dog after association. -if (ieee->LinkDetectInfo.NumRecvBcnInPeriod ==0 ||ieee->LinkDetectInfo.NumRecvDataInPeriod ==0 ) +if (ieee->LinkDetectInfo.NumRecvBcnInPeriod ==0 || ieee->LinkDetectInfo.NumRecvDataInPeriod ==0 ) { ieee->LinkDetectInfo.NumRecvBcnInPeriod =1 ; ieee->LinkDetectInfo.NumRecvDataInPeriod=1 ;
@@ -2088,7 +2088,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *#else if ((skb_queue_len (&ieee->skb_waitQ[queue_index]) !=0 ) || #endif - (!ieee->check_nic_enough_desc (ieee->dev,queue_index))||\ + (!ieee->check_nic_enough_desc (ieee->dev,queue_index)) || \ (ieee->queue_stop)) {/* insert the skb packet to the wait queue */ /* as for the completion function, it does not need
Signature · 1 line
2.17.1
PATCH v2 7/9 staging: rtl8192u: Remove space after cast - Coding Style
In reply to John WhitmoreAccording to checkpatch - No space is necessary after a cast.
--- .../rtl8192u/ieee80211/ieee80211_softmac.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +15 -15
@@ -220,7 +220,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieeeunsigned long flags;short single = ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ;struct rtl_80211_hdr_3addr *header= - (struct rtl_80211_hdr_3addr *) skb->data; + (struct rtl_80211_hdr_3addr *)skb->data;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +8 );
@@ -287,7 +287,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee) {short single = ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ;struct rtl_80211_hdr_3addr *header = - (struct rtl_80211_hdr_3addr *) skb->data; + (struct rtl_80211_hdr_3addr *)skb->data;if (single){ header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );
@@ -710,9 +710,9 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d encrypt = ieee->host_encrypt && crypt && crypt->ops && ((0 ==strcmp (crypt->ops->name,"WEP" ) || wpa_ie_len));/* HT ralated element */ - tmp_ht_cap_buf =(u8 *) &(ieee->pHTInfo->SelfHTCap); + tmp_ht_cap_buf =(u8 *)&(ieee->pHTInfo->SelfHTCap); tmp_ht_cap_len =sizeof (ieee->pHTInfo->SelfHTCap); - tmp_ht_info_buf =(u8 *) &(ieee->pHTInfo->SelfHTInfo); + tmp_ht_info_buf =(u8 *)&(ieee->pHTInfo->SelfHTInfo); tmp_ht_info_len =sizeof (ieee->pHTInfo->SelfHTInfo);HTConstructCapabilityElement (ieee, tmp_ht_cap_buf, &tmp_ht_cap_len,encrypt);HTConstructInfoElement (ieee,tmp_ht_info_buf,&tmp_ht_info_len, encrypt);
@@ -765,7 +765,7 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d beacon_buf->info_element[0 ].id =MFIE_TYPE_SSID ; beacon_buf->info_element[0 ].len = ssid_len; - tag = (u8 *) beacon_buf->info_element[0 ].data; + tag = (u8 *)beacon_buf->info_element[0 ].data;memcpy (tag, ssid, ssid_len);
@@ -1493,7 +1493,7 @@ static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen)return 0xcafe ; } *challenge =NULL ; - a = (struct ieee80211_authentication *) skb->data; + a = (struct ieee80211_authentication *)skb->data;if (skb->len > (sizeof (struct ieee80211_authentication ) +3 )) { t = skb->data +sizeof (struct ieee80211_authentication );
@@ -1516,7 +1516,7 @@ static int auth_rq_parse(struct sk_buff *skb, u8 *dest)IEEE80211_DEBUG_MGMT ("invalid len in auth request: %d\n" ,skb->len);return -1 ; } - a = (struct ieee80211_authentication *) skb->data; + a = (struct ieee80211_authentication *)skb->data;memcpy (dest,a->header.addr2,ETH_ALEN );
@@ -1534,7 +1534,7 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb,u8 ssidlen =0 ;struct rtl_80211_hdr_3addr *header = - (struct rtl_80211_hdr_3addr *) skb->data; + (struct rtl_80211_hdr_3addr *)skb->data;if (skb->len <sizeof (struct rtl_80211_hdr_3addr ))return -1 ;/* corrupted */
@@ -1574,7 +1574,7 @@ static int assoc_rq_parse(struct sk_buff *skb, u8 *dest)return -1 ; } - a = (struct ieee80211_assoc_request_frame *) skb->data; + a = (struct ieee80211_assoc_request_frame *)skb->data;memcpy (dest,a->header.addr2,ETH_ALEN );
@@ -1591,7 +1591,7 @@ static inline u16 assoc_parse(struct ieee80211_device *ieee, struct sk_buff *skbreturn 0xcafe ; } - response_head = (struct ieee80211_assoc_response_frame *) skb->data; + response_head = (struct ieee80211_assoc_response_frame *)skb->data; *aid =le16_to_cpu (response_head->aid) &0x3fff ; status_code =le16_to_cpu (response_head->status);
@@ -1913,7 +1913,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats, u16 type, u16 stype) { - struct rtl_80211_hdr_3addr *header = (struct rtl_80211_hdr_3addr *) skb->data; + struct rtl_80211_hdr_3addr *header = (struct rtl_80211_hdr_3addr *)skb->data;u16 errcode;int aid;struct ieee80211_assoc_response_frame *assoc_resp;
@@ -2171,7 +2171,7 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee)if (ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ) {while (!ieee->queue_stop && (skb =dequeue_mgmt (ieee))){ - header = (struct rtl_80211_hdr_3addr *) skb->data; + header = (struct rtl_80211_hdr_3addr *)skb->data; header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );
@@ -2469,7 +2469,7 @@ struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee)if (!skb)return NULL ; - b = (struct ieee80211_probe_response *) skb->data; + b = (struct ieee80211_probe_response *)skb->data; b->header.frame_ctl =cpu_to_le16 (IEEE80211_STYPE_BEACON );return skb;
@@ -2484,7 +2484,7 @@ struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee)if (!skb)return NULL ; - b = (struct ieee80211_probe_response *) skb->data; + b = (struct ieee80211_probe_response *)skb->data; b->header.seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF )
@@ -2857,7 +2857,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN -1 ] ='\0' ;if (param_len != - (int ) ((char *) param->u.crypt.key - (char *) param) + + (int )((char *)param->u.crypt.key - (char *)param) + param->u.crypt.key_len) {printk ("Len mismatch %d, %d\n" , param_len, param->u.crypt.key_len);
Signature · 1 line
2.17.1
PATCH v2 8/9 staging: rtl8192u: Add required space around '=' operator - Style
In reply to John Whitmorecheckpatch requires spaces around '=' operator so added.
--- .../rtl8192u/ieee80211/ieee80211_softmac.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +25 -25
@@ -219,7 +219,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee {unsigned long flags;short single = ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ; -struct rtl_80211_hdr_3addr *header= +struct rtl_80211_hdr_3addr *header = (struct rtl_80211_hdr_3addr *)skb->data;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +8 );
@@ -686,12 +686,12 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *du8 erpinfo_content =0 ;u8 *tmp_ht_cap_buf; -u8 tmp_ht_cap_len=0 ; +u8 tmp_ht_cap_len =0 ;u8 *tmp_ht_info_buf; -u8 tmp_ht_info_len=0 ; +u8 tmp_ht_info_len =0 ;PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; -u8 *tmp_generic_ie_buf=NULL ; -u8 tmp_generic_ie_len=0 ; +u8 *tmp_generic_ie_buf =NULL ; +u8 tmp_generic_ie_len =0 ;if (rate_ex_len >0 ) rate_ex_len+=2 ;
@@ -710,9 +710,9 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d encrypt = ieee->host_encrypt && crypt && crypt->ops && ((0 ==strcmp (crypt->ops->name,"WEP" ) || wpa_ie_len));/* HT ralated element */ - tmp_ht_cap_buf =(u8 *)&(ieee->pHTInfo->SelfHTCap); + tmp_ht_cap_buf = (u8 *)&(ieee->pHTInfo->SelfHTCap); tmp_ht_cap_len =sizeof (ieee->pHTInfo->SelfHTCap); - tmp_ht_info_buf =(u8 *)&(ieee->pHTInfo->SelfHTInfo); + tmp_ht_info_buf = (u8 *)&(ieee->pHTInfo->SelfHTInfo); tmp_ht_info_len =sizeof (ieee->pHTInfo->SelfHTInfo);HTConstructCapabilityElement (ieee, tmp_ht_cap_buf, &tmp_ht_cap_len,encrypt);HTConstructInfoElement (ieee,tmp_ht_info_buf,&tmp_ht_info_len, encrypt);
@@ -858,7 +858,7 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, assoc->status =0 ; assoc->aid =cpu_to_le16 (ieee->assoc_id); -if (ieee->assoc_id ==0x2007 ) ieee->assoc_id=0 ; +if (ieee->assoc_id ==0x2007 ) ieee->assoc_id =0 ;else ieee->assoc_id++; tag =skb_put (skb, rate_len);
@@ -960,13 +960,13 @@ ieee80211_association_req(struct ieee80211_network *beacon,//unsigned int wpa_len = beacon->wpa_ie_len; //for HT u8 *ht_cap_buf =NULL ; -u8 ht_cap_len=0 ; -u8 *realtek_ie_buf=NULL ; -u8 realtek_ie_len=0 ; -int wpa_ie_len= ieee->wpa_ie_len; -unsigned int ckip_ie_len=0 ; -unsigned int ccxrm_ie_len=0 ; -unsigned int cxvernum_ie_len=0 ; +u8 ht_cap_len =0 ; +u8 *realtek_ie_buf =NULL ; +u8 realtek_ie_len =0 ; +int wpa_ie_len = ieee->wpa_ie_len; +unsigned int ckip_ie_len =0 ; +unsigned int ccxrm_ie_len =0 ; +unsigned int cxvernum_ie_len =0 ;struct ieee80211_crypt_data *crypt;int encrypt;
@@ -1221,7 +1221,7 @@ static void ieee80211_associate_step1(struct ieee80211_device *ieee)IEEE80211_DEBUG_MGMT ("Stopping scan\n" ); ieee->softmac_stats.tx_auth_rq++; - skb=ieee80211_authentication_req (beacon, ieee,0 ); + skb =ieee80211_authentication_req (beacon, ieee,0 );if (!skb)ieee80211_associate_abort (ieee);
@@ -1280,7 +1280,7 @@ static void ieee80211_associate_step2(struct ieee80211_device *ieee)IEEE80211_DEBUG_MGMT ("Sending association request\n" ); ieee->softmac_stats.tx_ass_rq++; - skb=ieee80211_association_req (beacon, ieee); + skb =ieee80211_association_req (beacon, ieee);if (!skb)ieee80211_associate_abort (ieee);else {
@@ -1318,7 +1318,7 @@ static void ieee80211_associate_complete_wq(struct work_struct *work)if (ieee->LinkDetectInfo.NumRecvBcnInPeriod ==0 || ieee->LinkDetectInfo.NumRecvDataInPeriod ==0 ) { ieee->LinkDetectInfo.NumRecvBcnInPeriod =1 ; - ieee->LinkDetectInfo.NumRecvDataInPeriod=1 ; + ieee->LinkDetectInfo.NumRecvDataInPeriod =1 ; } ieee->link_change (ieee->dev);if (!ieee->is_silent_reset) {
@@ -1530,7 +1530,7 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb, {u8 *tag;u8 *skbend; -u8 *ssid=NULL ; +u8 *ssid =NULL ;u8 ssidlen =0 ; struct rtl_80211_hdr_3addr *header =
@@ -1945,7 +1945,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, errcode =assoc_parse (ieee, skb, &aid);if (!errcode) { - ieee->state=IEEE80211_LINKED ; + ieee->state =IEEE80211_LINKED ; ieee->assoc_id = aid; ieee->softmac_stats.rx_ass_ok++;/* station support qos */
@@ -2597,8 +2597,8 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)IEEE80211_DEBUG (IEEE80211_DL_ERR ,"can't alloc memory for DOT11D\n" );//added for AP roaming ieee->LinkDetectInfo.SlotNum =2 ; - ieee->LinkDetectInfo.NumRecvBcnInPeriod=0 ; - ieee->LinkDetectInfo.NumRecvDataInPeriod=0 ; + ieee->LinkDetectInfo.NumRecvBcnInPeriod =0 ; + ieee->LinkDetectInfo.NumRecvDataInPeriod =0 ; ieee->assoc_id =0 ; ieee->queue_stop =0 ;
@@ -2611,9 +2611,9 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) ieee->rate =22 ; ieee->ps =IEEE80211_PS_DISABLED ; ieee->sta_sleep =0 ; - ieee->Regdot11HTOperationalRateSet[0 ]=0xff ;//support MCS 0~7 - ieee->Regdot11HTOperationalRateSet[1 ]=0xff ;//support MCS 8~15 - ieee->Regdot11HTOperationalRateSet[4 ]=0x01 ; + ieee->Regdot11HTOperationalRateSet[0 ] =0xff ;//support MCS 0~7 + ieee->Regdot11HTOperationalRateSet[1 ] =0xff ;//support MCS 8~15 + ieee->Regdot11HTOperationalRateSet[4 ] =0x01 ;//added by amy ieee->actscanning = false; ieee->beinretry = false;
Signature · 1 line
2.17.1
PATCH v2 9/9 staging: rtl8192u: Add space after ',' character - Coding Style
In reply to John Whitmorecheckpatch requires a space after ',' - Added.
--- .../rtl8192u/ieee80211/ieee80211_softmac.c | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +31 -26
@@ -248,7 +248,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee/* avoid watchdog triggers */ netif_trans_update (ieee->dev); - ieee->softmac_data_hard_start_xmit (skb,ieee->dev,ieee->basic_rate); + ieee->softmac_data_hard_start_xmit (skb, ieee->dev, ieee->basic_rate);//dev_kfree_skb_any(skb);//edit by thomas }
@@ -265,14 +265,14 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee ieee->seq_ctrl[0 ]++;/* check whether the managed packet queued greater than 5 */ -if (!ieee->check_nic_enough_desc (ieee->dev,tcb_desc->queue_index) ||\ +if (!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 * to check it any more. * */ -printk ("%s():insert to waitqueue!\n" ,__func__); +printk ("%s():insert to waitqueue!\n" , __func__);skb_queue_tail (&ieee->skb_waitQ[tcb_desc->queue_index], skb); }else { ieee->softmac_hard_start_xmit (skb, ieee->dev);
@@ -299,7 +299,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)/* avoid watchdog triggers */ netif_trans_update (ieee->dev); - ieee->softmac_data_hard_start_xmit (skb,ieee->dev,ieee->basic_rate); + ieee->softmac_data_hard_start_xmit (skb, ieee->dev, ieee->basic_rate); }else { header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );
@@ -347,8 +347,8 @@ static inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)memcpy (tag, ieee->current_network.ssid, len); tag += len; -ieee80211_MFIE_Brate (ieee,&tag); -ieee80211_MFIE_Grate (ieee,&tag); +ieee80211_MFIE_Brate (ieee, &tag); +ieee80211_MFIE_Grate (ieee, &tag);return skb; }
@@ -523,7 +523,7 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)static void ieee80211_beacons_start (struct ieee80211_device *ieee) {unsigned long flags; -spin_lock_irqsave (&ieee->beacon_lock,flags); +spin_lock_irqsave (&ieee->beacon_lock, flags); ieee->beacon_txing =1 ;ieee80211_send_beacon (ieee);
@@ -659,7 +659,7 @@ ieee80211_authentication_req(struct ieee80211_network *beacon, auth->algorithm =cpu_to_le16 (WLAN_AUTH_SHARED_KEY ); else if(ieee->auth_mode == 2) auth->algorithm = WLAN_AUTH_OPEN; /* 0x80; */ -printk ("=================>%s():auth->algorithm is %d\n" ,__func__,auth->algorithm); +printk ("=================>%s():auth->algorithm is %d\n" , __func__, auth->algorithm); auth->transaction =cpu_to_le16 (ieee->associate_seq); ieee->associate_seq++;
@@ -714,8 +714,8 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d tmp_ht_cap_len =sizeof (ieee->pHTInfo->SelfHTCap); tmp_ht_info_buf = (u8 *)&(ieee->pHTInfo->SelfHTInfo); tmp_ht_info_len =sizeof (ieee->pHTInfo->SelfHTInfo); -HTConstructCapabilityElement (ieee, tmp_ht_cap_buf, &tmp_ht_cap_len,encrypt); -HTConstructInfoElement (ieee,tmp_ht_info_buf,&tmp_ht_info_len, encrypt); +HTConstructCapabilityElement (ieee, tmp_ht_cap_buf, &tmp_ht_cap_len, encrypt); +HTConstructInfoElement (ieee, tmp_ht_info_buf, &tmp_ht_info_len, encrypt);if (pHTInfo->bRegRT2RTAggregation) {
@@ -742,7 +742,7 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dreturn NULL ;skb_reserve (skb, ieee->tx_headroom); beacon_buf =skb_put (skb, (beacon_size - ieee->tx_headroom)); -memcpy (beacon_buf->header.addr1, dest,ETH_ALEN ); +memcpy (beacon_buf->header.addr1, dest,ETH_ALEN );memcpy (beacon_buf->header.addr2, ieee->dev->dev_addr,ETH_ALEN );memcpy (beacon_buf->header.addr3, ieee->current_network.bssid,ETH_ALEN );
@@ -838,7 +838,7 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, assoc =skb_put (skb,sizeof (struct ieee80211_assoc_response_frame )); assoc->header.frame_ctl =cpu_to_le16 (IEEE80211_STYPE_ASSOC_RESP ); -memcpy (assoc->header.addr1, dest,ETH_ALEN ); +memcpy (assoc->header.addr1, dest,ETH_ALEN );memcpy (assoc->header.addr3, ieee->dev->dev_addr,ETH_ALEN );memcpy (assoc->header.addr2, ieee->dev->dev_addr,ETH_ALEN ); assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
@@ -979,7 +979,7 @@ ieee80211_association_req(struct ieee80211_network *beacon,int len =0 ; crypt = ieee->crypt[ieee->tx_keyidx]; - encrypt = ieee->host_encrypt && crypt && crypt->ops && ((0 ==strcmp (crypt->ops->name,"WEP" ) || wpa_ie_len)); + encrypt = ieee->host_encrypt && crypt && crypt->ops && ((0 ==strcmp (crypt->ops->name,"WEP" ) || wpa_ie_len));/* Include High Throuput capability && Realtek proprietary */ if (ieee->pHTInfo->bCurrentHTSupport&&ieee->pHTInfo->bEnableHT)
@@ -1419,7 +1419,12 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieeestrncpy (ieee->current_network.ssid, tmp_ssid,IW_ESSID_MAX_SIZE ); ieee->current_network.ssid_len = tmp_ssid_len; -printk (KERN_INFO "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d\n" ,ieee->current_network.ssid,ieee->current_network.channel, ieee->current_network.qos_data.supported, ieee->pHTInfo->bEnableHT, ieee->current_network.bssht.bdSupportHT); +printk (KERN_INFO "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d\n" , + ieee->current_network.ssid, + ieee->current_network.channel, + ieee->current_network.qos_data.supported, + ieee->pHTInfo->bEnableHT, + ieee->current_network.bssht.bdSupportHT);//ieee->pHTInfo->IOTAction = 0; HTResetIOTSetting (ieee->pHTInfo);
@@ -1489,7 +1494,7 @@ static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen)struct ieee80211_authentication *a;u8 *t;if (skb->len < (sizeof (struct ieee80211_authentication ) -sizeof (struct ieee80211_info_element ))) { -IEEE80211_DEBUG_MGMT ("invalid len in auth resp: %d\n" ,skb->len); +IEEE80211_DEBUG_MGMT ("invalid len in auth resp: %d\n" , skb->len);return 0xcafe ; } *challenge =NULL ;
@@ -1513,12 +1518,12 @@ static int auth_rq_parse(struct sk_buff *skb, u8 *dest)struct ieee80211_authentication *a;if (skb->len < (sizeof (struct ieee80211_authentication ) -sizeof (struct ieee80211_info_element ))) { -IEEE80211_DEBUG_MGMT ("invalid len in auth request: %d\n" ,skb->len); +IEEE80211_DEBUG_MGMT ("invalid len in auth request: %d\n" , skb->len);return -1 ; } a = (struct ieee80211_authentication *)skb->data; -memcpy (dest,a->header.addr2,ETH_ALEN ); +memcpy (dest, a->header.addr2,ETH_ALEN );if (le16_to_cpu (a->algorithm) !=WLAN_AUTH_OPEN )return WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG ;
@@ -1539,7 +1544,7 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb,if (skb->len <sizeof (struct rtl_80211_hdr_3addr ))return -1 ;/* corrupted */ -memcpy (src,header->addr2,ETH_ALEN ); +memcpy (src, header->addr2,ETH_ALEN ); skbend = (u8 *)skb->data + skb->len;
@@ -1576,7 +1581,7 @@ static int assoc_rq_parse(struct sk_buff *skb, u8 *dest) a = (struct ieee80211_assoc_request_frame *)skb->data; -memcpy (dest,a->header.addr2,ETH_ALEN ); +memcpy (dest, a->header.addr2,ETH_ALEN );return 0 ; }
@@ -1733,7 +1738,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)spin_unlock_irqrestore (&ieee->mgmt_tx_lock, flags2); } - sleep =ieee80211_sta_ps_sleep (ieee,&th, &tl); + sleep =ieee80211_sta_ps_sleep (ieee, &th, &tl);/* 2 wake, 1 sleep, 0 do nothing */ if (sleep ==0 ) goto out;
@@ -1802,7 +1807,7 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success)/* Null frame with PS bit set */ if (success) { ieee->sta_sleep =1 ; - ieee->enter_sleep_state (ieee->dev,ieee->ps_th,ieee->ps_tl); + ieee->enter_sleep_state (ieee->dev, ieee->ps_th, ieee->ps_tl); }/* if the card report not success we can't be sure the AP * has not RXed so we can't assume the AP believe us awake
@@ -1953,9 +1958,9 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,if (ieee->qos_support) { assoc_resp = (struct ieee80211_assoc_response_frame *)skb->data;memset (network,0 ,sizeof (*network)); -if (ieee80211_parse_info_param (ieee,assoc_resp->info_element,\ +if (ieee80211_parse_info_param (ieee, assoc_resp->info_element,\ rx_stats->len -sizeof (*assoc_resp),\ - network,rx_stats)){ + network, rx_stats)){return 1 ; }else
@@ -2088,7 +2093,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *#else if ((skb_queue_len (&ieee->skb_waitQ[queue_index]) !=0 ) || #endif - (!ieee->check_nic_enough_desc (ieee->dev,queue_index)) || \ + (!ieee->check_nic_enough_desc (ieee->dev, queue_index)) || \ (ieee->queue_stop)) {/* insert the skb packet to the wait queue */ /* as for the completion function, it does not need
@@ -2180,7 +2185,7 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee)else ieee->seq_ctrl[0 ]++; - ieee->softmac_data_hard_start_xmit (skb,ieee->dev,ieee->basic_rate); + ieee->softmac_data_hard_start_xmit (skb, ieee->dev, ieee->basic_rate);//dev_kfree_skb_any(skb);//edit by thomas } }
@@ -3071,7 +3076,7 @@ int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_poinbreak ;default : -printk ("Unknown WPA supplicant request: %d\n" ,param->cmd); +printk ("Unknown WPA supplicant request: %d\n" , param->cmd); ret = -EOPNOTSUPP ;break ; }
Signature · 1 line
2.17.1