From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 4 Jul 2017 07:58:57 +0000 (+0200)
Subject: 4.11-stable patches
X-Git-Tag: v3.18.60~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=272ca519104230e0bbf2e6050604b55776bab0cc;p=thirdparty%2Fkernel%2Fstable-queue.git

4.11-stable patches

added patches:
	hsi-fix-build-regression-due-to-netdev-destructor-fix.patch
---

diff --git a/queue-4.11/hsi-fix-build-regression-due-to-netdev-destructor-fix.patch b/queue-4.11/hsi-fix-build-regression-due-to-netdev-destructor-fix.patch
new file mode 100644
index 00000000000..6ad61b96002
--- /dev/null
+++ b/queue-4.11/hsi-fix-build-regression-due-to-netdev-destructor-fix.patch
@@ -0,0 +1,32 @@
+From ed66e50d9587fc0bb032e276a2563c0068a5b63a Mon Sep 17 00:00:00 2001
+From: "David S. Miller" <davem@davemloft.net>
+Date: Thu, 8 Jun 2017 10:16:05 -0400
+Subject: hsi: Fix build regression due to netdev destructor fix.
+
+From: David S. Miller <davem@davemloft.net>
+
+commit ed66e50d9587fc0bb032e276a2563c0068a5b63a upstream.
+
+> ../drivers/hsi/clients/ssi_protocol.c:1069:5: error: 'struct net_device' has no member named 'destructor'
+
+Reported-by: Mark Brown <broonie@kernel.org>
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hsi/clients/ssi_protocol.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/hsi/clients/ssi_protocol.c
++++ b/drivers/hsi/clients/ssi_protocol.c
+@@ -1065,7 +1065,7 @@ static void ssip_pn_setup(struct net_dev
+ 	dev->addr_len		= 1;
+ 	dev->tx_queue_len	= SSIP_TXQUEUE_LEN;
+ 
+-	dev->destructor		= free_netdev;
++	dev->needs_free_netdev	= true;
+ 	dev->header_ops		= &phonet_header_ops;
+ }
+ 
diff --git a/queue-4.11/series b/queue-4.11/series
index 9885ec1763c..040a411a9b8 100644
--- a/queue-4.11/series
+++ b/queue-4.11/series
@@ -83,3 +83,4 @@ kvm-x86-vpmu-fix-undefined-shift-in-intel_pmu_refresh.patch
 kvm-x86-zero-base3-of-unusable-segments.patch
 kvm-nvmx-fix-exception-injection.patch
 esp4-fix-udpencap-for-local-tcp-packets.patch
+hsi-fix-build-regression-due-to-netdev-destructor-fix.patch