staging: rtl8188eu: use is_broadcast_ether_addr
PATCH 1/7 staging: rtl8188eu: use is_broadcast_ether_addr
Use is_broadcast_ether_addr instead of checking each byte of the address array for 0xff. Shortens the code and improves readability.
As required by is_broadcast_ether_addr, the address array sta_addr is properly aligned in all uses. Thanks to Joe Perches.
--- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 34 ++++++------------- 1 file changed, 10 insertions(+), 24 deletions(-)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +10 -24
@@ -361,9 +361,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, goto exit; } -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) { +if (is_broadcast_ether_addr (param->sta_addr)) {if (param->u.crypt.idx >=WEP_KEYS ) { ret = -EINVAL ; goto exit;
@@ -2208,9 +2206,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, ret = -EINVAL ; goto exit; } -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) { +if (is_broadcast_ether_addr (param->sta_addr)) {if (param->u.crypt.idx >=WEP_KEYS ) { ret = -EINVAL ; goto exit;
@@ -2471,9 +2467,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)if (!check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )))return -EINVAL ; -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) +if (is_broadcast_ether_addr (param->sta_addr))return -EINVAL ; psta =rtw_get_stainfo (pstapriv, param->sta_addr);
@@ -2528,9 +2522,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ; -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) +if (is_broadcast_ether_addr (param->sta_addr))return -EINVAL ; psta =rtw_get_stainfo (pstapriv, param->sta_addr);
@@ -2566,9 +2558,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *parif (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ; -if (param_ex->sta_addr[0 ] ==0xff && param_ex->sta_addr[1 ] ==0xff && - param_ex->sta_addr[2 ] ==0xff && param_ex->sta_addr[3 ] ==0xff && - param_ex->sta_addr[4 ] ==0xff && param_ex->sta_addr[5 ] ==0xff ) +if (is_broadcast_ether_addr (param_ex->sta_addr))return -EINVAL ; psta =rtw_get_stainfo (pstapriv, param_ex->sta_addr);
@@ -2622,9 +2612,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ; -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) +if (is_broadcast_ether_addr (param->sta_addr))return -EINVAL ; psta =rtw_get_stainfo (pstapriv, param->sta_addr);
@@ -2779,10 +2767,9 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *pif (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true)return -EINVAL ; -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) +if (is_broadcast_ether_addr (param->sta_addr))return -EINVAL ; +return rtw_acl_remove_sta (padapter, param->sta_addr); }
@@ -2794,10 +2781,9 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *paraif (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true)return -EINVAL ; -if (param->sta_addr[0 ] ==0xff && param->sta_addr[1 ] ==0xff && - param->sta_addr[2 ] ==0xff && param->sta_addr[3 ] ==0xff && - param->sta_addr[4 ] ==0xff && param->sta_addr[5 ] ==0xff ) +if (is_broadcast_ether_addr (param->sta_addr))return -EINVAL ; +return rtw_acl_add_sta (padapter, param->sta_addr); }
Signature · 1 line
2.18.0
PATCH 2/7 staging: rtl8188eu: fix indentation - style
Fix indentation to clear checkpatch warnings.
WARNING: suspect code indent for conditional statements
--- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 ++-- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +2 -2
@@ -142,7 +142,7 @@ static char *translate_scan(struct adapter *padapter,if (ht_cap)snprintf (iwe.u.name,IFNAMSIZ ,"IEEE 802.11bn" );else -snprintf (iwe.u.name,IFNAMSIZ ,"IEEE 802.11b" ); +snprintf (iwe.u.name,IFNAMSIZ ,"IEEE 802.11b" ); }else if ((rtw_is_cckrates_included ((u8 *)&pnetwork->network.SupportedRates))) {if (ht_cap)snprintf (iwe.u.name,IFNAMSIZ ,"IEEE 802.11bgn" );
@@ -2299,7 +2299,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot118021XGrpPrivacy = _WEP40_;if (param->u.crypt.key_len ==13 ) - psecuritypriv->dot118021XGrpPrivacy = _WEP104_; + psecuritypriv->dot118021XGrpPrivacy = _WEP104_; }else if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ) {DBG_88E ("%s, set group_key, TKIP\n" , __func__); psecuritypriv->dot118021XGrpPrivacy = _TKIP_;
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
@@ -380,7 +380,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,/* 2012-07-11 Move here to prevent the 8723AS-VAU BT auto * suspend influence */ if (usb_autopm_get_interface (pusb_intf) <0 ) -pr_debug ("can't get autopm:\n" ); +pr_debug ("can't get autopm:\n" );/* alloc dev name after read efuse. */ rtw_init_netdev_name (pnetdev, padapter->registrypriv.ifname);
Signature · 1 line
2.18.0
PATCH 3/7 staging: rtl8188eu: fix comparsions to NULL - style
In reply to Michael StraubeUse x instead of x != NULL.
Use !x instead of x == NULL.
--- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +++--- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 10 +++++----- drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8188eu/os_dep/os_intfs.c +1 -1
@@ -311,7 +311,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)RT_TRACE (_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n" )); -if (old_padapter !=NULL ) +if (old_padapter) pnetdev =rtw_alloc_etherdev_with_old_priv ((void *)old_padapter);if (!pnetdev)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +3 -3
@@ -325,7 +325,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,int status = _FAIL; padapter =vzalloc (sizeof (*padapter)); -if (padapter ==NULL ) +if (!padapter) goto exit; padapter->dvobj = dvobj; dvobj->if1 = padapter;
@@ -334,14 +334,14 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,mutex_init (&padapter->hw_init_mutex); pnetdev =rtw_init_netdev (padapter); -if (pnetdev ==NULL ) +if (!pnetdev) goto free_adapter;SET_NETDEV_DEV (pnetdev,dvobj_to_dev (dvobj)); padapter =rtw_netdev_priv (pnetdev);if (padapter->registrypriv.monitor_enable) { pmondev =rtl88eu_mon_init (); -if (pmondev ==NULL ) +if (!pmondev)netdev_warn (pnetdev,"Failed to initialize monitor interface" ); padapter->pmondev = pmondev; }
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +5 -5
@@ -58,7 +58,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) prxstat = (struct recv_stat *)pbuf; precvframe =rtw_alloc_recvframe (pfree_recv_queue); -if (precvframe ==NULL ) { +if (!precvframe) {RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("recvbuf2recvframe: precvframe==NULL\n" ));DBG_88E ("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n" , __func__, __LINE__); goto _exit_recvbuf2recvframe;
@@ -436,16 +436,16 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, struct recv_buf *precvbuf)return _FAIL; } -if ((!precvbuf->reuse) || (precvbuf->pskb ==NULL )) { +if ((!precvbuf->reuse) || (!precvbuf->pskb)) { precvbuf->pskb =skb_dequeue (&precvpriv->free_recv_skb_queue); -if (precvbuf->pskb !=NULL ) +if (precvbuf->pskb) precvbuf->reuse = true; }/* re-assign for linux based on skb */ -if ((!precvbuf->reuse) || (precvbuf->pskb ==NULL )) { +if ((!precvbuf->reuse) || (!precvbuf->pskb)) { precvbuf->pskb =netdev_alloc_skb (adapter->pnetdev,MAX_RECVBUF_SZ ); -if (precvbuf->pskb ==NULL ) { +if (!precvbuf->pskb) {RT_TRACE (_module_hci_ops_os_c_, _drv_err_, ("init_recvbuf(): alloc_skb fail!\n" ));DBG_88E ("#### usb_read_port() alloc_skb fail!#####\n" );return _FAIL;
drivers/staging/rtl8188eu/os_dep/xmit_linux.c +1 -1
@@ -19,7 +19,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbint i; pxmitbuf->pallocated_buf =kzalloc (alloc_sz,GFP_KERNEL ); -if (pxmitbuf->pallocated_buf ==NULL ) +if (!pxmitbuf->pallocated_buf)return _FAIL; pxmitbuf->pbuf =PTR_ALIGN (pxmitbuf->pallocated_buf,XMITBUF_ALIGN_SZ );
Signature · 1 line
2.18.0
PATCH 4/7 staging: rtl8188eu: remove unnecessary parentheses - style
In reply to Michael StraubeRemove unnecessary parentheses to improve readability.
--- 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
@@ -436,14 +436,14 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, struct recv_buf *precvbuf)return _FAIL; } -if ((!precvbuf->reuse) || (!precvbuf->pskb)) { +if (!precvbuf->reuse || !precvbuf->pskb) { precvbuf->pskb =skb_dequeue (&precvpriv->free_recv_skb_queue);if (precvbuf->pskb) precvbuf->reuse = true; }/* re-assign for linux based on skb */ -if ((!precvbuf->reuse) || (!precvbuf->pskb)) { +if (!precvbuf->reuse || !precvbuf->pskb) { precvbuf->pskb =netdev_alloc_skb (adapter->pnetdev,MAX_RECVBUF_SZ );if (!precvbuf->pskb) {RT_TRACE (_module_hci_ops_os_c_, _drv_err_, ("init_recvbuf(): alloc_skb fail!\n" ));
Signature · 1 line
2.18.0
PATCH 5/7 staging: rtl8188eu: remove unused rtw_add_bcn_ie()
In reply to Michael StraubeThe function rtw_add_bcn_ie() is never used, so remove it. Discovered by cppcheck.
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 66 ---------------------- drivers/staging/rtl8188eu/include/rtw_ap.h | 2 - 2 files changed, 68 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +0 -66
@@ -145,72 +145,6 @@ static void update_BCNTIM(struct adapter *padapter)set_tx_beacon_cmd (padapter); } -void rtw_add_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork, -u8 index,u8 *data,u8 len) -{ -struct ndis_802_11_var_ie *pIE; -u8 bmatch = false; -u8 *pie = pnetwork->ies; -u8 *p =NULL , *dst_ie =NULL , *premainder_ie =NULL ; -u8 *pbackup_remainder_ie =NULL ; -u32 i, offset, ielen =0 , ie_offset, remainder_ielen =0 ; - -for (i =sizeof (struct ndis_802_11_fixed_ie ); i < pnetwork->ie_length;) { - pIE = (struct ndis_802_11_var_ie *)(pnetwork->ies + i); - -if (pIE->ElementID > index) { -break ; -/* already exist the same IE */ - }else if (pIE->ElementID == index) { - p = (u8 *)pIE; - ielen = pIE->Length; - bmatch = true; -break ; - } - p = (u8 *)pIE; - ielen = pIE->Length; - i += (pIE->Length +2 ); - } - -if (p && ielen >0 ) { - ielen +=2 ; - - premainder_ie = p + ielen; - - ie_offset = (int )(p - pie); - - remainder_ielen = pnetwork->ie_length - ie_offset - ielen; - -if (bmatch) - dst_ie = p; -else - dst_ie = p + ielen; - } - -if (remainder_ielen >0 ) { - pbackup_remainder_ie =rtw_malloc (remainder_ielen); -if (pbackup_remainder_ie && premainder_ie) -memcpy (pbackup_remainder_ie, premainder_ie, - remainder_ielen); - } - - *dst_ie++ = index; - *dst_ie++ = len; - -memcpy (dst_ie, data, len); - dst_ie += len; - -/* copy remainder IE */ -if (pbackup_remainder_ie) { -memcpy (dst_ie, pbackup_remainder_ie, remainder_ielen); - -kfree (pbackup_remainder_ie); - } - - offset = (uint)(dst_ie - pie); - pnetwork->ie_length = offset + remainder_ielen; -} -void rtw_remove_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork,u8 index) {
drivers/staging/rtl8188eu/include/rtw_ap.h +0 -2
@@ -19,8 +19,6 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta);void init_mlme_ap_info (struct adapter *padapter);void free_mlme_ap_info (struct adapter *padapter); -void rtw_add_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork, -u8 index,u8 *data,u8 len);void rtw_remove_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork,u8 index); void update_beacon(struct adapter *padapter, u8 ie_id,
Signature · 1 line
2.18.0
PATCH 6/7 staging: rtl8188eu: remove unused rtw_remove_bcn_ie()
In reply to Michael StraubeThe function rtw_remove_bcn_ie() is never used, so remove it. Discovered by cppcheck.
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 40 ---------------------- drivers/staging/rtl8188eu/include/rtw_ap.h | 2 -- 2 files changed, 42 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +0 -40
@@ -145,46 +145,6 @@ static void update_BCNTIM(struct adapter *padapter)set_tx_beacon_cmd (padapter); } -void rtw_remove_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork, -u8 index) -{ -u8 *p, *dst_ie =NULL , *premainder_ie =NULL ; -u8 *pbackup_remainder_ie =NULL ; -uint offset, ielen, ie_offset, remainder_ielen =0 ; -u8 *pie = pnetwork->ies; - - p =rtw_get_ie (pie + _FIXED_IE_LENGTH_, index, &ielen, - pnetwork->ie_length - _FIXED_IE_LENGTH_); -if (p && ielen >0 ) { - ielen +=2 ; - - premainder_ie = p + ielen; - - ie_offset = (int )(p - pie); - - remainder_ielen = pnetwork->ie_length - ie_offset - ielen; - - dst_ie = p; - } - -if (remainder_ielen >0 ) { - pbackup_remainder_ie =rtw_malloc (remainder_ielen); -if (pbackup_remainder_ie && premainder_ie) -memcpy (pbackup_remainder_ie, premainder_ie, - remainder_ielen); - } - -/* copy remainder IE */ -if (pbackup_remainder_ie) { -memcpy (dst_ie, pbackup_remainder_ie, remainder_ielen); - -kfree (pbackup_remainder_ie); - } - - offset = (uint)(dst_ie - pie); - pnetwork->ie_length = offset + remainder_ielen; -} -static u8 chk_sta_is_alive (struct sta_info *psta) {u8 ret = false;
drivers/staging/rtl8188eu/include/rtw_ap.h +0 -2
@@ -19,8 +19,6 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta);void init_mlme_ap_info (struct adapter *padapter);void free_mlme_ap_info (struct adapter *padapter); -void rtw_remove_bcn_ie (struct adapter *padapter, -struct wlan_bssid_ex *pnetwork,u8 index);void update_beacon (struct adapter *padapter,u8 ie_id,u8 *oui,u8 tx); void add_RATid(struct adapter *padapter, struct sta_info *psta,
Signature · 1 line
2.18.0
PATCH 7/7 staging: rtl8188eu: rename odm_RTL8188E - style
In reply to Michael StraubeRename source and header file to avoid CamelCase.odm_RTL8188E.c -> odm_rtl8188e.codm_RTL8188E.h -> odm_rtl8188e.h
---
drivers/staging/rtl8188eu/Makefile | 2 +-
.../staging/rtl8188eu/hal/{odm_RTL8188E.c => odm_rtl8188e.c} | 0
drivers/staging/rtl8188eu/include/odm_precomp.h | 2 +-
.../rtl8188eu/include/{odm_RTL8188E.h => odm_rtl8188e.h} | 0
4 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/staging/rtl8188eu/hal/{odm_RTL8188E.c => odm_rtl8188e.c} (100%)
rename drivers/staging/rtl8188eu/include/{odm_RTL8188E.h => odm_rtl8188e.h} (100%)drivers/staging/rtl8188eu/Makefile +1 -1
@@ -29,7 +29,7 @@ r8188eu-y := \ hal/hal_com.o \ hal/odm.o \ hal/odm_HWConfig.o \ - hal/odm_RTL8188E.o \ + hal/odm_rtl8188e.o \ hal/rtl8188e_cmd.o \ hal/rtl8188e_dm.o \ hal/rtl8188e_hal_init.o \
drivers/staging/rtl8188eu/hal/odm_rtl8188e.c renamed from drivers/staging/rtl8188eu/hal/odm_RTL8188E.c +0 -0
drivers/staging/rtl8188eu/include/odm_precomp.h +1 -1
@@ -31,7 +31,7 @@#include "odm_reg.h" -#include "odm_RTL8188E.h" +#include "odm_rtl8188e.h" void odm_CmnInfoHook_Debug (struct odm_dm_struct *pDM_Odm);void odm_CmnInfoInit_Debug (struct odm_dm_struct *pDM_Odm);
drivers/staging/rtl8188eu/include/odm_rtl8188e.h renamed from drivers/staging/rtl8188eu/include/odm_RTL8188E.h +0 -0
Signature · 1 line
2.18.0