From: Greg Kroah-Hartman Date: Tue, 6 Jun 2017 07:19:08 +0000 (+0200) Subject: dropped queue-4.4/s390-qeth-add-missing-hash-table-initializations.patch X-Git-Tag: v3.18.56~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd20fcd86e55e3c4bab40736e99f9bfbabc9a174;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 95604a229fd..00000000000 --- 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 -Date: Wed, 10 May 2017 19:07:54 +0200 -Subject: s390/qeth: add missing hash table initializations - -From: Ursula Braun - - -[ 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 -Reviewed-by: Julian Wiedmann -Signed-off-by: Julian Wiedmann -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - 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 217c438f9e0..f1a0b4390ba 100644 --- 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