package/rtl8812-aircrack-ng: bump to 2023-05-01 version to fix build failure with Linux 6.3
Signed-off-by: Christian Stewart <christian@aperture.us> Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>2023.05.x
Christian Stewart
Yann E. MORIN
parent
f89b988d33
commit
8d6ddb7a29
|
|
@ -1,114 +0,0 @@
|
|||
From d78bda8e60ad6382c1e5832d83d8e40c923628fa Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
Date: Tue, 14 Mar 2023 13:21:11 +0100
|
||||
Subject: [PATCH] Fix build failure on PowerPC64
|
||||
|
||||
get_ra() is defined in Linux kernel for PowerPC64 architecture and it
|
||||
conflicts with local get_ra() definition so let's rename local definition
|
||||
as rtl_get_ra().
|
||||
|
||||
[Upstream status: https://github.com/aircrack-ng/rtl8812au/pull/1054]
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
core/rtw_odm.c | 6 +++---
|
||||
core/rtw_recv.c | 4 ++--
|
||||
hal/hal_com.c | 2 +-
|
||||
include/wifi.h | 2 +-
|
||||
os_dep/linux/ioctl_cfg80211.c | 2 +-
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/core/rtw_odm.c b/core/rtw_odm.c
|
||||
index 7204181..a9a7604 100644
|
||||
--- a/core/rtw_odm.c
|
||||
+++ b/core/rtw_odm.c
|
||||
@@ -273,7 +273,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(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC"
|
||||
, HDATA_RATE(attrib->data_rate)
|
||||
, phys_t0->band, phys_t0->channel, phys_t0->rxsc
|
||||
);
|
||||
@@ -389,7 +389,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(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_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
|
||||
@@ -407,7 +407,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(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_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 ffd1ff9..05bede9 100644
|
||||
--- a/core/rtw_recv.c
|
||||
+++ b/core/rtw_recv.c
|
||||
@@ -4851,7 +4851,7 @@ void rx_query_phy_status(
|
||||
wlanhdr = get_recvframe_data(precvframe);
|
||||
|
||||
ta = get_ta(wlanhdr);
|
||||
- ra = get_ra(wlanhdr);
|
||||
+ ra = rtl_get_ra(wlanhdr);
|
||||
is_ra_bmc = IS_MCAST(ra);
|
||||
|
||||
if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) {
|
||||
@@ -4991,7 +4991,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status)
|
||||
{
|
||||
s32 ret = _SUCCESS;
|
||||
u8 *pbuf = precvframe->u.hdr.rx_data;
|
||||
- u8 *pda = get_ra(pbuf);
|
||||
+ u8 *pda = rtl_get_ra(pbuf);
|
||||
u8 ra_is_bmc = IS_MCAST(pda);
|
||||
_adapter *primary_padapter = precvframe->u.hdr.adapter;
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
diff --git a/hal/hal_com.c b/hal/hal_com.c
|
||||
index dcf8edf..07b8a5e 100644
|
||||
--- a/hal/hal_com.c
|
||||
+++ b/hal/hal_com.c
|
||||
@@ -12569,7 +12569,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe)
|
||||
|
||||
/*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/
|
||||
if (psta) {
|
||||
- if (IS_MCAST(get_ra(get_recvframe_data(prframe))))
|
||||
+ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe))))
|
||||
psta_dframe_info = &psta->sta_dframe_info_bmc;
|
||||
else
|
||||
psta_dframe_info = &psta->sta_dframe_info;
|
||||
diff --git a/include/wifi.h b/include/wifi.h
|
||||
index f071dd0..b349bb9 100644
|
||||
--- a/include/wifi.h
|
||||
+++ b/include/wifi.h
|
||||
@@ -454,7 +454,7 @@ __inline static int IS_MCAST(const u8 *da)
|
||||
return _FALSE;
|
||||
}
|
||||
|
||||
-__inline static unsigned char *get_ra(unsigned char *pframe)
|
||||
+__inline static unsigned char *rtl_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 03f6240..a54125a 100644
|
||||
--- a/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -6468,7 +6468,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), rtl_get_ra(frame), &wdev))
|
||||
if (0)
|
||||
RTW_INFO("redirect to pd_wdev:%p\n", wdev);
|
||||
#endif
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Locally calculated
|
||||
sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.tar.gz
|
||||
sha256 3545efb56ecba757e1e27a5479653835e3f5be4f5b49eb9e1e4ff87cbeb6e783 rtl8812au-aircrack-ng-35308f4dd73e77fa572c48867cce737449dd8548.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e
|
||||
RTL8812AU_AIRCRACK_NG_VERSION = 35308f4dd73e77fa572c48867cce737449dd8548
|
||||
RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION))
|
||||
RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0
|
||||
RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE
|
||||
|
|
|
|||
Loading…
Reference in New Issue