From: Aaron Taylor <ataylor@subgeniuskitty.com>
Date: Wed, 28 Apr 2021 08:28:26 +0000 (-0700)
Subject: Updated host/linvnet.c per the changes to net_device->destructor.
X-Git-Tag: first-build~22
X-Git-Url: https://git.subgeniuskitty.com/xeon-phi-kernel-module/.git/commitdiff_plain/46724449c89117889a7f9f3639ecadedc107f47b

Updated host/linvnet.c per the changes to net_device->destructor.

See also:

  - https://github.com/torvalds/linux/commit/cf124db566e6b036b8bcbe8decbed740bdfac8c6
---

diff --git a/host/linvnet.c b/host/linvnet.c
index 8082e41..b45acd2 100644
--- a/host/linvnet.c
+++ b/host/linvnet.c
@@ -221,7 +221,8 @@ micveth_setup(struct net_device *dev)
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
 	dev->netdev_ops = &veth_netdev_ops;
 #endif
-	dev->destructor = free_netdev;
+	dev->priv_destructor = free_netdev;
+	dev->needs_free_netdev = false;
 
 	/* Fill in device structure with ethernet-generic values. */
 	dev->mtu = (MICVETH_MAX_PACKET_SIZE);
@@ -231,7 +232,7 @@ micveth_setup(struct net_device *dev)
 }
 
 static int
-micveth_validate(struct nlattr *tb[], struct nlattr *data[])
+micveth_validate(struct nlattr *tb[], struct nlattr *data[], struct netlink_ext_ack *dummy)
 {
 	if (tb[IFLA_ADDRESS]) {
 		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)