diff options
| author | Greg Kroah-Hartman <[email protected]> | 2021-05-20 08:48:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2021-05-20 11:41:28 +0200 |
| commit | 1b4c0f3bbdbd5e5cc09b67b2977d52350967cdfd (patch) | |
| tree | c5d6fd7c34c2986859abe4a33a7da7b6aa41aad5 | |
| parent | 7ca8d993d070582a65b01b2fa926ff59fd30635d (diff) | |
staging: rtl8723bs: rename get_ra() due to global symbol collision
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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/wifi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c index 7c2680b6508c..ad803ffc0696 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c @@ -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); diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index 036cf57c65a9..23de3ab87f9c 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -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); |