Commit 8663b2e0 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

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.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 328cf8e7

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+10 −24
Original line number Diff line number Diff line
@@ -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 *par 
	if (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 *p 
	if (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 *para 
	if (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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE