dropped queue-4.4/s390-qeth-add-missing-hash-table-initializations.patch

diff --git a/queue-4.4/s390-qeth-add-missing-hash-table-initializations.patch b/queue-4.4/s390-qeth-add-missing-hash-table-initializations.patch
deleted file mode 100644 (file)
index 95604a2..0000000
--- a/queue-4.4/s390-qeth-add-missing-hash-table-initializations.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From foo@baz Fri Jun  2 09:29:55 JST 2017
-From: Ursula Braun <ubraun@linux.vnet.ibm.com>
-Date: Wed, 10 May 2017 19:07:54 +0200
-Subject: s390/qeth: add missing hash table initializations
-
-From: Ursula Braun <ubraun@linux.vnet.ibm.com>
-
-
-[ Upstream commit ebccc7397e4a49ff64c8f44a54895de9d32fe742 ]
-
-commit 5f78e29ceebf ("qeth: optimize IP handling in rx_mode callback")
-added new hash tables, but missed to initialize them.
-
-Fixes: 5f78e29ceebf ("qeth: optimize IP handling in rx_mode callback")
-Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
-Reviewed-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
-Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/s390/net/qeth_l3_main.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/s390/net/qeth_l3_main.c
-+++ b/drivers/s390/net/qeth_l3_main.c
-@@ -3232,6 +3232,8 @@ static int qeth_l3_probe_device(struct c
-       rc = qeth_l3_create_device_attributes(&gdev->dev);
-       if (rc)
-               return rc;
-+      hash_init(card->ip_htable);
-+      hash_init(card->ip_mc_htable);
-       card->options.layer2 = 0;
-       card->info.hwtrap = 0;
-       return 0;

diff --git a/queue-4.4/series b/queue-4.4/series
index 217c438f9e07a86ee99d1ae29d4ee63a2a2d6e01..f1a0b4390bacc6dd133d89298ad18412821a3556 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -4,7 +4,6 @@ ipv6-dccp-do-not-inherit-ipv6_mc_list-from-parent.patch
 s390-qeth-handle-sysfs-error-during-initialization.patch
 s390-qeth-unbreak-osm-and-osn-support.patch
 s390-qeth-avoid-null-pointer-dereference-on-osn.patch
-s390-qeth-add-missing-hash-table-initializations.patch
 tcp-avoid-fragmenting-peculiar-skbs-in-sack.patch
 sctp-fix-src-address-selection-if-using-secondary-addresses-for-ipv6.patch
 sctp-do-not-inherit-ipv6_-mc-ac-fl-_list-from-parent.patch