Commit 8c771f32 authored by Sophie Brun's avatar Sophie Brun

New upstream version 5.3.4~20200115

parent 7fc0fb36
config RTL8821AU
tristate "Realtek 8821A USB WiFi"
config RTL8812AU
tristate "Realtek 8812A USB WiFi"
depends on USB
---help---
Help message of RTL8821AU
Help message of RTL8812AU
......@@ -49,7 +49,7 @@ CONFIG_USB_HCI = y
CONFIG_LED_CONTROL = y
CONFIG_LED_ENABLE = y
########################## Features ###########################
CONFIG_NET_NS = n
CONFIG_NET_NS = y
CONFIG_IPV6_DISABLE = n
CONFIG_MP_INCLUDED = y
CONFIG_CONCURRENT_MODE = n
......@@ -79,7 +79,7 @@ CONFIG_WIFI_MONITOR = y
# Otherwise some channels may be flagged 'NO-IR' (i.e. Passive scanning) by the driver.
# Please check your country's regulatory domain first,
# to see whether active scanning is permitted by law/regulations on the desired channels.
CONFIG_DISABLE_REGD_C=y
CONFIG_DISABLE_REGD_C = y
CONFIG_MCC_MODE = n
CONFIG_APPEND_VENDOR_IE_ENABLE = n
CONFIG_RTW_NAPI = y
......
......@@ -4378,7 +4378,7 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
unsigned char *pframe;
u8 dummybuf[32];
int len = skb->len, rtap_len;
int len = skb->len, rtap_len, consume;
if (skb)
rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
......@@ -4395,12 +4395,16 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
if (unlikely(skb->len < rtap_len))
goto fail;
if (rtap_len != 12) {
RTW_INFO("radiotap len (should be 14): %d\n", rtap_len);
goto fail;
len -= sizeof(struct ieee80211_radiotap_header);
rtap_len -= sizeof(struct ieee80211_radiotap_header);
while(rtap_len) {
consume = rtap_len > sizeof(dummybuf) ? sizeof(dummybuf) : rtap_len;
_rtw_pktfile_read(&pktfile, dummybuf, consume);
rtap_len -= consume;
len -= consume;
}
_rtw_pktfile_read(&pktfile, dummybuf, rtap_len-sizeof(struct ieee80211_radiotap_header));
len = len - rtap_len;
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) {
......
PACKAGE_NAME="realtek-rtl88xxau"
PACKAGE_VERSION="5.3.4~20190522"
PACKAGE_VERSION="5.3.4~20200115"
CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=88XXau
PROCS_NUM=`nproc`
......
......@@ -21,12 +21,11 @@
* Public General Config
*/
#define AUTOCONF_INCLUDED
#define RTL871X_MODULE_NAME "8821AU"
#define RTL871X_MODULE_NAME "8812AU"
#ifndef DRV_NAME
#define DRV_NAME "rtl8821au"
#define DRV_NAME "rtl8812au"
#endif
#define CONFIG_USB_HCI
#define PLATFORM_LINUX
......
......@@ -4286,11 +4286,6 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
if (unlikely(skb->len < rtap_len))
goto fail;
if (rtap_len != 14) {
RTW_INFO("radiotap len (should be 14): %d\n", rtap_len);
goto fail;
}
/* Skip the ratio tap header */
skb_pull(skb, rtap_len);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment