[Buildroot] [git commit branch/2022.08.x] package/rtl8723bu: fix build failure on PowerPC

Peter Korsgaard peter at korsgaard.com
Fri Nov 4 08:06:47 UTC 2022


commit: https://git.buildroot.net/buildroot/commit/?id=36222e99f43b2c6cbcac73942d75b5c6b22d6691
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.08.x

Add local patch(pending upstream[0]) to fix build failure with PowerPC due
to a package re-defition of get_ra() that is only defined in Linux PowerPC
implementation.

[0]: https://github.com/lwfinger/rtl8723bu/pull/192

Fixes:
http://autobuild.buildroot.net/results/99571b055e6185d57f89b90821b76099ebc766ed/

Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
(cherry picked from commit 9833f110bb7e2b85a362f8c49246ea7349a36bcb)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 ...Fix-build-failure-on-PowerPc-architecture.patch | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch
new file mode 100644
index 0000000000..06cf2d64c1
--- /dev/null
+++ b/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch
@@ -0,0 +1,47 @@
+From dde7bddfddddb7212f2d9671391e2096d770c449 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti at benettiengineering.com>
+Date: Sun, 23 Oct 2022 22:57:41 +0200
+Subject: [PATCH] Fix build failure on PowerPc architecture
+
+In PowerPc Linux only get_ra() exists[0] and conflicts with local get_ra()
+that has a completely different purpose. So let's rename local get_ra()
+to wifi_get_ra() to make it different from Linux's get_ra().
+
+[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/asm/disassemble.h#n49
+
+Upstream: https://github.com/lwfinger/rtl8723bu/pull/192
+Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
+---
+ hal/rtl8723bu_recv.c | 2 +-
+ include/wifi.h       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hal/rtl8723bu_recv.c b/hal/rtl8723bu_recv.c
+index a2fc82b..39e5044 100644
+--- a/hal/rtl8723bu_recv.c
++++ b/hal/rtl8723bu_recv.c
+@@ -288,7 +288,7 @@ void update_recvframe_phyinfo(
+ 		!pattrib->icv_err && !pattrib->crc_err &&
+ 		_rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN));
+ 
+-	pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN));
++	pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(wifi_get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN));
+ 
+ 	pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON);
+ 	sa = get_ta(wlanhdr);
+diff --git a/include/wifi.h b/include/wifi.h
+index 5dc32eb..23578cc 100644
+--- a/include/wifi.h
++++ b/include/wifi.h
+@@ -373,7 +373,7 @@ __inline static int IS_MCAST(unsigned char *da)
+ 		return _FALSE;
+ }
+ 
+-__inline static unsigned char * get_ra(unsigned char *pframe)
++__inline static unsigned char * wifi_get_ra(unsigned char *pframe)
+ {
+ 	unsigned char	*ra;
+ 	ra = GetAddr1Ptr(pframe);
+-- 
+2.34.1
+



More information about the buildroot mailing list