Skip to content

series: fix build + run against kernel > 5.6.x #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paralin wants to merge 6 commits into
base: master
Choose a base branch
from
Open

series: fix build + run against kernel > 5.6.x #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99f1e8b
Fix implicit fallthrough comments for kernel 5.3
Oct 25, 2019
cde2dbf
Fix kernel 5.3 driver crashes, from aircrack-ng/rtl8812au#421
Oct 25, 2019
5b66419
Fix using sprintf for extending string, which causes undefined behavior
omegacoleman Jul 17, 2020
19aee91
rename sha256_state to rtl_sha256_state to avoid name conflict with c…
omegacoleman Aug 17, 2020
9421b07
disable rtw_mgmt_frame_register on kernel 5.8.0
paralin Sep 9, 2020
d3bd268
rtw_proc: convert file_operations to proc_ops for 5.6.x compat
paralin Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/rtw_mlme_ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,9 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
else
ptable->func = &OnAuthClient;
//pass through
//fallthrough
case WIFI_ASSOCREQ:
//fallthrough
case WIFI_REASSOCREQ:
_mgt_dispatcher(padapter, ptable, precv_frame);
#ifdef CONFIG_HOSTAPD_MLME
Expand Down
2 changes: 1 addition & 1 deletion core/rtw_mp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,7 +1871,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
} else {
psd_data = rtw_GetPSDData(pAdapter, i);
}
sprintf(data, "%s%x ", data, psd_data);
sprintf(data + strlen(data), "%x ", psd_data);
i++;
}

Expand Down
10 changes: 5 additions & 5 deletions core/rtw_security.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2200,7 +2200,7 @@ u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe)

#ifndef PLATFORM_FREEBSD
/* compress 512-bits */
static int sha256_compress(struct sha256_state *md, unsigned char *buf)
static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
{
u32 S[8], W[64], t0, t1;
u32 t;
Expand Down Expand Up @@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
}

/* Initialize the hash state */
static void sha256_init(struct sha256_state *md)
static void sha256_init(struct rtl_sha256_state *md)
{
md->curlen = 0;
md->length = 0;
Expand All @@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md)
@param inlen The length of the data (octets)
@return CRYPT_OK if successful
*/
static int sha256_process(struct sha256_state *md, unsigned char *in,
static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
unsigned long inlen)
{
unsigned long n;
Expand Down Expand Up @@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
@param out [out] The destination of the hash (32 bytes)
@return CRYPT_OK if successful
*/
static int sha256_done(struct sha256_state *md, unsigned char *out)
static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
{
int i;

Expand Down Expand Up @@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
u8 *mac)
{
struct sha256_state ctx;
struct rtl_sha256_state ctx;
size_t i;

sha256_init(&ctx);
Expand Down
2 changes: 1 addition & 1 deletion include/rtw_security.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ struct security_priv {
#endif /* DBG_SW_SEC_CNT */
};

struct sha256_state {
struct rtl_sha256_state {
u64 length;
u32 state[8], curlen;
u8 buf[64];
Expand Down
4 changes: 4 additions & 0 deletions os_dep/linux/ioctl_cfg80211.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5177,6 +5177,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
return ret;
}

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
struct wireless_dev *wdev,
Expand Down Expand Up @@ -5205,6 +5206,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
exit:
return;
}
#endif

#if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
Expand Down Expand Up @@ -6021,7 +6023,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = {

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
.mgmt_tx = cfg80211_rtw_mgmt_tx,
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
#endif
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35))
.action = cfg80211_rtw_mgmt_tx,
#endif
Expand Down
Loading
⚡