Skip to contentSkip to conversation

staging: rtl8723bs: rename get_ra() due to global symbol collision

PATCH New Greg Kroah-Hartman 1 participant 1 message May 20, 2021 Staging

lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +-
 drivers/staging/rtl8723bs/include/wifi.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +1 -1
index 7c2680b6508c..ad803ffc0696 100644
@@ -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);
drivers/staging/rtl8723bs/include/wifi.h +1 -1
index 036cf57c65a9..23de3ab87f9c 100644
@@ -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);
Signature · 1 line
2.31.1