staging: r8188eu: replace MACADDRLEN with ETH_ALEN

Replace the custom constant MACADDRLEN with in-kernel ETH_ALEN.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211009104419.8811-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 4913da785a1d58c04ada033041a0ac44d83ecb7d..720e190a743629079a8ca54f81c29d275e990012 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -1553,31 +1553,31 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
        rcu_read_unlock();
        spin_lock_bh(&padapter->br_ext_lock);
        if (!(skb->data[0] & 1) && br_port &&
-           memcmp(skb->data + MACADDRLEN, padapter->br_mac, MACADDRLEN) &&
-           *((__be16 *)(skb->data + MACADDRLEN * 2)) != __constant_htons(ETH_P_8021Q) &&
-           *((__be16 *)(skb->data + MACADDRLEN * 2)) == __constant_htons(ETH_P_IP) &&
-           !memcmp(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN) && padapter->scdb_entry) {
-               memcpy(skb->data + MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN);
+           memcmp(skb->data + ETH_ALEN, padapter->br_mac, ETH_ALEN) &&
+           *((__be16 *)(skb->data + ETH_ALEN * 2)) != __constant_htons(ETH_P_8021Q) &&
+           *((__be16 *)(skb->data + ETH_ALEN * 2)) == __constant_htons(ETH_P_IP) &&
+           !memcmp(padapter->scdb_mac, skb->data + ETH_ALEN, ETH_ALEN) && padapter->scdb_entry) {
+               memcpy(skb->data + ETH_ALEN, GET_MY_HWADDR(padapter), ETH_ALEN);
                padapter->scdb_entry->ageing_timer = jiffies;
                spin_unlock_bh(&padapter->br_ext_lock);
        } else {
-               if (*((__be16 *)(skb->data + MACADDRLEN * 2)) == __constant_htons(ETH_P_8021Q)) {
+               if (*((__be16 *)(skb->data + ETH_ALEN * 2)) == __constant_htons(ETH_P_8021Q)) {
                        is_vlan_tag = 1;
-                       vlan_hdr = *((unsigned short *)(skb->data + MACADDRLEN * 2 + 2));
+                       vlan_hdr = *((unsigned short *)(skb->data + ETH_ALEN * 2 + 2));
                        for (i = 0; i < 6; i++)
-                               *((unsigned short *)(skb->data + MACADDRLEN * 2 + 2 - i * 2)) = *((unsigned short *)(skb->data + MACADDRLEN * 2 - 2 - i * 2));
+                               *((unsigned short *)(skb->data + ETH_ALEN * 2 + 2 - i * 2)) = *((unsigned short *)(skb->data + ETH_ALEN * 2 - 2 - i * 2));
                        skb_pull(skb, 4);
                }
-               if (!memcmp(skb->data + MACADDRLEN, padapter->br_mac, MACADDRLEN) &&
-                   (*((__be16 *)(skb->data + MACADDRLEN * 2)) == __constant_htons(ETH_P_IP)))
+               if (!memcmp(skb->data + ETH_ALEN, padapter->br_mac, ETH_ALEN) &&
+                   (*((__be16 *)(skb->data + ETH_ALEN * 2)) == __constant_htons(ETH_P_IP)))
                        memcpy(padapter->br_ip, skb->data + WLAN_ETHHDR_LEN + 12, 4);
 
-               if (*((__be16 *)(skb->data + MACADDRLEN * 2)) == __constant_htons(ETH_P_IP)) {
-                       if (memcmp(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN)) {
+               if (*((__be16 *)(skb->data + ETH_ALEN * 2)) == __constant_htons(ETH_P_IP)) {
+                       if (memcmp(padapter->scdb_mac, skb->data + ETH_ALEN, ETH_ALEN)) {
                                padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter,
                                                        skb->data + WLAN_ETHHDR_LEN + 12);
                                if (padapter->scdb_entry) {
-                                       memcpy(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN);
+                                       memcpy(padapter->scdb_mac, skb->data + ETH_ALEN, ETH_ALEN);
                                        memcpy(padapter->scdb_ip, skb->data + WLAN_ETHHDR_LEN + 12, 4);
                                        padapter->scdb_entry->ageing_timer = jiffies;
                                        do_nat25 = 0;
@@ -1587,7 +1587,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
                                        padapter->scdb_entry->ageing_timer = jiffies;
                                        do_nat25 = 0;
                                } else {
-                                       memset(padapter->scdb_mac, 0, MACADDRLEN);
+                                       memset(padapter->scdb_mac, 0, ETH_ALEN);
                                        memset(padapter->scdb_ip, 0, 4);
                                }
                        }
@@ -1601,8 +1601,8 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
                                        skb_push(skb, 4);
                                        for (i = 0; i < 6; i++)
                                                *((unsigned short *)(skb->data + i * 2)) = *((unsigned short *)(skb->data + 4 + i * 2));
-                                       *((__be16 *)(skb->data + MACADDRLEN * 2)) = __constant_htons(ETH_P_8021Q);
-                                       *((unsigned short *)(skb->data + MACADDRLEN * 2 + 2)) = vlan_hdr;
+                                       *((__be16 *)(skb->data + ETH_ALEN * 2)) = __constant_htons(ETH_P_8021Q);
+                                       *((unsigned short *)(skb->data + ETH_ALEN * 2 + 2)) = vlan_hdr;
                                }
 
                                newskb = skb_copy(skb, GFP_ATOMIC);
@@ -1614,9 +1614,9 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
 
                                *pskb = skb = newskb;
                                if (is_vlan_tag) {
-                                       vlan_hdr = *((unsigned short *)(skb->data + MACADDRLEN * 2 + 2));
+                                       vlan_hdr = *((unsigned short *)(skb->data + ETH_ALEN * 2 + 2));
                                        for (i = 0; i < 6; i++)
-                                               *((unsigned short *)(skb->data + MACADDRLEN * 2 + 2 - i * 2)) = *((unsigned short *)(skb->data + MACADDRLEN * 2 - 2 - i * 2));
+                                               *((unsigned short *)(skb->data + ETH_ALEN * 2 + 2 - i * 2)) = *((unsigned short *)(skb->data + ETH_ALEN * 2 - 2 - i * 2));
                                        skb_pull(skb, 4);
                                }
                        }
@@ -1640,7 +1640,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
                        }
                }
 
