[Buildroot] [PATCH] package/rtl8188eu: fix build failure on PowerPC

[Buildroot] [PATCH] package/rtl8188eu: fix build failure on PowerPC

[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/rtl8188eu/pull/432

Fixes:
http://autobuild.buildroot.net/results/8bcb4d0adabc141ff8144f9e22bd549e3cd8858a/

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 ...uild-failure-on-PowerPc-architecture.patch | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch

diff --git a/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
new file mode 100644
index 0000000000..b16a312c7e
--- /dev/null
+++ b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
@@ -0,0 +1,106 @@
+From 2a91a721d634a2eca131628b5c9c028af20037af Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Sun, 27 Nov 2022 14:20:43 +0100
+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
+
+Upstream: https://github.com/lwfinger/rtl8188eu/pull/432
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ ioctl_cfg80211.c | 2 +-
+ rtw_odm.c        | 6 +++---
+ rtw_recv.c       | 6 +++---
+ wifi.h           | 2 +-
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/ioctl_cfg80211.c b/ioctl_cfg80211.c
+index 0ea5460..af43097 100644
+--- a/ioctl_cfg80211.c
++++ b/ioctl_cfg80211.c
+@@ -4607,7 +4607,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
+diff --git a/rtw_odm.c b/rtw_odm.c
+index 922a7b9..ad17080 100644
+--- a/rtw_odm.c
++++ b/rtw_odm.c
+@@ -283,7 +283,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(get_ra(wlanhdr)) ? "MC" : "UC"
+ 					, HDATA_RATE(attrib->data_rate)
+ 					, phys_t0->band, phys_t0->channel, phys_t0->rxsc
+ 				);
+@@ -399,7 +399,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(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
+@@ -417,7 +417,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(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/rtw_recv.c b/rtw_recv.c
+index 9439415..24eb9e9 100755
+--- a/rtw_recv.c
++++ b/rtw_recv.c
+@@ -4040,10 +4040,10 @@ void rx_query_phy_status(
+ 		&& !memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN);
+ 
+ 	pkt_info.is_to_self = (!pattrib->icv_err) && (!pattrib->crc_err)
+-		&& !memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
++		&& !memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
+ 
+ 	pkt_info.is_packet_to_self = pkt_info.is_packet_match_bssid
+-		&& !memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
++		&& !memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
+ 
+ 	pkt_info.is_packet_beacon = pkt_info.is_packet_match_bssid
+ 				 && (get_frame_sub_type(wlanhdr) == WIFI_BEACON);
+@@ -4129,7 +4129,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/wifi.h b/wifi.h
+index a6fc5b4..4b7377b 100644
+--- a/wifi.h
++++ b/wifi.h
+@@ -404,7 +404,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

Re: [Buildroot] [PATCH] package/rtl8188eu: fix build failure on PowerPC

[Luca Ceresoli via buildroot]

Hi Giulio,

On Sun, 27 Nov 2022 14:28:55 +0100
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:

> 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/rtl8188eu/pull/432
> 
> Fixes:
> http://autobuild.buildroot.net/results/8bcb4d0adabc141ff8144f9e22bd549e3cd8858a/
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
>  ...uild-failure-on-PowerPc-architecture.patch | 106 ++++++++++++++++++
>  1 file changed, 106 insertions(+)
>  create mode 100644 package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
> 
> diff --git a/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
> new file mode 100644
> index 0000000000..b16a312c7e
> --- /dev/null
> +++ b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
> @@ -0,0 +1,106 @@
> +From 2a91a721d634a2eca131628b5c9c028af20037af Mon Sep 17 00:00:00 2001
> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +Date: Sun, 27 Nov 2022 14:20:43 +0100
> +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
> +
> +Upstream: https://github.com/lwfinger/rtl8188eu/pull/432
> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

Thank you!

I have posted some change request to the commit message on your patch
for upstream, but the patch content itself looks good, so I guess for
the Buildroot needs this is enough:

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/rtl8188eu: fix build failure on PowerPC

[Giulio Benetti]

Hi Luca,

On 28/11/22 10:55, Luca Ceresoli wrote:
> Hi Giulio,
> 
> On Sun, 27 Nov 2022 14:28:55 +0100
> Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:
> 
>> 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/rtl8188eu/pull/432
>>
>> Fixes:
>> http://autobuild.buildroot.net/results/8bcb4d0adabc141ff8144f9e22bd549e3cd8858a/
>>
>> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
>> ---
>>   ...uild-failure-on-PowerPc-architecture.patch | 106 ++++++++++++++++++
>>   1 file changed, 106 insertions(+)
>>   create mode 100644 package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
>>
>> diff --git a/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
>> new file mode 100644
>> index 0000000000..b16a312c7e
>> --- /dev/null
>> +++ b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
>> @@ -0,0 +1,106 @@
>> +From 2a91a721d634a2eca131628b5c9c028af20037af Mon Sep 17 00:00:00 2001
>> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
>> +Date: Sun, 27 Nov 2022 14:20:43 +0100
>> +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
>> +
>> +Upstream: https://github.com/lwfinger/rtl8188eu/pull/432
>> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> 
> Thank you!
> 
> I have posted some change request to the commit message on your patch
> for upstream, but the patch content itself looks good, so I guess for
> the Buildroot needs this is enough:

Unfortunately I've forgotten some code replacement on get_ra() that has
been pointed upstream. The maintainer answered quickly so at this point
I'd wait some day, if the patch is then merged I'll send a patch to
bump the version, otherwise a send a V2 of this patch with the local
patch.

Thank you!
Kind regards
-- 
Giulio Benetti
Benetti Engineering sas

> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/rtl8188eu: fix build failure on PowerPC

[Giulio Benetti]

Hello,

this patch is superseded by this new patch:
https://patchwork.ozlabs.org/project/buildroot/patch/20221129140533.438862-1-giulio.benetti@benettiengineering.com/

Best regards
-- 
Giulio Benetti
Benetti Engineering sas

On 27/11/22 14:28, Giulio Benetti wrote:
> 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/rtl8188eu/pull/432
> 
> Fixes:
> http://autobuild.buildroot.net/results/8bcb4d0adabc141ff8144f9e22bd549e3cd8858a/
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
>   ...uild-failure-on-PowerPc-architecture.patch | 106 ++++++++++++++++++
>   1 file changed, 106 insertions(+)
>   create mode 100644 package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
> 
> diff --git a/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
> new file mode 100644
> index 0000000000..b16a312c7e
> --- /dev/null
> +++ b/package/rtl8188eu/0001-Fix-build-failure-on-PowerPc-architecture.patch
> @@ -0,0 +1,106 @@
> +From 2a91a721d634a2eca131628b5c9c028af20037af Mon Sep 17 00:00:00 2001
> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +Date: Sun, 27 Nov 2022 14:20:43 +0100
> +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
> +
> +Upstream: https://github.com/lwfinger/rtl8188eu/pull/432
> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +---
> + ioctl_cfg80211.c | 2 +-
> + rtw_odm.c        | 6 +++---
> + rtw_recv.c       | 6 +++---
> + wifi.h           | 2 +-
> + 4 files changed, 8 insertions(+), 8 deletions(-)
> +
> +diff --git a/ioctl_cfg80211.c b/ioctl_cfg80211.c
> +index 0ea5460..af43097 100644
> +--- a/ioctl_cfg80211.c
> ++++ b/ioctl_cfg80211.c
> +@@ -4607,7 +4607,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
> +diff --git a/rtw_odm.c b/rtw_odm.c
> +index 922a7b9..ad17080 100644
> +--- a/rtw_odm.c
> ++++ b/rtw_odm.c
> +@@ -283,7 +283,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(get_ra(wlanhdr)) ? "MC" : "UC"
> + 					, HDATA_RATE(attrib->data_rate)
> + 					, phys_t0->band, phys_t0->channel, phys_t0->rxsc
> + 				);
> +@@ -399,7 +399,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(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
> +@@ -417,7 +417,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(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/rtw_recv.c b/rtw_recv.c
> +index 9439415..24eb9e9 100755
> +--- a/rtw_recv.c
> ++++ b/rtw_recv.c
> +@@ -4040,10 +4040,10 @@ void rx_query_phy_status(
> + 		&& !memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN);
> +
> + 	pkt_info.is_to_self = (!pattrib->icv_err) && (!pattrib->crc_err)
> +-		&& !memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
> ++		&& !memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
> +
> + 	pkt_info.is_packet_to_self = pkt_info.is_packet_match_bssid
> +-		&& !memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
> ++		&& !memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN);
> +
> + 	pkt_info.is_packet_beacon = pkt_info.is_packet_match_bssid
> + 				 && (get_frame_sub_type(wlanhdr) == WIFI_BEACON);
> +@@ -4129,7 +4129,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/wifi.h b/wifi.h
> +index a6fc5b4..4b7377b 100644
> +--- a/wifi.h
> ++++ b/wifi.h
> +@@ -404,7 +404,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
> +

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