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

This commit is contained in:
kimocoder 2019-11-11 02:43:26 +01:00
parent e14a513282
commit 8bdef804c3
2 changed files with 5 additions and 3 deletions

View File

@ -1,3 +1,4 @@
/****************************************************************************** /******************************************************************************
* *
* Copyright(c) 2007 - 2017 Realtek Corporation. * Copyright(c) 2007 - 2017 Realtek Corporation.
@ -12402,8 +12403,9 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
} }
#endif #endif
#ifdef CONFIG_WIRELESS_EXT #if defined(CONFIG_WIRELESS_EXT) && !defined(CONFIG_CFG80211_WEXT)
struct iw_handler_def rtw_handlers_def = { struct iw_handler_def rtw_handlers_def =
{
.standard = rtw_handlers, .standard = rtw_handlers,
.num_standard = sizeof(rtw_handlers) / sizeof(iw_handler), .num_standard = sizeof(rtw_handlers) / sizeof(iw_handler),
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) || defined(CONFIG_WEXT_PRIV) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) || defined(CONFIG_WEXT_PRIV)

View File

@ -1626,7 +1626,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
/* pnetdev->tx_timeout = NULL; */ /* pnetdev->tx_timeout = NULL; */
pnetdev->watchdog_timeo = HZ * 3; /* 3 second timeout */ 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; pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
#endif #endif