Commit 3bd589eb authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: use is_multicast_ether_addr in rtw_security.c 



Use is_multicast_ether_addr instead of custom IS_MCAST in
core/rtw_security.c. In all uses the address array is properly
aligned.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1d18719

drivers/staging/rtl8188eu/core/rtw_security.c

+4 −4
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe) 
		if (stainfo != NULL) {

			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));



			if (IS_MCAST(pattrib->ra))

			if (is_multicast_ether_addr(pattrib->ra))

				prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;

			else

				prwskey = &stainfo->dot118021x_UncstKey.skey[0];
@@ -678,7 +678,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) 
	if (prxattrib->encrypt == _TKIP_) {

		stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);

		if (stainfo) {

			if (IS_MCAST(prxattrib->ra)) {

			if (is_multicast_ether_addr(prxattrib->ra)) {

				if (!psecuritypriv->binstallGrpkey) {

					res = _FAIL;

					DBG_88E("%s:rx bc/mc packets, but didn't install group key!!!!!!!!!!\n", __func__);
@@ -1250,7 +1250,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) 
		if (stainfo) {

			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));



			if (IS_MCAST(pattrib->ra))

			if (is_multicast_ether_addr(pattrib->ra))

				prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;

			else

				prwskey = &stainfo->dot118021x_UncstKey.skey[0];
@@ -1296,7 +1296,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) 
			struct security_priv *psecuritypriv = &padapter->securitypriv;

			char iv[8], icv[8];



			if (IS_MCAST(prxattrib->ra)) {

			if (is_multicast_ether_addr(prxattrib->ra)) {

				/* in concurrent we should use sw descrypt in group key, so we remove this message */

				if (!psecuritypriv->binstallGrpkey) {

					res = _FAIL;