4.11.9: Fix build regression due to netdev destructor fix

As seen in [upstream commit](https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.11.9&id=ed66e50d9587fc0bb032e276a2563c0068a5b63a) Signed-off-by: masterzorag <masterzorag@gmail.com>
masterzorag · Jul 6, 2017 · 0a294fa · 0a294fa
1 parent eef0b1f
commit 0a294fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/include/osdep_intf.h b/include/osdep_intf.h
@@ -160,7 +160,9 @@ void rtw_drv_free_vir_ifaces(struct dvobj_priv *dvobj);
 #endif //CONFIG_MULTI_VIR_IFACES
 #endif
 
+#if (LINUX_VERSION_CODE<KERNEL_VERSION(4,11,9))
 void rtw_ndev_destructor(_nic_hdl ndev);
+#endif
 
 #ifdef CONFIG_ARP_KEEP_ALIVE
 int	rtw_gw_addr_query(_adapter *padapter);

diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
@@ -3960,8 +3960,12 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne
 	mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
 	strncpy(mon_ndev->name, name, IFNAMSIZ);
 	mon_ndev->name[IFNAMSIZ - 1] = 0;
-	mon_ndev->destructor = rtw_ndev_destructor;
-
+#if (LINUX_VERSION_CODE>=KERNEL_VERSION(4,11,9))
+	mon_ndev->needs_free_netdev = true;
+#else
+	mon_ndev->destructor = rtw_ndev_destructor;
+#endif
+
 #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
 	mon_ndev->netdev_ops = &rtw_cfg80211_monitor_if_ops;
 #else