staging: rtl8723bs: rename get_ra() due to global symbol collision
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 May 2021 06:48:01 +0000 (08:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 May 2021 09:41:28 +0000 (11:41 +0200)
Turns out that powerpc already has a get_ra() function, which conflicts
with this staging driver's inlined function (which is just picking a
byte out of an array for some odd reason), so rename it to fix the
powerpc build as that's the more important thing here.

Reported-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/20210520064801.1961972-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
drivers/staging/rtl8723bs/include/wifi.h

index 7c2680b..ad803ff 100644 (file)
@@ -108,7 +108,7 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe,
                                !pattrib->icv_err && !pattrib->crc_err &&
                                ether_addr_equal(rx_bssid, my_bssid));
 
-       rx_ra = get_ra(wlanhdr);
+       rx_ra = rtl8723bs_get_ra(wlanhdr);
        my_hwaddr = myid(&padapter->eeprompriv);
        pkt_info.to_self = pkt_info.bssid_match &&
                ether_addr_equal(rx_ra, my_hwaddr);
index 036cf57..23de3ab 100644 (file)
@@ -234,7 +234,7 @@ static inline int IS_MCAST(unsigned char *da)
                return false;
 }
 
-static inline unsigned char *get_ra(unsigned char *pframe)
+static inline unsigned char *rtl8723bs_get_ra(unsigned char *pframe)
 {
        unsigned char *ra;
        ra = GetAddr1Ptr(pframe);