KLIPS: Support kernels 4.14+ with renamed dev->priv_destructor

Patch based on #148 which was written by Pierre-A3i
libreswan · Dec 11, 2017 · e859478 · e859478
1 parent 6d9363e
commit e859478
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/linux/include/libreswan/ipsec_kversion.h b/linux/include/libreswan/ipsec_kversion.h
@@ -584,5 +584,9 @@ typedef struct ctl_table ctl_table;
 # define HAS_AHASH
 #endif
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 1, 14)
+# define HAS_PRIV_DESTRUCTOR
+#endif
+
 #endif /* _LIBRESWAN_KVERSIONS_H */
 
diff --git a/linux/net/ipsec/ipsec_mast.c b/linux/net/ipsec/ipsec_mast.c
@@ -2,6 +2,7 @@
  * IPSEC MAST code.
  * Copyright (C) 2005 Michael Richardson <mcr@xelerance.com>
  * Copyright (C) 2012 Paul Wouters <paul@libreswan.org>
+ * Copyright (C) 2017 Paul Wouters <pwouters@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -891,7 +892,11 @@ int ipsec_mast_probe(struct net_device *dev)
 	dev->neigh_setup        = ipsec_mast_neigh_setup_dev;
 #endif
 #ifdef ipsec_alloc_netdev
+# ifdef HAS_PRIV_DESTRUCTOR
+	dev->priv_destructor         = free_netdev;
+# else
 	dev->destructor         = free_netdev;
+# endif
 #endif
 
 #ifndef ipsec_alloc_netdev

diff --git a/linux/net/ipsec/ipsec_tunnel.c b/linux/net/ipsec/ipsec_tunnel.c
@@ -2038,7 +2038,11 @@ int ipsec_tunnel_init(struct net_device *dev)
 		    dev->name ? dev->name : "NULL");
 
 #ifdef ipsec_alloc_netdev
+# ifdef HAS_PRIV_DESTRUCTOR
+	dev->priv_destructor         = free_netdev;
+# else
 	dev->destructor         = free_netdev;
+# endif
 #endif
 
 #ifndef HAVE_NETDEV_PRIV

diff --git a/linux/net/ipsec/sysctl_net_ipsec.c b/linux/net/ipsec/sysctl_net_ipsec.c
@@ -288,7 +288,11 @@ static ctl_table ipsec_table[] = {
 	  .mode     = 0644,
 	  .child    = NULL,
 	  .proc_handler = &proc_dointvec, },
+# ifdef HAS_PRIV_DESTRUCTOR
+	{ }
+# else
 	{ 0 }
+# endif
 #else
 	{ NET_IPSEC_ICMP, "icmp", &sysctl_ipsec_icmp,
 	  sizeof(int), 0644, NULL, .proc_handler = &proc_dointvec },
@@ -297,7 +301,11 @@ static ctl_table ipsec_table[] = {
 	  sizeof(int), 0644, NULL, .proc_handler = &proc_dointvec },
 	{ NET_IPSEC_TOS, "tos", &sysctl_ipsec_tos,
 	  sizeof(int), 0644, NULL, .proc_handler = &proc_dointvec },
+# ifdef HAS_PRIV_DESTRUCTOR
+	{ }
+# else
 	{ 0 }
+# endif
 #endif
 };
 
@@ -310,10 +318,13 @@ static ctl_table ipsec_net_table[] = {
 	  .mode     = 0555,
 	  .child    = ipsec_table,
 	  .proc_handler = NULL, },
+# ifdef HAS_PRIV_DESTRUCTOR
+       { }
+# else
 	{ 0 }
+# endif
 #else
 	{ NET_IPSEC, "ipsec", NULL, 0, 0555, ipsec_table },
-	{ 0 }
 #endif
 };
 
@@ -326,10 +337,18 @@ static ctl_table ipsec_root_table[] = {
 	  .mode     = 0555,
 	  .child    = ipsec_net_table,
 	  .proc_handler = NULL, },
+# ifdef HAS_PRIV_DESTRUCTOR
+       { }
+# else
 	{ 0 }
+# endif
 #else
 	{ CTL_NET, "net", NULL, 0, 0555, ipsec_net_table },
+# ifdef HAS_PRIV_DESTRUCTOR
+	{ }
+# else
 	{ 0 }
+# endif
 #endif
 };