[Buildroot] [PATCH] package/rtl8723ds: fix build failure on PowerPC
Giulio Benetti
giulio.benetti at benettiengineering.com
Thu Dec 1 14:38:58 UTC 2022
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/rtl8723ds/pull/32
Fixes:
http://autobuild.buildroot.net/results/fa2/fa2482674d789e7674dc0d83c5f54393beed4d70/
Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
---
...8723ds-get_ra-exists-only-on-PowerPC.patch | 105 ++++++++++++++++++
1 file changed, 105 insertions(+)
create mode 100644 package/rtl8723ds/0002-rtl8723ds-get_ra-exists-only-on-PowerPC.patch
diff --git a/package/rtl8723ds/0002-rtl8723ds-get_ra-exists-only-on-PowerPC.patch b/package/rtl8723ds/0002-rtl8723ds-get_ra-exists-only-on-PowerPC.patch
new file mode 100644
index 0000000000..ceb9483a32
--- /dev/null
+++ b/package/rtl8723ds/0002-rtl8723ds-get_ra-exists-only-on-PowerPC.patch
@@ -0,0 +1,105 @@
+From aaf31f36eb21b16bc628671a0c49b65ff2736a22 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti at benettiengineering.com>
+Date: Thu, 1 Dec 2022 15:24:08 +0100
+Subject: [PATCH] rtl8723ds: get_ra() exists only on PowerPC
+
+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?h=v6.1-rc7#n49
+
+Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
+---
+ core/rtw_odm.c | 6 +++---
+ core/rtw_recv.c | 6 +++---
+ include/wifi.h | 2 +-
+ os_dep/linux/ioctl_cfg80211.c | 2 +-
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/core/rtw_odm.c b/core/rtw_odm.c
+index d9b7db1..962560a 100644
+--- a/core/rtw_odm.c
++++ b/core/rtw_odm.c
+@@ -430,7 +430,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys)
+ RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n"
+ , *phys & 0xf
+ , MAC_ARG(get_ta(wlanhdr))
+- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC"
++ , is_broadcast_mac_addr(wifi_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(wifi_get_ra(wlanhdr)) ? "MC" : "UC"
+ , HDATA_RATE(attrib->data_rate)
+ , phys_t0->band, phys_t0->channel, phys_t0->rxsc
+ );
+@@ -546,7 +546,7 @@ type1_end:
+ RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n"
+ , *phys & 0xf
+ , MAC_ARG(get_ta(wlanhdr))
+- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC"
++ , is_broadcast_mac_addr(wifi_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(wifi_get_ra(wlanhdr)) ? "MC" : "UC"
+ , HDATA_RATE(attrib->data_rate)
+ , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc
+ , pkt_cch, pkt_bw
+@@ -564,7 +564,7 @@ type1_end:
+ RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n"
+ , *phys & 0xf
+ , MAC_ARG(get_ta(wlanhdr))
+- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC"
++ , is_broadcast_mac_addr(wifi_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(wifi_get_ra(wlanhdr)) ? "MC" : "UC"
+ , HDATA_RATE(attrib->data_rate)
+ , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc
+ );
+diff --git a/core/rtw_recv.c b/core/rtw_recv.c
+index 87a6b2a..6a3c26d 100644
+--- a/core/rtw_recv.c
++++ b/core/rtw_recv.c
+@@ -4444,10 +4444,10 @@ void rx_query_phy_status(
+ && _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN);
+
+ pkt_info.bToSelf = (!pattrib->icv_err) && (!pattrib->crc_err)
+- && _rtw_memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
++ && _rtw_memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
+
+ pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID
+- && _rtw_memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
++ && _rtw_memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
+
+ pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID
+ && (GetFrameSubType(wlanhdr) == WIFI_BEACON);
+@@ -4549,7 +4549,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status)
+ _adapter *iface = NULL;
+ _adapter *primary_padapter = precvframe->u.hdr.adapter;
+
+- pda = get_ra(pbuf);
++ pda = wifi_get_ra(pbuf);
+
+ if (IS_MCAST(pda) == _FALSE) { /*unicast packets*/
+ iface = rtw_get_iface_by_macddr(primary_padapter , pda);
+diff --git a/include/wifi.h b/include/wifi.h
+index ce78bf6..ccdbd0f 100644
+--- a/include/wifi.h
++++ b/include/wifi.h
+@@ -455,7 +455,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);
+diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+index a197612..4fff23a 100644
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -4735,7 +4735,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra
+
+ indicate:
+ #if defined(RTW_DEDICATED_P2P_DEVICE)
+- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev))
++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), wifi_get_ra(frame), &wdev))
+ if (0)
+ RTW_INFO("redirect to pd_wdev:%p\n", wdev);
+ #endif
+--
+2.34.1
+
--
2.34.1
More information about the buildroot
mailing list