mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-11-27 23:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix channel switch in the monitor mode if both CONFIG_WIRELESS_EXT and CONFIG_CFG80211_WEXT are enabled

Browse Source
This commit is contained in:
Sergei Makarenkov 2017-01-20 11:24:42 +03:00 committed by astsam
parent a4265bec23
commit a88ff7e621
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os_dep/linux/ioctl_linux.c
View File

@ -1813,7 +1813,6 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ;
int ret = 0;
if (_FAIL == rtw_pwr_wakeup(padapter)) {
ret = -EPERM;
goto exit;
@ -12686,8 +12685,9 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
}
#endif
#ifdef CONFIG_WIRELESS_EXT
struct iw_handler_def rtw_handlers_def = {
#if defined(CONFIG_WIRELESS_EXT) && !defined(CONFIG_CFG80211_WEXT)
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)

2
os_dep/linux/os_intfs.c
View File

@ -1288,7 +1288,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
/* pnetdev->tx_timeout = NULL; */
pnetdev->watchdog_timeo = HZ * 3; /* 3 second timeout */
#ifdef CONFIG_WIRELESS_EXT
#if defined(CONFIG_WIRELESS_EXT) && !defined(CONFIG_CFG80211_WEXT)
pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
#endif