staging: rtl8188eu: remove blank lines
PATCH 1/8 staging: rtl8188eu: remove blank lines
Remove unrequired blank lines reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/hal/odm.c | 1 - drivers/staging/rtl8188eu/hal/phy.c | 3 --- drivers/staging/rtl8188eu/hal/rf.c | 1 - drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 5 ----- .../staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 -- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/hal/usb_halinit.c | 1 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 17 ----------------- drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 3 --- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 ---- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 - .../staging/rtl8188eu/os_dep/usb_ops_linux.c | 14 -------------- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 4 ---- 13 files changed, 57 deletions(-)
drivers/staging/rtl8188eu/hal/odm.c +0 -1
@@ -156,7 +156,6 @@ u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8] = { {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00} /* 32, -16.0dB */ }; -#define RxDefaultAnt1 0x65a9#define RxDefaultAnt2 0x569a
drivers/staging/rtl8188eu/hal/phy.c +0 -3
@@ -352,7 +352,6 @@ void rtl88eu_dm_txpower_track_adjust(struct odm_dm_struct *dm_odm, u8 type, pwr_value = dm_odm->BbSwingIdxCck - dm_odm->BbSwingIdxCckBase; } - }if (pwr_value >=ODM_TXPWRTRACK_MAX_IDX_88E && *direction ==1 )
@@ -879,7 +878,6 @@ static void mac_setting_calibration(struct adapter *adapt, u32 *mac_reg, u32 *bastatic void path_a_standby (struct adapter *adapt) { -phy_set_bb_reg (adapt, rFPGA0_IQK, bMaskDWord,0x0 );phy_set_bb_reg (adapt,0x840 , bMaskDWord,0x00010000 );phy_set_bb_reg (adapt, rFPGA0_IQK, bMaskDWord,0x80800000 );
@@ -1003,7 +1001,6 @@ static void phy_iq_calibrate(struct adapter *adapt, s32 result[][8], retry_count =2 ;if (t ==0 ) { -/* Save ADDA parameters, turn Path A ADDA on */ save_adda_registers (adapt, adda_reg, dm_odm->RFCalibrateInfo.ADDA_backup,IQK_ADDA_REG_NUM );
drivers/staging/rtl8188eu/hal/rf.c +0 -1
@@ -44,7 +44,6 @@ void rtl88eu_phy_rf6052_set_cck_txpower(struct adapter *adapt, u8 *powerlevel)u8 *ptr;u8 direction; -if (pmlmeext->sitesurvey_res.state ==SCAN_PROCESS ) { tx_agc[RF_PATH_A ] =0x3f3f3f3f ; tx_agc[RF_PATH_B ] =0x3f3f3f3f ;
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +0 -5
@@ -57,7 +57,6 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *pu32 h2c_cmd_ex =0 ;s32 ret = _FAIL; -if (!adapt->bFWReady) {DBG_88E ("%s(): return H2C cmd because fw is not ready\n" , __func__);
@@ -110,8 +109,6 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p ret = _SUCCESS; exit: - -return ret; }
@@ -196,7 +193,6 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode) H2CSetPwrMode.PwrState =0x0C ;/* AllON(0x0C), RFON(0x04), RFOFF(0x00) */ FillH2CCmd_88E (adapt,H2C_PS_PWR_MODE ,sizeof (H2CSetPwrMode), (u8 *)&H2CSetPwrMode); - }void rtl8188e_set_FwMediaStatus_cmd (struct adapter *adapt,__le16 mstatus_rpt)
@@ -554,7 +550,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)u8 DLBcnCount =0 ;u32 poll =0 ; -DBG_88E ("%s mstatus(%x)\n" , __func__, mstatus);if (mstatus ==1 ) {
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -2
@@ -70,7 +70,6 @@ static s32 iol_InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)return rst; } -s32 rtl8188e_iol_efuse_patch (struct adapter *padapter) {s32 result = _SUCCESS;
@@ -399,7 +398,6 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)else if (chnl ==14 )/* Channel 14 */ *pGroup =5 ; }else { -/* probably, this branch is suitable only for 5 GHz */ bIn24G = false;
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -87,7 +87,6 @@ void rtw_hal_free_recv_priv(struct adapter *padapter)DBG_88E (KERN_WARNING "rx_skb_queue not empty\n" );skb_queue_purge (&precvpriv->rx_skb_queue); -if (skb_queue_len (&precvpriv->free_recv_skb_queue))DBG_88E (KERN_WARNING "free_recv_skb_queue not empty, %d\n" ,skb_queue_len (&precvpriv->free_recv_skb_queue));
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -1
@@ -994,7 +994,6 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter)RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("<=== usb_inirp_init\n" )); -return status; }
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +0 -17
@@ -1283,7 +1283,6 @@ static int rtw_wx_set_essid(struct net_device *dev,uint ret =0 , len; -RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_info_, ("+rtw_wx_set_essid: fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)));if (_FAIL ==rtw_pwr_wakeup (padapter)) {
@@ -1365,10 +1364,8 @@ static int rtw_wx_set_essid(struct net_device *dev, } exit: -DBG_88E ("<=%s, ret %d\n" , __func__, ret); -return ret; }
@@ -1383,7 +1380,6 @@ static int rtw_wx_get_essid(struct net_device *dev,RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_essid\n" )); -if ((check_fwstate (pmlmepriv, _FW_LINKED)) || (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) { len = pcur_bss->Ssid.SsidLength;
@@ -1409,7 +1405,6 @@ static int rtw_wx_set_rate(struct net_device *dev,u32 ratevalue =0 ;u8 mpdatarate[NumRates] = {11 ,10 ,9 ,8 ,7 ,6 ,5 ,4 ,3 ,2 ,1 ,0 ,0xff }; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_set_rate\n" ));RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_info_, ("target_rate = %d, fixed = %d\n" , target_rate, fixed));
@@ -1501,7 +1496,6 @@ static int rtw_wx_set_rts(struct net_device *dev, {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -if (wrqu->rts.disabled) { padapter->registrypriv.rts_thresh =2347 ; }else {
@@ -1514,7 +1508,6 @@ static int rtw_wx_set_rts(struct net_device *dev,DBG_88E ("%s, rts_thresh =%d\n" , __func__, padapter->registrypriv.rts_thresh); -return 0 ; }
@@ -1524,14 +1517,12 @@ static int rtw_wx_get_rts(struct net_device *dev, {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -DBG_88E ("%s, rts_thresh =%d\n" , __func__, padapter->registrypriv.rts_thresh); wrqu->rts.value = padapter->registrypriv.rts_thresh; wrqu->rts.fixed =0 ;/* no auto select */ /* wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD); */ -return 0 ; }
@@ -1541,7 +1532,6 @@ static int rtw_wx_set_frag(struct net_device *dev, {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -if (wrqu->frag.disabled) { padapter->xmitpriv.frag_len =MAX_FRAG_THRESHOLD ; }else {
@@ -1554,7 +1544,6 @@ static int rtw_wx_set_frag(struct net_device *dev,DBG_88E ("%s, frag_len =%d\n" , __func__, padapter->xmitpriv.frag_len); -return 0 ; }
@@ -1564,13 +1553,11 @@ static int rtw_wx_get_frag(struct net_device *dev, {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -DBG_88E ("%s, frag_len =%d\n" , __func__, padapter->xmitpriv.frag_len); wrqu->frag.value = padapter->xmitpriv.frag_len; wrqu->frag.fixed =0 ;/* no auto select */ -return 0 ; }
@@ -1604,7 +1591,6 @@ static int rtw_wx_set_enc(struct net_device *dev, key = erq->flags &IW_ENCODE_INDEX ; -if (erq->flags &IW_ENCODE_DISABLED ) {DBG_88E ("EncryptionDisabled\n" ); padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
@@ -1697,8 +1683,6 @@ static int rtw_wx_set_enc(struct net_device *dev, } exit: - -return ret; }
@@ -1711,7 +1695,6 @@ static int rtw_wx_get_enc(struct net_device *dev,struct iw_point *erq = &(wrqu->encoding);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv, _FW_LINKED) != true) {if (!check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { erq->length =0 ;
drivers/staging/rtl8188eu/os_dep/mlme_linux.c +0 -3
@@ -5,7 +5,6 @@* ******************************************************************************/ -#define _MLME_OSDEP_C_#include <osdep_service.h>
@@ -142,7 +141,6 @@ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *pstif (pstapriv->sta_aid[psta->aid -1 ] != psta)return ; - wrqu.addr.sa_family =ARPHRD_ETHER ;memcpy (wrqu.addr.sa_data, psta->hwaddr,ETH_ALEN );
@@ -166,7 +164,6 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *if (pstapriv->sta_aid[psta->aid -1 ] != psta)return ; - wrqu.addr.sa_family =ARPHRD_ETHER ;memcpy (wrqu.addr.sa_data, psta->hwaddr,ETH_ALEN );
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -4
@@ -355,7 +355,6 @@ void rtw_stop_drv_threads(struct adapter *padapter)complete (&padapter->cmdpriv.cmd_queue_comp);if (padapter->cmdThread)wait_for_completion_interruptible (&padapter->cmdpriv.terminate_cmdthread_comp); - }static u8 rtw_init_default_value (struct adapter *padapter)
@@ -433,7 +432,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter) {u8 ret8 = _SUCCESS; -RT_TRACE (_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw\n" ));if ((rtw_init_cmd_priv (&padapter->cmdpriv)) == _FAIL) {
@@ -490,7 +488,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter) exit:RT_TRACE (_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n" )); -return ret8; }
@@ -653,7 +650,6 @@ int ips_netdrv_open(struct adapter *padapter)return _FAIL; } -int rtw_ips_pwr_up (struct adapter *padapter) {int result;
drivers/staging/rtl8188eu/os_dep/usb_intf.c +0 -1
@@ -133,7 +133,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf) }usb_put_dev (interface_to_usbdev (usb_intf)); - }void usb_intf_stop (struct adapter *padapter)
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +0 -14
@@ -267,7 +267,6 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i } } } - }/* firmware download is checksumed, don't retry */
@@ -291,7 +290,6 @@ u8 usb_read8(struct adapter *adapter, u32 addr)u16 len;u8 data =0 ; - request =0x05 ; requesttype =0x01 ;/* read_in */ index =0 ;/* n/a */
@@ -301,9 +299,7 @@ u8 usb_read8(struct adapter *adapter, u32 addr)usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype); -return data; - }u16 usb_read16 (struct adapter *adapter,u32 addr)
@@ -334,7 +330,6 @@ u32 usb_read32(struct adapter *adapter, u32 addr)u16 len;__le32 data; - request =0x05 ; requesttype =0x01 ;/* read_in */ index =0 ;/* n/a */
@@ -344,7 +339,6 @@ u32 usb_read32(struct adapter *adapter, u32 addr)usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype); -return le32_to_cpu (data); }
@@ -429,7 +423,6 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, struct recv_buf *precvbuf)unsigned int pipe;u32 ret = _SUCCESS; -if (adapter->bDriverStopped || adapter->bSurpriseRemoved || adapter->pwrctrlpriv.pnp_bstop_trx) { RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
@@ -532,7 +525,6 @@ int usb_write16(struct adapter *adapter, u32 addr, u16 val)u16 len;__le32 data; - request =0x05 ; requesttype =0x00 ;/* write_out */ index =0 ;/* n/a */
@@ -544,8 +536,6 @@ int usb_write16(struct adapter *adapter, u32 addr, u16 val)return usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype); - - }int usb_write32 (struct adapter *adapter,u32 addr,u32 val)
@@ -557,7 +547,6 @@ int usb_write32(struct adapter *adapter, u32 addr, u32 val)u16 len;__le32 data; - request =0x05 ; requesttype =0x00 ;/* write_out */ index =0 ;/* n/a */
@@ -568,8 +557,6 @@ int usb_write32(struct adapter *adapter, u32 addr, u32 val)return usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype); - - }static void usb_write_port_complete (struct urb *purb,struct pt_regs *regs)
@@ -663,7 +650,6 @@ u32 usb_write_port(struct adapter *padapter, u32 addr, u32 cnt, struct xmit_bufstruct xmit_frame *pxmitframe = (struct xmit_frame *)xmitbuf->priv_data;struct usb_device *pusbd = pdvobj->pusbdev; -RT_TRACE (_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port\n" )); if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +0 -4
@@ -156,7 +156,6 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)return true; } -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);
@@ -164,7 +163,6 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;s32 res =0 ; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n" ));if (rtw_if_up (padapter) == false) {
@@ -198,7 +196,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)RT_TRACE (_module_xmit_osdep_c_, _drv_notice_, ("rtw_xmit_entry: drop, tx_drop=%d\n" , (u32 )pxmitpriv->tx_drop)); exit: - -return 0 ; }
Signature · 1 line
2.18.0
PATCH 2/8 staging: rtl8188eu: refactor rtw_is_cckrates_included()
Refactor rtw_is_cckrates_included() to improve readability and slightly reduce object file size.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +5 -5
@@ -74,14 +74,14 @@ int rtw_get_bit_value_from_ieee_value(u8 val)uint rtw_is_cckrates_included (u8 *rate) { -u32 i =0 ; +while (*rate) { +u8 r = *rate &0x7f ; -while (rate[i] !=0 ) { -if ((((rate[i]) &0x7f ) ==2 ) || (((rate[i]) &0x7f ) ==4 ) || - (((rate[i]) &0x7f ) ==11 ) || (((rate[i]) &0x7f ) ==22 )) +if (r ==2 || r ==4 || r ==11 || r ==22 )return true; - i++; + rate++; } +return false; }
Signature · 1 line
2.18.0
PATCH 3/8 staging: rtl8188eu: refactor rtw_is_cckratesonly_included()
In reply to Michael StraubeRefactor rtw_is_cckratesonly_included() to improve readability and slightly reduce object file size.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +4 -5
@@ -87,13 +87,12 @@ uint rtw_is_cckrates_included(u8 *rate)uint rtw_is_cckratesonly_included (u8 *rate) { -u32 i =0 ; +while (*rate) { +u8 r = *rate &0x7f ; -while (rate[i] !=0 ) { -if ((((rate[i]) &0x7f ) !=2 ) && (((rate[i]) &0x7f ) !=4 ) && - (((rate[i]) &0x7f ) !=11 ) && (((rate[i]) &0x7f ) !=22 )) +if (r !=2 && r !=4 && r !=11 && r !=22 )return false; - i++; + rate++; }return true;
Signature · 1 line
2.18.0
PATCH 4/8 staging: rtl8188eu: change return type to bool
In reply to Michael StraubeBoth rtw_is_cckrates_included() and rtw_is_cckratesonly_included() return true or false. Change the return type from uint to bool.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 ++-- drivers/staging/rtl8188eu/include/ieee80211.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +2 -2
@@ -72,7 +72,7 @@ int rtw_get_bit_value_from_ieee_value(u8 val)return 0 ; } -uint rtw_is_cckrates_included (u8 *rate) +bool rtw_is_cckrates_included (u8 *rate) {while (*rate) {u8 r = *rate &0x7f ;
@@ -85,7 +85,7 @@ uint rtw_is_cckrates_included(u8 *rate)return false; } -uint rtw_is_cckratesonly_included (u8 *rate) +bool rtw_is_cckratesonly_included (u8 *rate) {while (*rate) {u8 r = *rate &0x7f ;
drivers/staging/rtl8188eu/include/ieee80211.h +2 -2
@@ -767,9 +767,9 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv);int rtw_get_bit_value_from_ieee_value (u8 val); -uint rtw_is_cckrates_included (u8 *rate); +bool rtw_is_cckrates_included (u8 *rate); -uint rtw_is_cckratesonly_included (u8 *rate); +bool rtw_is_cckratesonly_included (u8 *rate);int rtw_check_network_type (unsigned char *rate,int ratelen,int channel);
Signature · 1 line
2.18.0
PATCH 5/8 staging: rtl8188eu: fix comparsions to true
In reply to Michael StraubeUse if(x) instead of if(x == true).
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 6 +++--- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +3 -3
@@ -101,14 +101,14 @@ bool rtw_is_cckratesonly_included(u8 *rate)int rtw_check_network_type (unsigned char *rate,int ratelen,int channel) {if (channel >14 ) { -if ((rtw_is_cckrates_included (rate)) == true) +if (rtw_is_cckrates_included (rate))return WIRELESS_INVALID ;else return WIRELESS_11A ; }else {/* could be pure B, pure G, or B/G */ -if ((rtw_is_cckratesonly_included (rate)) == true) +if (rtw_is_cckratesonly_included (rate))return WIRELESS_11B ; -else if ((rtw_is_cckrates_included (rate)) == true) +else if (rtw_is_cckrates_included (rate))return WIRELESS_11BG ;else return WIRELESS_11G ;
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +2 -2
@@ -642,12 +642,12 @@ static int rtw_wx_get_name(struct net_device *dev, prates = &pcur_bss->SupportedRates; -if (rtw_is_cckratesonly_included ((u8 *)prates) == true) { +if (rtw_is_cckratesonly_included ((u8 *)prates)) {if (ht_cap)snprintf (wrqu->name,IFNAMSIZ ,"IEEE 802.11bn" );else snprintf (wrqu->name,IFNAMSIZ ,"IEEE 802.11b" ); - }else if ((rtw_is_cckrates_included ((u8 *)prates)) == true) { + }else if (rtw_is_cckrates_included ((u8 *)prates)) {if (ht_cap)snprintf (wrqu->name,IFNAMSIZ ,"IEEE 802.11bgn" );else
Signature · 1 line
2.18.0
PATCH 6/8 staging: rtl8188eu: remove unnecessary parentheses
In reply to Michael StraubeRemove unnecessary parentheses.
Signed-off-by Michael Straube <[email protected]>
--- .../staging/rtl8188eu/core/rtw_ieee80211.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +10 -10
@@ -40,18 +40,18 @@ u8 RSN_CIPHER_SUITE_WEP104[] = { 0x00, 0x0f, 0xac, 5 };/* */ static u8 WIFI_CCKRATES [] = { - (IEEE80211_CCK_RATE_1MB |IEEE80211_BASIC_RATE_MASK ), - (IEEE80211_CCK_RATE_2MB |IEEE80211_BASIC_RATE_MASK ), - (IEEE80211_CCK_RATE_5MB |IEEE80211_BASIC_RATE_MASK ), - (IEEE80211_CCK_RATE_11MB |IEEE80211_BASIC_RATE_MASK ) +IEEE80211_CCK_RATE_1MB |IEEE80211_BASIC_RATE_MASK , +IEEE80211_CCK_RATE_2MB |IEEE80211_BASIC_RATE_MASK , +IEEE80211_CCK_RATE_5MB |IEEE80211_BASIC_RATE_MASK , +IEEE80211_CCK_RATE_11MB |IEEE80211_BASIC_RATE_MASK };static u8 WIFI_OFDMRATES [] = { - (IEEE80211_OFDM_RATE_6MB ), - (IEEE80211_OFDM_RATE_9MB ), - (IEEE80211_OFDM_RATE_12MB ), - (IEEE80211_OFDM_RATE_18MB ), - (IEEE80211_OFDM_RATE_24MB ), +IEEE80211_OFDM_RATE_6MB , +IEEE80211_OFDM_RATE_9MB , +IEEE80211_OFDM_RATE_12MB , +IEEE80211_OFDM_RATE_18MB , +IEEE80211_OFDM_RATE_24MB ,IEEE80211_OFDM_RATE_36MB ,IEEE80211_OFDM_RATE_48MB ,IEEE80211_OFDM_RATE_54MB
@@ -919,7 +919,7 @@ void rtw_macaddr_cfg(u8 *mac_addr)DBG_88E ("MAC Address from efuse error, assign random one !!!\n" ); } -DBG_88E ("%s MAC Address = %pM\n" , __func__, (mac_addr)); +DBG_88E ("%s MAC Address = %pM\n" , __func__, mac_addr); }static int rtw_get_cipher_info (struct wlan_network *pnetwork)
Signature · 1 line
2.18.0
PATCH 7/8 staging: rtl8188eu: replace tabs with spaces
In reply to Michael StraubeReplace tabs with spaces or just remove tabs where appropriate.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +6 -6
@@ -39,14 +39,14 @@ u8 RSN_CIPHER_SUITE_WEP104[] = { 0x00, 0x0f, 0xac, 5 };/* for adhoc-master to generate ie and provide supported-rate to fw */ /* */ -static u8 WIFI_CCKRATES [] = { +static u8 WIFI_CCKRATES [] = {IEEE80211_CCK_RATE_1MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_2MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_5MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_11MB |IEEE80211_BASIC_RATE_MASK - }; +}; -static u8 WIFI_OFDMRATES [] = { +static u8 WIFI_OFDMRATES [] = {IEEE80211_OFDM_RATE_6MB ,IEEE80211_OFDM_RATE_9MB ,IEEE80211_OFDM_RATE_12MB ,
@@ -55,7 +55,7 @@ static u8 WIFI_OFDMRATES[] = {IEEE80211_OFDM_RATE_36MB ,IEEE80211_OFDM_RATE_48MB , IEEE80211_OFDM_RATE_54MB - }; +};int rtw_get_bit_value_from_ieee_value (u8 val) {
@@ -492,7 +492,7 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, {u8 authmode, sec_idx, i;u8 wpa_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x01 }; -uint cnt; +uint cnt;/* Search required WPA or WPA2 IE and copy to sec_ie[] */
@@ -970,7 +970,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)u16 wpa_len =0 , rsn_len =0 ;struct HT_info_element *pht_info =NULL ;uint len; -unsigned char *p; +unsigned char *p;memcpy (&le_tmp,rtw_get_capability_from_ie (pnetwork->network.ies),2 ); cap =le16_to_cpu (le_tmp);
Signature · 1 line
2.18.0
PATCH 8/8 staging: rtl8188eu: fix lines over 80 characters
In reply to Michael StraubeFix two lines over 80 characters by removing unnecessary parentheses.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +2 -2
@@ -20,8 +20,8 @@ static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbu }/* HISR */ -memcpy (&(haldata->IntArray[0 ]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET ]),4 ); -memcpy (&(haldata->IntArray[1 ]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET ]),4 ); +memcpy (&haldata->IntArray[0 ], &pbuf[USB_INTR_CONTENT_HISR_OFFSET ],4 ); +memcpy (&haldata->IntArray[1 ], &pbuf[USB_INTR_CONTENT_HISRE_OFFSET ],4 );/* C2H Event */ if (pbuf[0 ] !=0 )
Signature · 1 line
2.18.0