[Buildroot] [PATCH] package/rtl8723bu: fix build failure on PowerPc

* [Buildroot] [PATCH] package/rtl8723bu: fix build failure on PowerPc
@ 2022-10-23 22:14 Giulio Benetti
  2022-10-24 21:12 ` Thomas Petazzoni via buildroot
  2022-11-04  8:07 ` Peter Korsgaard
  0 siblings, 2 replies; 4+ messages in thread
From: Giulio Benetti @ 2022-10-23 22:14 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti

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@benettiengineering.com>
---
 ...uild-failure-on-PowerPc-architecture.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch

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..2665a6d031
--- /dev/null
+++ b/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch
@@ -0,0 +1,46 @@
+From dde7bddfddddb7212f2d9671391e2096d770c449 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@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
+
+Signed-off-by: Giulio Benetti <giulio.benetti@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
+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread