Commit 8e5d9433 authored by Aya Mahfouz's avatar Aya Mahfouz Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: replace memset(x,0,ETH_ALEN) 



eth_zero_addr() is a wrapper function for memset if 0 is going to
be assigned to a mac address. The aforementioned function replaces
memset. In addition, linux/etherdevice.h was included as a header
since it is the file that define the inline function eth_zero_addr().
The changes were carried out using the following coccinelle script:

@header@
@@

#include <linux/etherdevice.h>

@eth_zero_addr@
expression e;
@@

-memset(e,0,ETH_ALEN);
+eth_zero_addr(e);

@eth_broadcast_addr@
identifier e;
@@

-memset(e,\(0xff\|0xFF\|255\),ETH_ALEN);
+eth_broadcast_addr(e);

@linux_header depends on !header && (eth_zero_addr || eth_broadcast_addr) @
@@

+ #include <linux/etherdevice.h>
+

@special_header depends on !header && !linux_header && (eth_zero_addr || eth_broadcast_addr) @
@@

+
+ #include <linux/etherdevice.h>
+

@custom_header depends on !header && !linux_header && !special_header && (eth_zero_addr || eth_broadcast_addr) @
@@

+
+ #include <linux/etherdevice.h>

Signed-off-by: default avatarAya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0648724

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+6 −4
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


#include <rtw_iol.h>

#include <linux/vmalloc.h>

#include <linux/etherdevice.h>



#include "osdep_intf.h"



#define RTL_IOCTL_WPA_SUPPLICANT	(SIOCIWFIRSTPRIV + 30)
@@ -92,7 +94,7 @@ void rtw_indicate_wx_disassoc_event(struct adapter *padapter) 
	memset(&wrqu, 0, sizeof(union iwreq_data));



	wrqu.ap_addr.sa_family = ARPHRD_ETHER;

	memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);

	eth_zero_addr(wrqu.ap_addr.sa_data);



	DBG_88E_LEVEL(_drv_always_, "indicate disassoc\n");

	wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL);
@@ -827,7 +829,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, 
		for (j = 0; j < NUM_PMKID_CACHE; j++) {

			if (!memcmp(psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN)) {

				/*  BSSID is matched, the same AP => Remove this PMKID information and reset it. */

				memset(psecuritypriv->PMKIDList[j].Bssid, 0x00, ETH_ALEN);

				eth_zero_addr(psecuritypriv->PMKIDList[j].Bssid);

				psecuritypriv->PMKIDList[j].bUsed = false;

				break;

			}
@@ -1028,7 +1030,7 @@ static int rtw_wx_get_wap(struct net_device *dev, 


	wrqu->ap_addr.sa_family = ARPHRD_ETHER;



	memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);

	eth_zero_addr(wrqu->ap_addr.sa_data);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_wap\n"));
@@ -1037,7 +1039,7 @@ static int rtw_wx_get_wap(struct net_device *dev, 
	    ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == true))

		memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN);

	else

		memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);

		eth_zero_addr(wrqu->ap_addr.sa_data);

	return 0;

}