mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2024-11-22 13:24:36 +00:00
Revert back some changes to fix frame injection
This commit is contained in:
kimocoder
parent
12e3c5d56a
commit
d1d2446e05
19
Makefile
19
Makefile
@ -10,7 +10,6 @@ EXTRA_CFLAGS += -Wextra
|
||||
#EXTRA_CFLAGS += -Wno-tautological-compare
|
||||
#EXTRA_CFLAGS += -Wno-incompatible-pointer-types
|
||||
#EXTRA_CFLAGS += -Wno-switch
|
||||
EXTRA_CFLAGS += -Wmissing-field-initializers
|
||||
EXTRA_CFLAGS += -Wno-cast-function-type
|
||||
EXTRA_CFLAGS += -Wno-unused-variable
|
||||
EXTRA_CFLAGS += -Wno-unused-value
|
||||
@ -44,12 +43,8 @@ CONFIG_RTL8821A = y
|
||||
CONFIG_RTL8814A = y
|
||||
######################### Interface ###########################
|
||||
CONFIG_USB_HCI = y
|
||||
######################### LED ###########################
|
||||
CONFIG_LED_CONTROL = y
|
||||
CONFIG_LED_ENABLE = y
|
||||
########################## Features ###########################
|
||||
CONFIG_NET_NS = n
|
||||
CONFIG_IPV6_DISABLE = n
|
||||
CONFIG_MP_INCLUDED = y
|
||||
CONFIG_CONCURRENT_MODE = n
|
||||
CONFIG_POWER_SAVING = n
|
||||
@ -156,7 +151,6 @@ CONFIG_PLATFORM_ARM_SPREADTRUM_6820 = n
|
||||
CONFIG_PLATFORM_ARM_SPREADTRUM_8810 = n
|
||||
CONFIG_PLATFORM_ARM_WMT = n
|
||||
CONFIG_PLATFORM_ARM_RPI = n
|
||||
CONFIG_PLATFORM_ARM64_RPI = n
|
||||
CONFIG_PLATFORM_ARM_ODROIDC2 = n
|
||||
CONFIG_PLATFORM_TI_DM365 = n
|
||||
CONFIG_PLATFORM_MOZART = n
|
||||
@ -1457,17 +1451,6 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
|
||||
INSTALL_PREFIX :=
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_PLATFORM_ARM64_RPI), y)
|
||||
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
||||
EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT
|
||||
ARCH ?= arm64
|
||||
CROSS_COMPILE ?=
|
||||
KVER ?= $(shell uname -r)
|
||||
KSRC := /lib/modules/$(KVER)/build
|
||||
MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
|
||||
INSTALL_PREFIX :=
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_PLATFORM_ARM_ODROIDC2), y)
|
||||
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
||||
EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
|
||||
@ -1730,7 +1713,7 @@ install:
|
||||
/sbin/depmod -a ${KVER}
|
||||
|
||||
uninstall:
|
||||
rm -f $(MODDESTDIR)$(MODULE_NAME).ko
|
||||
rm -f $(MODDESTDIR)/$(MODULE_NAME).ko
|
||||
/sbin/depmod -a ${KVER}
|
||||
|
||||
backup_rtlwifi:
|
||||
|
||||
@ -5965,7 +5965,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
|
||||
/* DS parameter set */
|
||||
pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&pwdinfo->listen_channel, &pattrib->pktlen);
|
||||
|
||||
#if 0
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
if (adapter_wdev_data(padapter)->p2p_enabled && pwdinfo->driver_interface == DRIVER_CFG80211) {
|
||||
if (pmlmepriv->wps_probe_resp_ie != NULL && pmlmepriv->p2p_probe_resp_ie != NULL) {
|
||||
/* WPS IE */
|
||||
|
||||
@ -3964,12 +3964,6 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
|
||||
rtap_hdr = (struct ieee80211_radiotap_header *)&hdr_buf[0];
|
||||
rtap_hdr->it_version = PKTHDR_RADIOTAP_VERSION;
|
||||
|
||||
#ifdef CONFIG_RTL8814A
|
||||
/* RTL8814AU rx descriptor has no bandwidth, ldpc, stbc and sgi info */
|
||||
/* fixup bandwidth */
|
||||
pattrib->bw = pattrib->phy_info.band_width & 0x03;
|
||||
#endif
|
||||
|
||||
/* tsft */
|
||||
if (pattrib->tsfl) {
|
||||
u64 tmp_64bit;
|
||||
@ -4088,19 +4082,22 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
|
||||
hdr_buf[rt_len] |= BIT1; /* MCS index known */
|
||||
|
||||
/* bandwidth */
|
||||
#ifdef CONFIG_RTL8814A
|
||||
if(pattrib->physt) {
|
||||
hdr_buf[rt_len] |= BIT0;
|
||||
hdr_buf[rt_len+1] |= (pattrib->phy_info.band_width & 0x03);
|
||||
}
|
||||
#else
|
||||
hdr_buf[rt_len] |= BIT0;
|
||||
hdr_buf[rt_len + 1] |= (pattrib->bw & 0x03);
|
||||
|
||||
/* guard interval */
|
||||
#ifndef CONFIG_RTL8814A
|
||||
hdr_buf[rt_len] |= BIT2;
|
||||
#endif
|
||||
/* guard interval */
|
||||
hdr_buf[rt_len] |= BIT2;
|
||||
hdr_buf[rt_len + 1] |= (pattrib->sgi & 0x01) << 2;
|
||||
|
||||
/* STBC */
|
||||
#ifndef CONFIG_RTL8814A
|
||||
hdr_buf[rt_len] |= BIT5;
|
||||
#endif
|
||||
hdr_buf[rt_len + 1] |= (pattrib->stbc & 0x03) << 5;
|
||||
|
||||
rt_len += 2;
|
||||
@ -4135,9 +4132,7 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
|
||||
hdr_buf[rt_len + 2] |= (pattrib->sgi & 0x01) << 2;
|
||||
|
||||
/* LDPC extra OFDM symbol */
|
||||
#ifndef CONFIG_RTL8814A
|
||||
tmp_16bit |= BIT4;
|
||||
#endif
|
||||
hdr_buf[rt_len + 2] |= (pattrib->ldpc & 0x01) << 4;
|
||||
|
||||
memcpy(&hdr_buf[rt_len], &tmp_16bit, 2);
|
||||
|
||||
@ -7,12 +7,11 @@ else
|
||||
echo "About to run dkms install steps..."
|
||||
fi
|
||||
|
||||
|
||||
DRV_DIR=`pwd`
|
||||
DRV_DIR=rtl8812au
|
||||
DRV_NAME=rtl8812au
|
||||
DRV_VERSION=5.3.4
|
||||
|
||||
cp -r ${DRV_DIR} /usr/src/${DRV_NAME}-${DRV_VERSION}
|
||||
cp -r $(pwd) /usr/src/${DRV_NAME}-${DRV_VERSION}
|
||||
|
||||
dkms add -m ${DRV_NAME} -v ${DRV_VERSION}
|
||||
dkms build -m ${DRV_NAME} -v ${DRV_VERSION}
|
||||
@ -21,7 +20,7 @@ RESULT=$?
|
||||
|
||||
echo "Finished running dkms install steps."
|
||||
|
||||
if grep -q -e "^CONFIG_DISABLE_IPV6 = y$" "$DRV_DIR/Makefile" ; then
|
||||
|
||||
if echo "net.ipv6.conf.all.disable_ipv6 = 1
|
||||
net.ipv6.conf.default.disable_ipv6 = 1
|
||||
net.ipv6.conf.lo.disable_ipv6 = 1" >> /etc/sysctl.conf; then
|
||||
@ -30,6 +29,6 @@ if grep -q -e "^CONFIG_DISABLE_IPV6 = y$" "$DRV_DIR/Makefile" ; then
|
||||
else
|
||||
echo "Could not disable IPv6"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
exit $RESULT
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PACKAGE_NAME="realtek-rtl88xxau"
|
||||
PACKAGE_VERSION="5.3.4~20190409"
|
||||
PACKAGE_VERSION="5.3.4~20190522"
|
||||
CLEAN="'make' clean"
|
||||
BUILT_MODULE_NAME[0]=88XXau
|
||||
PROCS_NUM=`nproc`
|
||||
|
||||
@ -299,13 +299,13 @@ odm_config_bb_with_header_file(
|
||||
/*if (p_dm->rfe_type == 0)
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type0);
|
||||
else if (dm->rfe_type == 2)
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type2);
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type2);
|
||||
else if (dm->rfe_type == 3)
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type3);
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type3);
|
||||
else if (dm->rfe_type == 4)
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type4);
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type4);
|
||||
else if (dm->rfe_type == 5)
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type5);
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type5);
|
||||
else if (dm->rfe_type == 7)
|
||||
READ_AND_CONFIG_MP(8814a,_phy_reg_pg_type7);
|
||||
else if (dm->rfe_type == 8)
|
||||
|
||||
@ -334,7 +334,7 @@ void rtl8814_init_dm_priv(IN PADAPTER Adapter)
|
||||
#endif
|
||||
|
||||
Init_ODM_ComInfo_8814(Adapter);
|
||||
odm_init_all_timers(podmpriv );
|
||||
odm_init_all_timers(podmpriv );
|
||||
//PHYDM_InitDebugSetting(podmpriv);
|
||||
|
||||
pHalData->CurrentTxPwrIdx = 18;
|
||||
|
||||
@ -1094,7 +1094,7 @@ PHY_SetRFPowerState8814A(
|
||||
#elif (DEV_BUS_TYPE == RT_SDIO_INTERFACE)
|
||||
bResult = phy_SetRFPowerState_8814Sdio(Adapter, eRFPowerState);
|
||||
#endif
|
||||
|
||||
|
||||
RT_TRACE(COMP_RF, DBG_LOUD, ("<--------- PHY_SetRFPowerState8814(): bResult(%d)\n", bResult));
|
||||
|
||||
return bResult;
|
||||
@ -1230,18 +1230,17 @@ PHY_GetTxPowerIndex8814A(
|
||||
tic->ebias = 0;
|
||||
}
|
||||
|
||||
phy_TxPwrAdjInPercentage(pAdapter, (u8 *)&txPower);
|
||||
if(txPower > MAX_POWER_INDEX)
|
||||
txPower = MAX_POWER_INDEX;
|
||||
|
||||
//if (Adapter->registrypriv.mp_mode==0 &&
|
||||
//if (Adapter->registrypriv.mp_mode==0 &&
|
||||
//(pHalData->bautoload_fail_flag || pHalData->EfuseMap[EFUSE_INIT_MAP][EEPROM_TX_PWR_INX_JAGUAR] == 0xFF))
|
||||
//txPower = 0x12;
|
||||
|
||||
/*RTW_INFO("Final Tx Power(RF-%c, Channel: %d) = %d(0x%X)\n", ((RFPath==0)?'A':(RFPath==1)?'B':(RFPath==2)?'C':'D'), Channel,
|
||||
txPower, txPower);*/
|
||||
|
||||
return (u8) txPower;
|
||||
return (u8) txPower;
|
||||
}
|
||||
|
||||
|
||||
@ -1249,7 +1248,7 @@ VOID
|
||||
PHY_SetTxPowerIndex_8814A(
|
||||
IN PADAPTER Adapter,
|
||||
IN u32 PowerIndex,
|
||||
IN enum rf_path RFPath,
|
||||
IN enum rf_path RFPath,
|
||||
IN u8 Rate
|
||||
)
|
||||
{
|
||||
|
||||
@ -3939,22 +3939,43 @@ int value;
|
||||
value = dbm;
|
||||
#endif
|
||||
|
||||
if (value < 0) {
|
||||
if(value < 0)
|
||||
value = 0;
|
||||
}
|
||||
if (value > 40) {
|
||||
if(value > 40)
|
||||
value = 40;
|
||||
}
|
||||
if (type == NL80211_TX_POWER_FIXED) {
|
||||
pHalData->CurrentTxPwrIdx = value;
|
||||
rtw_hal_set_tx_power_level(padapter, pHalData->current_channel);
|
||||
} else {
|
||||
|
||||
if(type == NL80211_TX_POWER_FIXED) {
|
||||
pHalData->CurrentTxPwrIdx = value;
|
||||
rtw_hal_set_tx_power_level(padapter, pHalData->current_channel);
|
||||
} else
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
}
|
||||
return -EOPNOTSUPP;
|
||||
#if 0
|
||||
struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
|
||||
int ret;
|
||||
|
||||
switch (type) {
|
||||
case NL80211_TX_POWER_AUTOMATIC:
|
||||
return 0;
|
||||
case NL80211_TX_POWER_FIXED:
|
||||
if (mbm < 0 || (mbm % 100))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!test_bit(IWM_STATUS_READY, &iwm->status))
|
||||
return 0;
|
||||
|
||||
ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX,
|
||||
CFG_TX_PWR_LIMIT_USR,
|
||||
MBM_TO_DBM(mbm) * 2);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return iwm_tx_power_trigger(iwm);
|
||||
default:
|
||||
IWM_ERR(iwm, "Unsupported power type: %d\n", type);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
#endif
|
||||
RTW_INFO("%s\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
@ -5710,48 +5731,104 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
|
||||
/* TODO: 160 MHz bandwidth */
|
||||
static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy, struct cfg80211_chan_def *chandef)
|
||||
static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
, struct cfg80211_chan_def *chandef
|
||||
#else
|
||||
, struct ieee80211_channel *chan
|
||||
, enum nl80211_channel_type channel_type
|
||||
#endif
|
||||
)
|
||||
{
|
||||
int chan_target = (u8) ieee80211_frequency_to_channel(chandef->chan->center_freq);
|
||||
int chan_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
int chan_width = CHANNEL_WIDTH_20;
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
struct ieee80211_channel *chan = chandef->chan;
|
||||
#endif
|
||||
|
||||
_adapter *padapter = wiphy_to_adapter(wiphy);
|
||||
int target_channal = chan->hw_value;
|
||||
int target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
int target_width = CHANNEL_WIDTH_20;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
#ifdef CONFIG_DEBUG_CFG80211
|
||||
RTW_INFO("center_freq %u Mhz ch %u width %u freq1 %u freq2 %u\n"
|
||||
, chan->center_freq
|
||||
, chan->hw_value
|
||||
, chandef->width
|
||||
, chandef->center_freq1
|
||||
, chandef->center_freq2);
|
||||
#endif /* CONFIG_DEBUG_CFG80211 */
|
||||
|
||||
switch (chandef->width) {
|
||||
case NL80211_CHAN_WIDTH_20_NOHT:
|
||||
case NL80211_CHAN_WIDTH_20:
|
||||
chan_width = CHANNEL_WIDTH_20;
|
||||
chan_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
target_width = CHANNEL_WIDTH_20;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
case NL80211_CHAN_WIDTH_40:
|
||||
chan_width = CHANNEL_WIDTH_40;
|
||||
if (chandef->center_freq1 > chandef->chan->center_freq)
|
||||
chan_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
|
||||
target_width = CHANNEL_WIDTH_40;
|
||||
if (chandef->center_freq1 > chan->center_freq)
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
|
||||
else
|
||||
chan_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
|
||||
break;
|
||||
case NL80211_CHAN_WIDTH_80:
|
||||
chan_width = CHANNEL_WIDTH_80;
|
||||
if (chandef->center_freq1 > chandef->chan->center_freq)
|
||||
chan_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
|
||||
else
|
||||
chan_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
|
||||
target_width = CHANNEL_WIDTH_80;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
case NL80211_CHAN_WIDTH_80P80:
|
||||
target_width = CHANNEL_WIDTH_80_80;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
case NL80211_CHAN_WIDTH_160:
|
||||
target_width = CHANNEL_WIDTH_160;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
|
||||
case NL80211_CHAN_WIDTH_5:
|
||||
case NL80211_CHAN_WIDTH_10:
|
||||
#endif
|
||||
default:
|
||||
chan_width = CHANNEL_WIDTH_20;
|
||||
chan_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
target_width = CHANNEL_WIDTH_20;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
}
|
||||
#else
|
||||
#ifdef CONFIG_DEBUG_CFG80211
|
||||
RTW_INFO("center_freq %u Mhz ch %u channel_type %u\n"
|
||||
, chan->center_freq
|
||||
, chan->hw_value
|
||||
, channel_type);
|
||||
#endif /* CONFIG_DEBUG_CFG80211 */
|
||||
|
||||
switch (channel_type) {
|
||||
case NL80211_CHAN_NO_HT:
|
||||
case NL80211_CHAN_HT20:
|
||||
target_width = CHANNEL_WIDTH_20;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
case NL80211_CHAN_HT40MINUS:
|
||||
target_width = CHANNEL_WIDTH_40;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
|
||||
break;
|
||||
case NL80211_CHAN_HT40PLUS:
|
||||
target_width = CHANNEL_WIDTH_40;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
|
||||
break;
|
||||
default:
|
||||
target_width = CHANNEL_WIDTH_20;
|
||||
target_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
RTW_INFO(FUNC_ADPT_FMT" ch:%d bw:%d, offset:%d\n"
|
||||
, FUNC_ADPT_ARG(padapter), target_channal, target_width, target_offset);
|
||||
|
||||
rtw_set_chbw_cmd(padapter, target_channal, target_width, target_offset, RTW_CMDF_WAIT_ACK);
|
||||
|
||||
set_channel_bwmode(padapter, chan_target, chan_offset, chan_width);
|
||||
RTW_INFO("%s : %d %d %d\n", __func__, chan_target, chan_offset, chan_width);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev,
|
||||
struct cfg80211_auth_request *req)
|
||||
@ -9458,9 +9535,6 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
|
||||
.set_pmksa = cfg80211_rtw_set_pmksa,
|
||||
.del_pmksa = cfg80211_rtw_del_pmksa,
|
||||
.flush_pmksa = cfg80211_rtw_flush_pmksa,
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
|
||||
.set_monitor_channel = cfg80211_rtw_set_monitor_channel,
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_AP_MODE
|
||||
.add_virtual_intf = cfg80211_rtw_add_virtual_intf,
|
||||
|
||||
@ -6942,7 +6942,7 @@ out:
|
||||
static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len)
|
||||
{
|
||||
int ret = 0;
|
||||
u32 wep_key_idx, wep_key_len, wep_total_len = 0;
|
||||
u32 wep_key_idx, wep_key_len, wep_total_len;
|
||||
NDIS_802_11_WEP *pwep = NULL;
|
||||
struct sta_info *psta = NULL, *pbcmc_sta = NULL;
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
|
||||
@ -12355,9 +12355,8 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_WIRELESS_EXT) && !defined(CONFIG_CFG80211_WEXT)
|
||||
struct iw_handler_def rtw_handlers_def =
|
||||
{
|
||||
#ifdef CONFIG_WIRELESS_EXT
|
||||
struct iw_handler_def rtw_handlers_def = {
|
||||
.standard = rtw_handlers,
|
||||
.num_standard = sizeof(rtw_handlers) / sizeof(iw_handler),
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) || defined(CONFIG_WEXT_PRIV)
|
||||
|
||||
@ -1531,7 +1531,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
|
||||
/* pnetdev->tx_timeout = NULL; */
|
||||
pnetdev->watchdog_timeo = HZ * 3; /* 3 second timeout */
|
||||
|
||||
#if defined(CONFIG_WIRELESS_EXT) && !defined(CONFIG_CFG80211_WEXT)
|
||||
#ifdef CONFIG_WIRELESS_EXT
|
||||
pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
|
||||
#endif
|
||||
|
||||
@ -2650,8 +2650,8 @@ static int netdev_vir_if_close(struct net_device *pnetdev)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR;
|
||||
padapter->rtw_wdev->current_bss = NULL;
|
||||
wdev->iftype = NL80211_IFTYPE_MONITOR;
|
||||
wdev->current_bss = NULL;
|
||||
rtw_scan_abort(padapter);
|
||||
rtw_cfg80211_wait_scan_req_empty(padapter, 200);
|
||||
adapter_wdev_data(padapter)->bandroid_scan = _FALSE;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user