From 6f970e081d0a7db12523043fad64ce4fb4b90328 Mon Sep 17 00:00:00 2001 From: Christian kimocoder Date: Thu, 24 Aug 2017 15:00:10 +0200 Subject: [PATCH] reverted back kernel 4.12 support * Reverted the kernel v4.12 support patch because of different errors on building. --- os_dep/linux/ioctl_cfg80211.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 35f0706..ccb9310 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -753,19 +753,6 @@ check_bss: #endif RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - { - struct cfg80211_roam_info roam_info = { - .channel = notify_channel, - .bssid = cur_network->network.MacAddress, - .req_ie = pmlmepriv->assoc_req+sizeof(struct rtw_ieee80211_hdr_3addr)+2, - .req_ie_len = pmlmepriv->assoc_req_len-sizeof(struct rtw_ieee80211_hdr_3addr)-2, - .resp_ie = pmlmepriv->assoc_rsp+sizeof(struct rtw_ieee80211_hdr_3addr)+6, - .resp_ie_len = pmlmepriv->assoc_rsp_len-sizeof(struct rtw_ieee80211_hdr_3addr)-6, - }; - cfg80211_roamed(padapter->pnetdev, &roam_info, GFP_ATOMIC); - } - #else cfg80211_roamed(padapter->pnetdev #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) , notify_channel @@ -776,7 +763,6 @@ check_bss: , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6 , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6 , GFP_ATOMIC); - #endif } else { #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE) RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state); @@ -1744,17 +1730,10 @@ enum nl80211_iftype { NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1 }; #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -static int cfg80211_rtw_change_iface(struct wiphy *wiphy, - struct net_device *ndev, - enum nl80211_iftype type, - struct vif_params *params) -#else static int cfg80211_rtw_change_iface(struct wiphy *wiphy, struct net_device *ndev, enum nl80211_iftype type, u32 *flags, struct vif_params *params) -#endif { enum nl80211_iftype old_type; NDIS_802_11_NETWORK_INFRASTRUCTURE networkType; @@ -3723,11 +3702,7 @@ static int #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) unsigned char name_assign_type, #endif - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) - enum nl80211_iftype type, struct vif_params *params) - #else enum nl80211_iftype type, u32 *flags, struct vif_params *params) - #endif { int ret = 0; struct net_device *ndev = NULL; @@ -6355,11 +6330,7 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) #endif #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; -#else // kernel >= 4.12 - wiphy->max_sched_scan_reqs = 1; -#endif #ifdef CONFIG_PNO_SUPPORT wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; #endif