Merge pull request #48 from evilphish/v5.1.5

Fix for compilation error on 4.10 kernel
This commit is contained in:
Christian B 2017-11-08 20:43:37 +01:00 committed by GitHub
commit 731a1c37bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3731,8 +3731,10 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne
mon_ndev->name[IFNAMSIZ - 1] = 0; mon_ndev->name[IFNAMSIZ - 1] = 0;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12 ,0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12 ,0))
mon_ndev->needs_free_netdev = true; mon_ndev->needs_free_netdev = true;
#else #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
mon_ndev->priv_destructor = rtw_ndev_destructor; mon_ndev->priv_destructor = rtw_ndev_destructor;
#else
mon_ndev->destructor = rtw_ndev_destructor;
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 9)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 9))
mon_ndev->needs_free_netdev = false; mon_ndev->needs_free_netdev = false;