Commit 1b4c0f3b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/20210520064801.1961972-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ca8d993

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);