staging: rtl8188eu: Remove unused function rtw_use_tkipkey_handler()
PATCH 1/16 staging: rtl8188eu: Remove unused function rtw_use_tkipkey_handler()
--- drivers/staging/rtl8188eu/core/rtw_security.c | 25 ---------------------- drivers/staging/rtl8188eu/include/rtw_security.h | 1 - 2 files changed, 26 deletions(-)
drivers/staging/rtl8188eu/core/rtw_security.c +0 -25
@@ -1679,28 +1679,3 @@ do { \ d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \ d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]; \ } while (0); - -/** -* omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) -* @key: 128-bit key for the hash operation -* @data: Data buffer for which a MAC is determined -* @data_len: Length of data buffer in bytes -* @mac: Buffer for MAC (128 bits, i.e., 16 bytes) -* Returns: 0 on success, -1 on failure -* -* This is a mode for using block cipher (AES in this case) for authentication. -* OMAC1 was standardized with the name CMAC by NIST in a Special Publication -* (SP) 800-38B. -*/ -void rtw_use_tkipkey_handler (void *FunctionContext) -{ -struct adapter *padapter = (struct adapter *)FunctionContext; - - -RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler ^^^\n" )); - - padapter->securitypriv.busetkipkey = true; - -RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n" , padapter->securitypriv.busetkipkey)); - -}
drivers/staging/rtl8188eu/include/rtw_security.h +0 -1
@@ -378,6 +378,5 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe);u32 rtw_aes_decrypt (struct adapter *padapter,u8 *precvframe);u32 rtw_tkip_decrypt (struct adapter *padapter,u8 *precvframe);void rtw_wep_decrypt (struct adapter *padapter,u8 *precvframe); -void rtw_use_tkipkey_handler (void *FunctionContext);#endif /* __RTL871X_SECURITY_H_ */
Signature · 1 line
1.7.10.4
PATCH 2/16 staging: rtl8188eu: Remove function rtw_set_channel_plan()
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 15 +-------------- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - 2 files changed, 1 insertion(+), 15 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +1 -14
@@ -1092,19 +1092,6 @@ int rtw_set_scan_mode(struct adapter *adapter, enum rt_scan_type scan_mode) }/* -* rtw_set_channel_plan - -* @adapter: pointer to struct adapter structure -* @channel_plan: -* -* Return _SUCCESS or _FAIL -*/ -int rtw_set_channel_plan (struct adapter *adapter,u8 channel_plan) -{ -/* handle by cmd_thread to sync with scan operation */ -return rtw_set_chplan_cmd (adapter, channel_plan,1 ); -} - -/* * rtw_set_country - * @adapter: pointer to struct adapter structure * @country_code: string of country code
@@ -1130,5 +1117,5 @@ int rtw_set_country(struct adapter *adapter, const char *country_code)else DBG_88E ("%s unknown country_code:%s\n" , __func__, country_code); -return rtw_set_channel_plan (adapter, channel_plan); +return rtw_set_chplan_cmd (adapter, channel_plan,1 ); }
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -1
@@ -43,7 +43,6 @@ u8 rtw_set_802_11_remove_key(struct adapter *adapt,u8 rtw_validate_ssid (struct ndis_802_11_ssid *ssid);u16 rtw_get_cur_max_rate (struct adapter *adapter);int rtw_set_scan_mode (struct adapter *adapter,enum rt_scan_type scan_mode); -int rtw_set_channel_plan (struct adapter *adapter,u8 channel_plan);int rtw_set_country (struct adapter *adapter,const char *country_code);#endif
Signature · 1 line
1.7.10.4
PATCH 3/16 staging: rtl8188eu: Remove unused function rtw_set_scan_mode()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 17 ----------------- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - 2 files changed, 18 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -17
@@ -1075,23 +1075,6 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) }/* -* rtw_set_scan_mode - -* @adapter: pointer to struct adapter structure -* @scan_mode: -* -* Return _SUCCESS or _FAIL -*/ -int rtw_set_scan_mode (struct adapter *adapter,enum rt_scan_type scan_mode) -{ -if (scan_mode !=SCAN_ACTIVE && scan_mode !=SCAN_PASSIVE ) -return _FAIL; - - adapter->mlmepriv.scan_mode = scan_mode; - -return _SUCCESS; -} - -/* * rtw_set_country - * @adapter: pointer to struct adapter structure * @country_code: string of country code
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -1
@@ -42,7 +42,6 @@ u8 rtw_set_802_11_remove_key(struct adapter *adapt, struct ndis_802_11_remove_key *key);u8 rtw_validate_ssid (struct ndis_802_11_ssid *ssid);u16 rtw_get_cur_max_rate (struct adapter *adapter); -int rtw_set_scan_mode (struct adapter *adapter,enum rt_scan_type scan_mode);int rtw_set_country (struct adapter *adapter,const char *country_code);#endif
Signature · 1 line
1.7.10.4
PATCH 4/16 staging: rtl8188eu: Remove unused function rtw_validate_ssid()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 26 --------------------- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - 2 files changed, 27 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -26
@@ -34,32 +34,6 @@ extern void indicate_wx_scan_complete_event(struct adapter *padapter); (addr[4] == 0xff) && (addr[5] == 0xff)) ? true : false \ ) -u8 rtw_validate_ssid (struct ndis_802_11_ssid *ssid) -{ -u8 i; -u8 ret = true; - - -if (ssid->SsidLength >32 ) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n" )); - ret = false; - goto exit; - } - -for (i =0 ; i < ssid->SsidLength; i++) { -/* wifi, printable ascii code must be supported */ -if (!((ssid->Ssid[i] >=0x20 ) && (ssid->Ssid[i] <=0x7e ))) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n" )); - ret = false; -break ; - } - } - -exit: - -return ret; -} -u8 rtw_do_join (struct adapter *padapter) {struct list_head *plist, *phead;
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -1
@@ -40,7 +40,6 @@ u8 rtw_set_802_11_remove_wep(struct adapter *adapter, u32 keyindex);u8 rtw_set_802_11_ssid (struct adapter *adapt,struct ndis_802_11_ssid *ssid);u8 rtw_set_802_11_remove_key (struct adapter *adapt,struct ndis_802_11_remove_key *key); -u8 rtw_validate_ssid (struct ndis_802_11_ssid *ssid);u16 rtw_get_cur_max_rate (struct adapter *adapter);int rtw_set_country (struct adapter *adapter,const char *country_code);
Signature · 1 line
1.7.10.4
PATCH 5/16 staging: rtl8188eu: Remove unused function rtw_set_802_11_add_key()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 352 --------------------- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - 2 files changed, 353 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -352
@@ -591,358 +591,6 @@ exit:return ret; } -u8 rtw_set_802_11_add_key (struct adapter *padapter,struct ndis_802_11_key *key) -{ -uint encryptionalgo; -u8 *pbssid; -struct sta_info *stainfo; -u8 bgroup = false; -u8 bgrouptkey = false;/* can be removed later */ -u8 ret = _SUCCESS; - - -if (((key->KeyIndex &0x80000000 ) ==0 ) && ((key->KeyIndex &0x40000000 ) >0 )) { -/* It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */ -/* it must fail the request and return NDIS_STATUS_INVALID_DATA. */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, - ("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000)==0)[=%d]" , - (int )(key->KeyIndex &0x80000000 ) ==0 )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, - ("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000)>0)[=%d]" , - (int )(key->KeyIndex &0x40000000 ) >0 )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, - ("rtw_set_802_11_add_key: key->KeyIndex=%d\n" , - (int )key->KeyIndex)); - ret = _FAIL; - goto exit; - } - -if (key->KeyIndex &0x40000000 ) { -/* Pairwise key */ - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ Pairwise key +++++\n" )); - - pbssid =get_bssid (&padapter->mlmepriv); - stainfo =rtw_get_stainfo (&padapter->stapriv, pbssid); - -if ((stainfo !=NULL ) && (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("OID_802_11_ADD_KEY:(stainfo!=NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)\n" )); - encryptionalgo = stainfo->dot118021XPrivacy; - }else { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: stainfo == NULL)||(Adapter->securitypriv.dot11AuthAlgrthm!= dot11AuthAlgrthm_8021X)\n" )); - encryptionalgo = padapter->securitypriv.dot11PrivacyAlgrthm; - } - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("rtw_set_802_11_add_key: (encryptionalgo==%d)!\n" , - encryptionalgo)); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11PrivacyAlgrthm==%d)!\n" , - padapter->securitypriv.dot11PrivacyAlgrthm)); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11AuthAlgrthm==%d)!\n" , - padapter->securitypriv.dot11AuthAlgrthm)); - -if ((stainfo !=NULL )) -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy==%d)!\n" , - stainfo->dot118021XPrivacy)); - -if (key->KeyIndex &0x000000FF ) { -/* The key index is specified in the lower 8 bits by values of zero to 255. */ -/* The key index should be set to zero for a Pairwise key, and the driver should fail with */ -/* NDIS_STATUS_INVALID_DATA if the lower 8 bits is not zero */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, (" key->KeyIndex & 0x000000FF.\n" )); - ret = _FAIL; - goto exit; - } - -/* check BSSID */ -if (IS_MAC_ADDRESS_BROADCAST (key->BSSID) == true) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("MacAddr_isBcst(key->BSSID)\n" )); - ret = false; - goto exit; - } - -/* Check key length for TKIP. */ -if ((encryptionalgo == _TKIP_) && (key->KeyLength !=32 )) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("TKIP KeyLength:0x%x != 32\n" , key->KeyLength)); - ret = _FAIL; - goto exit; - } - -/* Check key length for AES. */ -if ((encryptionalgo == _AES_) && (key->KeyLength !=16 )) { -/* For our supplicant, EAPPkt9x.vxd, cannot differentiate TKIP and AES case. */ -if (key->KeyLength ==32 ) { - key->KeyLength =16 ; - }else { - ret = _FAIL; - goto exit; - } - } - -/* Check key length for WEP. For NDTEST, 2005.01.27, by rcnjko. */ -if ((encryptionalgo == _WEP40_ || encryptionalgo == _WEP104_) && - (key->KeyLength !=5 && key->KeyLength !=13 )) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("WEP KeyLength:0x%x != 5 or 13\n" , key->KeyLength)); - ret = _FAIL; - goto exit; - } - - bgroup = false; - -/* Check the pairwise key. Added by Annie, 2005-07-06. */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("[Pairwise Key set]\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("key index: 0x%8x(0x%8x)\n" , key->KeyIndex, (key->KeyIndex&0x3 ))); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("key Length: %d\n" , key->KeyLength)); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n" )); - - }else { -/* Group key - KeyIndex(BIT30 == 0) */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ Group key +++++\n" )); - - -/* when add wep key through add key and didn't assigned encryption type before */ -if ((padapter->securitypriv.ndisauthtype <=3 ) && - (padapter->securitypriv.dot118021XGrpPrivacy ==0 )) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("keylen =%d(Adapter->securitypriv.dot11PrivacyAlgrthm=%x )padapter->securitypriv.dot118021XGrpPrivacy(%x)\n" , - key->KeyLength, padapter->securitypriv.dot11PrivacyAlgrthm, - padapter->securitypriv.dot118021XGrpPrivacy)); -switch (key->KeyLength) { -case 5 : - padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("Adapter->securitypriv.dot11PrivacyAlgrthm=%x key->KeyLength=%u\n" , - padapter->securitypriv.dot11PrivacyAlgrthm, key->KeyLength)); -break ; -case 13 : - padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("Adapter->securitypriv.dot11PrivacyAlgrthm=%x key->KeyLength=%u\n" , - padapter->securitypriv.dot11PrivacyAlgrthm, key->KeyLength)); -break ; -default : - padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("Adapter->securitypriv.dot11PrivacyAlgrthm=%x key->KeyLength=%u\n" , - padapter->securitypriv.dot11PrivacyAlgrthm, key->KeyLength)); -break ; - } - - encryptionalgo = padapter->securitypriv.dot11PrivacyAlgrthm; - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - (" Adapter->securitypriv.dot11PrivacyAlgrthm=%x\n" , - padapter->securitypriv.dot11PrivacyAlgrthm)); - - }else { - encryptionalgo = padapter->securitypriv.dot118021XGrpPrivacy; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("(Adapter->securitypriv.dot11PrivacyAlgrthm=%x)encryptionalgo(%x)=padapter->securitypriv.dot118021XGrpPrivacy(%x)keylen=%d\n" , - padapter->securitypriv.dot11PrivacyAlgrthm, encryptionalgo, - padapter->securitypriv.dot118021XGrpPrivacy, key->KeyLength)); - } - -if ((check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE ) == true) && (IS_MAC_ADDRESS_BROADCAST (key->BSSID) == false)) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - (" IBSS but BSSID is not Broadcast Address.\n" )); - ret = _FAIL; - goto exit; - } - -/* Check key length for TKIP */ -if ((encryptionalgo == _TKIP_) && (key->KeyLength !=32 )) { -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - (" TKIP GTK KeyLength:%u != 32\n" , key->KeyLength)); - ret = _FAIL; - goto exit; - }else if (encryptionalgo == _AES_ && (key->KeyLength !=16 && key->KeyLength !=32 )) { -/* Check key length for AES */ -/* For NDTEST, we allow keylen = 32 in this case. 2005.01.27, by rcnjko. */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("<=== SetInfo, OID_802_11_ADD_KEY: AES GTK KeyLength:%u != 16 or 32\n" , - key->KeyLength)); - ret = _FAIL; - goto exit; - } - -/* Change the key length for EAPPkt9x.vxd. Added by Annie, 2005-11-03. */ -if ((encryptionalgo == _AES_) && (key->KeyLength ==32 )) { - key->KeyLength =16 ; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("AES key length changed: %u\n" , key->KeyLength)); - } - -if (key->KeyIndex &0x8000000 ) {/* error ??? 0x8000_0000 */ - bgrouptkey = true; - } - -if ((check_fwstate (&padapter->mlmepriv,WIFI_ADHOC_STATE )) && - (check_fwstate (&padapter->mlmepriv, _FW_LINKED))) - bgrouptkey = true; - bgroup = true; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("[Group Key set]\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n" )) ; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("key index: 0x%8x(0x%8x)\n" , key->KeyIndex, (key->KeyIndex&0x3 ))); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("key Length: %d\n" , key->KeyLength)) ; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n" )); - } - -/* If WEP encryption algorithm, just call rtw_set_802_11_add_wep(). */ -if ((padapter->securitypriv.dot11AuthAlgrthm != dot11AuthAlgrthm_8021X) && - (encryptionalgo == _WEP40_ || encryptionalgo == _WEP104_)) { -u32 keyindex; - u32 len = FIELD_OFFSET(struct ndis_802_11_key, KeyMaterial) + key->KeyLength; -struct ndis_802_11_wep *wep = &padapter->securitypriv.ndiswep; - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ WEP key +++++\n" )); - - wep->Length = len; - keyindex = key->KeyIndex&0x7fffffff ; - wep->KeyIndex = keyindex ; - wep->KeyLength = key->KeyLength; - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY:Before memcpy\n" )); - -memcpy (wep->KeyMaterial, key->KeyMaterial, key->KeyLength); -memcpy (&(padapter->securitypriv.dot11DefKey[keyindex].skey[0 ]), key->KeyMaterial, key->KeyLength); - - padapter->securitypriv.dot11DefKeylen[keyindex] = key->KeyLength; - padapter->securitypriv.dot11PrivacyKeyIndex = keyindex; - - ret =rtw_set_802_11_add_wep (padapter, wep); - goto exit; - } -if (key->KeyIndex &0x20000000 ) { -/* SetRSC */ -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n" )); -if (bgroup) { -unsigned long long keysrc = key->KeyRSC &0x00FFFFFFFFFFFFULL ; -memcpy (&padapter->securitypriv.dot11Grprxpn, &keysrc,8 ); - }else { -unsigned long long keysrc = key->KeyRSC &0x00FFFFFFFFFFFFULL ; -memcpy (&padapter->securitypriv.dot11Grptxpn, &keysrc,8 ); - } - } - -/* Indicate this key idx is used for TX */ -/* Save the key in KeyMaterial */ -if (bgroup) {/* Group transmit key */ -int res; - -if (bgrouptkey) - padapter->securitypriv.dot118021XGrpKeyid = (u8 )key->KeyIndex; -if ((key->KeyIndex&0x3 ) ==0 ) { - ret = _FAIL; - goto exit; - } -memset (&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); -memset (&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); -memset (&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )],0 ,16 ); - -if ((key->KeyIndex &0x10000000 )) { -memcpy (&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) &0x03 )], key->KeyMaterial +16 ,8 ); -memcpy (&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )], key->KeyMaterial +24 ,8 ); - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n" , - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[0 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[1 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[2 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[3 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[4 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[5 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[6 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[7 ])); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n" )); - }else { -memcpy (&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) &0x03 )], key->KeyMaterial +24 ,8 ); -memcpy (&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )], key->KeyMaterial +16 ,8 ); - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n" , - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[0 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[1 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[2 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[3 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[4 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[5 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) &0x03 )].skey[6 ], - padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1 ) &0x03 )].skey[7 ])); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, - ("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n" )); - } - -/* set group key by index */ -memcpy (&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) &0x03 )], key->KeyMaterial, key->KeyLength); - - key->KeyIndex = key->KeyIndex &0x03 ; - - padapter->securitypriv.binstallGrpkey = true; - - padapter->securitypriv.bcheck_grpkey = false; - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("reset group key" )); - - res =rtw_set_key (padapter, &padapter->securitypriv, key->KeyIndex,1 ); - -if (res == _FAIL) - ret = _FAIL; - - goto exit; - - }else {/* Pairwise Key */ -u8 res; - - pbssid =get_bssid (&padapter->mlmepriv); - stainfo =rtw_get_stainfo (&padapter->stapriv, pbssid); - -if (stainfo !=NULL ) { -memset (&stainfo->dot118021x_UncstKey,0 ,16 );/* clear keybuffer */ - -memcpy (&stainfo->dot118021x_UncstKey, key->KeyMaterial,16 ); - -if (encryptionalgo == _TKIP_) { - padapter->securitypriv.busetkipkey = false; - -/* _set_timer(&padapter->securitypriv.tkip_timer, 50); */ - -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n========== _set_timer\n" )); - -/* if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255] */ -if ((key->KeyIndex &0x10000000 )) { -memcpy (&stainfo->dot11tkiptxmickey, key->KeyMaterial +16 ,8 ); -memcpy (&stainfo->dot11tkiprxmickey, key->KeyMaterial +24 ,8 ); - - }else { -memcpy (&stainfo->dot11tkiptxmickey, key->KeyMaterial +24 ,8 ); -memcpy (&stainfo->dot11tkiprxmickey, key->KeyMaterial +16 ,8 ); - } - } - - -/* Set key to CAM through H2C command */ -if (bgrouptkey) {/* never go to here */ - res =rtw_setstakey_cmd (padapter, (unsigned char *)stainfo, false); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n" )); - }else { - res =rtw_setstakey_cmd (padapter, (unsigned char *)stainfo, true); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n" )); - } -if (!res) - ret = _FAIL; - } - } -exit: - -return ret; -} -u8 rtw_set_802_11_remove_key (struct adapter *padapter,struct ndis_802_11_remove_key *key) {u8 *pbssid;
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -1
@@ -25,7 +25,6 @@typedef u8 NDIS_802_11_PMKID_VALUE [16 ]; -u8 rtw_set_802_11_add_key (struct adapter *adapt,struct ndis_802_11_key *key);u8 rtw_set_802_11_authentication_mode (struct adapter *adapt,enum ndis_802_11_auth_mode authmode);u8 rtw_set_802_11_bssid (struct adapter *adapter,u8 *bssid);
Signature · 1 line
1.7.10.4
PATCH 6/16 staging: rtl8188eu: Remove unused function rtw_set_802_11_remove_key()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 38 --------------------- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 2 -- 2 files changed, 40 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -38
@@ -591,44 +591,6 @@ exit:return ret; } -u8 rtw_set_802_11_remove_key (struct adapter *padapter,struct ndis_802_11_remove_key *key) -{ -u8 *pbssid; -struct sta_info *stainfo; -u8 bgroup = (key->KeyIndex &0x4000000 ) >0 ? false : true; -u8 keyIndex = (u8 )key->KeyIndex &0x03 ; -u8 ret = _SUCCESS; - - -if ((key->KeyIndex &0xbffffffc ) >0 ) { - ret = _FAIL; - goto exit; - } - -if (bgroup) { -/* clear group key by index */ - -memset (&padapter->securitypriv.dot118021XGrpKey[keyIndex],0 ,16 ); - -/* \todo Send a H2C Command to Firmware for removing this Key in CAM Entry. */ - }else { - pbssid =get_bssid (&padapter->mlmepriv); - stainfo =rtw_get_stainfo (&padapter->stapriv, pbssid); -if (stainfo) { -/* clear key by BSSID */ -memset (&stainfo->dot118021x_UncstKey,0 ,16 ); - -/* \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. */ - }else { - ret = _FAIL; - goto exit; - } - } -exit: - -return ret; -} -/* * rtw_get_cur_max_rate - * @adapter: pointer to struct adapter structure
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -2
@@ -37,8 +37,6 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *adapter, enum ndis_802_11_network_infra type);u8 rtw_set_802_11_remove_wep (struct adapter *adapter,u32 keyindex);u8 rtw_set_802_11_ssid (struct adapter *adapt,struct ndis_802_11_ssid *ssid); -u8 rtw_set_802_11_remove_key (struct adapter *adapt, -struct ndis_802_11_remove_key *key);u16 rtw_get_cur_max_rate (struct adapter *adapter);int rtw_set_country (struct adapter *adapter,const char *country_code);
Signature · 1 line
1.7.10.4
PATCH 7/16 staging: rtl8188eu: Remove unused function rtw_set_802_11_remove_wep()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 25 --------------------- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - 2 files changed, 26 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -25
@@ -566,31 +566,6 @@ exit:return ret; } -u8 rtw_set_802_11_remove_wep (struct adapter *padapter,u32 keyindex) -{ -u8 ret = _SUCCESS; - -if (keyindex >=0x80000000 || padapter ==NULL ) { - ret = false; - goto exit; - }else { -int res; -struct security_priv *psecuritypriv = &(padapter->securitypriv); -if (keyindex <4 ) { -memset (&psecuritypriv->dot11DefKey[keyindex],0 ,16 ); - res =rtw_set_key (padapter, psecuritypriv, keyindex,0 ); - psecuritypriv->dot11DefKeylen[keyindex] =0 ; -if (res == _FAIL) - ret = _FAIL; - }else { - ret = _FAIL; - } - } -exit: - -return ret; -} -/* * rtw_get_cur_max_rate - * @adapter: pointer to struct adapter structure
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -1
@@ -35,7 +35,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *adapter, int ssid_max_num);u8 rtw_set_802_11_infrastructure_mode (struct adapter *adapter,enum ndis_802_11_network_infra type); -u8 rtw_set_802_11_remove_wep (struct adapter *adapter,u32 keyindex);u8 rtw_set_802_11_ssid (struct adapter *adapt,struct ndis_802_11_ssid *ssid);u16 rtw_get_cur_max_rate (struct adapter *adapter);int rtw_set_country (struct adapter *adapter,const char *country_code);
Signature · 1 line
1.7.10.4
PATCH 8/16 staging: rtl8188eu: Remove unused function _rtw_IOL_append_WW_cmd()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_iol.c | 14 -------------- drivers/staging/rtl8188eu/include/rtw_iol.h | 2 -- 2 files changed, 16 deletions(-)
drivers/staging/rtl8188eu/core/rtw_iol.c +0 -14
@@ -113,20 +113,6 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); } -int _rtw_IOL_append_WW_cmd (struct xmit_frame *xmit_frame,u16 addr,u16 value,u16 mask) -{ -struct ioreg_cfg cmd = {8 ,IOREG_CMD_WW_REG ,0x0 ,0x0 ,0x0 }; - - cmd.address =cpu_to_le16 (addr); - cmd.data =cpu_to_le32 (value); - -if (mask !=0xFFFF ) { - cmd.length =12 ; - cmd.mask =cpu_to_le32 (mask); - } -return rtw_IOL_append_cmds (xmit_frame, (u8 *)&cmd, cmd.length); -} -int _rtw_IOL_append_WD_cmd (struct xmit_frame *xmit_frame,u16 addr,u32 value,u32 mask) {struct ioreg_cfg cmd = {8 ,IOREG_CMD_WD_REG ,0x0 ,0x0 ,0x0 };
drivers/staging/rtl8188eu/include/rtw_iol.h +0 -2
@@ -63,8 +63,6 @@ void read_efuse_from_txpktbuf(struct adapter *adapter, int bcnhead,int _rtw_IOL_append_WB_cmd (struct xmit_frame *xmit_frame,u16 addr,u8 value,u8 mask); -int _rtw_IOL_append_WW_cmd (struct xmit_frame *xmit_frame,u16 addr, -u16 value,u16 mask);int _rtw_IOL_append_WD_cmd (struct xmit_frame *xmit_frame,u16 addr,u32 value,u32 mask); int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path,
Signature · 1 line
1.7.10.4
PATCH 9/16 staging: rtl8188eu: Remove unused function rtw_get_timestampe_from_ie()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 5 ----- drivers/staging/rtl8188eu/include/rtw_mlme.h | 1 - 2 files changed, 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -5
@@ -331,11 +331,6 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss)return le16_to_cpu (val); } -u8 *rtw_get_timestampe_from_ie (u8 *ie) -{ -return ie +0 ; -} -u8 *rtw_get_beacon_interval_from_ie (u8 *ie) {return ie +8 ;
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -1
@@ -590,7 +590,6 @@ int rtw_if_up(struct adapter *padapter);u8 *rtw_get_capability_from_ie (u8 *ie); -u8 *rtw_get_timestampe_from_ie (u8 *ie);u8 *rtw_get_beacon_interval_from_ie (u8 *ie);
Signature · 1 line
1.7.10.4
PATCH 10/16 staging: rtl8188eu: Rename _rtw_free_network_queue() to rtw_free_network_queue()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 +------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -7
@@ -265,7 +265,7 @@ exit: } -void _rtw_free_network_queue (struct adapter *padapter,u8 isfreeall) +void rtw_free_network_queue (struct adapter *padapter,u8 isfreeall) {struct list_head *phead, *plist;struct wlan_network *pnetwork;
@@ -360,12 +360,6 @@ static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,_rtw_free_network_nolock (pmlmepriv, pnetwork); } - -void rtw_free_network_queue (struct adapter *dev,u8 isfreeall) -{ -_rtw_free_network_queue (dev, isfreeall); -} -/* return the wlan_network with the matching addr
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -2
@@ -584,8 +584,6 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv,struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); -void _rtw_free_network_queue (struct adapter *padapter,u8 isfreeall); -int rtw_if_up (struct adapter *padapter);
Signature · 1 line
1.7.10.4
PATCH 11/16 staging: rtl8188eu: Rename _rtw_find_network() to rtw_find_network()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +------------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 5 ----- 2 files changed, 1 insertion(+), 18 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -13
@@ -239,7 +239,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *Shall be calle under atomic context... to avoid possible racing condition... */ -struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr) +struct wlan_network *rtw_find_network (struct __queue *scanned_queue,u8 *addr) {struct list_head *phead, *plist;struct wlan_network *pnetwork =NULL ;
@@ -360,18 +360,6 @@ static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,_rtw_free_network_nolock (pmlmepriv, pnetwork); } -/* -return the wlan_network with the matching addr - -Shall be calle under atomic context... to avoid possible racing condition... -*/ -struct wlan_network *rtw_find_network (struct __queue *scanned_queue,u8 *addr) -{ -struct wlan_network *pnetwork =_rtw_find_network (scanned_queue, addr); - -return pnetwork; -} -int rtw_is_same_ibss (struct adapter *adapter,struct wlan_network *pnetwork) {int ret = true;
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -5
@@ -581,16 +581,11 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv,void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork); - -struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); -int rtw_if_up (struct adapter *padapter); -u8 *rtw_get_capability_from_ie (u8 *ie);u8 *rtw_get_beacon_interval_from_ie (u8 *ie); -void rtw_joinbss_reset (struct adapter *padapter); unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie,
Signature · 1 line
1.7.10.4
PATCH 12/16 staging: rtl8188eu: Make _rtw_free_network() static
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -1
@@ -194,7 +194,7 @@ exit:return pnetwork; } -void _rtw_free_network (struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwork,u8 isfreeall) +static void _rtw_free_network (struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwork,u8 isfreeall) {u32 curr_time, delta_time;u32 lifetime =SCANQUEUE_LIFETIME ;
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -3
@@ -575,9 +575,6 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue);struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv); - -void _rtw_free_network (struct mlme_priv *pmlmepriv, -struct wlan_network *pnetwork,u8 isfreeall);void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork);
Signature · 1 line
1.7.10.4
PATCH 13/16 staging: rtl8188eu: Remove unused function _rtw_dequeue_network()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 19 ------------------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 21 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -19
@@ -142,25 +142,6 @@ exit:return _SUCCESS; } -struct wlan_network *_rtw_dequeue_network (struct __queue *queue) -{ -struct wlan_network *pnetwork; - -spin_lock_bh (&queue->lock); - -if (list_empty (&queue->queue)) { - pnetwork =NULL ; - }else { - pnetwork = container_of((&queue->queue)->next, struct wlan_network, list); - -list_del_init (&(pnetwork->list)); - } - -spin_unlock_bh (&queue->lock); - -return pnetwork; -} -struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv)/* _queue *free_queue) */ {struct wlan_network *pnetwork;
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -2
@@ -571,8 +571,6 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);int _rtw_enqueue_network (struct __queue *queue,struct wlan_network *pnetwork); -struct wlan_network *_rtw_dequeue_network (struct __queue *queue); -struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv); void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
Signature · 1 line
1.7.10.4
PATCH 14/16 staging: rtl8188eu: Remove unused function _rtw_enqueue_network()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 15 --------------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -15
@@ -127,21 +127,6 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) } } -int _rtw_enqueue_network (struct __queue *queue,struct wlan_network *pnetwork) -{ -if (pnetwork ==NULL ) - goto exit; - -spin_lock_bh (&queue->lock); - -list_add_tail (&pnetwork->list, &queue->queue); - -spin_unlock_bh (&queue->lock); - -exit: -return _SUCCESS; -} -struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv)/* _queue *free_queue) */ {struct wlan_network *pnetwork;
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -2
@@ -569,8 +569,6 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); -int _rtw_enqueue_network (struct __queue *queue,struct wlan_network *pnetwork); -struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv); void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
Signature · 1 line
1.7.10.4
PATCH 15/16 staging: rtl8188eu: Rename _rtw_free_mlme_priv() to rtw_free_mlme_priv()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 +------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -7
@@ -117,7 +117,7 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv) }#endif -void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) +void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) {rtw_free_mlme_priv_ie_data (pmlmepriv);
@@ -309,12 +309,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)return res; } -void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) -{ -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n" )); -_rtw_free_mlme_priv (pmlmepriv); -} -static struct wlan_network *rtw_alloc_network (struct mlme_priv *pmlmepriv) {return _rtw_alloc_network (pmlmepriv);
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -2
@@ -567,8 +567,6 @@ int _rtw_init_mlme_priv(struct adapter *padapter);void rtw_free_mlme_priv_ie_data (struct mlme_priv *pmlmepriv); -void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); -struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv); void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
Signature · 1 line
1.7.10.4
PATCH 16/16 staging: rtl8188eu: Rename _rtw_init_mlme_priv() to rtw_init_mlme_priv()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 9 +-------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -8
@@ -35,7 +35,7 @@extern unsigned char MCS_rate_2R[16 ];extern unsigned char MCS_rate_1R[16 ]; -int _rtw_init_mlme_priv (struct adapter *padapter) +int rtw_init_mlme_priv (struct adapter *padapter) {int i;u8 *pbuf;
@@ -302,13 +302,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)return ie +8 ; } -int rtw_init_mlme_priv (struct adapter *padapter) -{ -int res; - res =_rtw_init_mlme_priv (padapter);/* (pmlmepriv); */ -return res; -} -static struct wlan_network *rtw_alloc_network (struct mlme_priv *pmlmepriv) {return _rtw_alloc_network (pmlmepriv);
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -3
@@ -562,9 +562,6 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter);#define rtw_set_scan_deny_timer_hdl (adapter) do {} while (0)#define rtw_set_scan_deny (adapter, ms) do {} while (0) - -int _rtw_init_mlme_priv (struct adapter *padapter); -void rtw_free_mlme_priv_ie_data (struct mlme_priv *pmlmepriv);struct wlan_network *_rtw_alloc_network (struct mlme_priv *pmlmepriv);
Signature · 1 line
1.7.10.4