staging: r8188eu: use is_multicast_ether_addr in core/rtw_security.c
authorMichael Straube <straube.linux@gmail.com>
Mon, 23 Aug 2021 12:01:03 +0000 (14:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Aug 2021 10:23:12 +0000 (12:23 +0200)
Use is_multicast_ether_addr instead of custom macro IS_MCAST, all
buffers are properly aligned.

Acked-by: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210823120106.9633-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_security.c

index b9ab4b2..5aa893a 100644 (file)
@@ -538,7 +538,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
                        stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
 
                if (stainfo) {
-                       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];
@@ -608,7 +608,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__);
@@ -1188,7 +1188,7 @@ u32       rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
                        stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
 
                if (stainfo) {
-                       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];
@@ -1421,7 +1421,7 @@ u32       rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
        if (prxattrib->encrypt == _AES_) {
                stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);
                if (stainfo) {
-                       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;