-               memcpy(skb->data + MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN);
+               memcpy(skb->data + ETH_ALEN, GET_MY_HWADDR(padapter), ETH_ALEN);
 
                dhcp_flag_bcast(padapter, skb);
 
@@ -1648,13 +1648,13 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
                        skb_push(skb, 4);
                        for (i = 0; i < 6; i++)
                                *((unsigned short *)(skb->data + i * 2)) = *((unsigned short *)(skb->data + 4 + i * 2));
-                       *((__be16 *)(skb->data + MACADDRLEN * 2)) = __constant_htons(ETH_P_8021Q);
-                       *((unsigned short *)(skb->data + MACADDRLEN * 2 + 2)) = vlan_hdr;
+                       *((__be16 *)(skb->data + ETH_ALEN * 2)) = __constant_htons(ETH_P_8021Q);
+                       *((unsigned short *)(skb->data + ETH_ALEN * 2 + 2)) = vlan_hdr;
                }
        }
 
        /*  check if SA is equal to our MAC */
-       if (memcmp(skb->data + MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN)) {
+       if (memcmp(skb->data + ETH_ALEN, GET_MY_HWADDR(padapter), ETH_ALEN)) {
                DEBUG_ERR("TX DROP: untransformed frame SA:%02X%02X%02X%02X%02X%02X!\n",
                          skb->data[6], skb->data[7], skb->data[8], skb->data[9], skb->data[10], skb->data[11]);
                return -1;

diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index edf86b6c254e2b2a8660f2e02661835cb704b4a2..ce88575a87260a7bd6e0ec8065221a16ecb16590 100644 (file)
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -280,11 +280,11 @@ struct adapter {
        spinlock_t br_ext_lock;
        struct nat25_network_db_entry   *nethash[NAT25_HASH_SIZE];
        int                             pppoe_connection_in_progress;
-       unsigned char                   pppoe_addr[MACADDRLEN];
-       unsigned char                   scdb_mac[MACADDRLEN];
+       unsigned char                   pppoe_addr[ETH_ALEN];
+       unsigned char                   scdb_mac[ETH_ALEN];
        unsigned char                   scdb_ip[4];
        struct nat25_network_db_entry   *scdb_entry;
-       unsigned char                   br_mac[MACADDRLEN];
+       unsigned char                   br_mac[ETH_ALEN];
        unsigned char                   br_ip[4];
        struct br_ext_info              ethBrExtInfo;
 

diff --git a/drivers/staging/r8188eu/include/rtw_br_ext.h b/drivers/staging/r8188eu/include/rtw_br_ext.h
index 69905d30c191365b40cf8208582fbb2d2c61f1df..17a6154e760aea647d0c6097ae93d88123044faf 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_br_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_br_ext.h
@@ -4,7 +4,6 @@
 #ifndef _RTW_BR_EXT_H_
 #define _RTW_BR_EXT_H_
 
-#define MACADDRLEN             6
 #define _DEBUG_ERR             DBG_88E
 #define _DEBUG_INFO            DBG_88E
 #define DEBUG_WARN             DBG_88E
@@ -40,7 +39,7 @@ struct br_ext_info {
        unsigned int    macclone_enable;
        unsigned int    dhcp_bcst_disable;
        int     addPPPoETag;            /* 1: Add PPPoE relay-SID, 0: disable */
-       unsigned char   nat25_dmzMac[MACADDRLEN];
+       unsigned char   nat25_dmzMac[ETH_ALEN];
        unsigned int    nat25sc_disable;
 };