s390: two patch context refreshes

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 22 insertions, 20 deletions

diff --git a/queue/s390-qeth-build-max-size-GSO-skbs-on-L2-devices.patch b/queue/s390-qeth-build-max-size-GSO-skbs-on-L2-devices.patch
index 7feb8b6..913f488 100644
--- a/queue/s390-qeth-build-max-size-GSO-skbs-on-L2-devices.patch
+++ b/queue/s390-qeth-build-max-size-GSO-skbs-on-L2-devices.patch
@@ -1,4 +1,4 @@
-From 0cbff6d4546613330a1c5f139f5c368e4ce33ca1 Mon Sep 17 00:00:00 2001
+From cf0fb6513c1e042cc09f3583a61830f3f69cffb1 Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Fri, 1 Dec 2017 10:14:51 +0100
 Subject: [PATCH] s390/qeth: build max size GSO skbs on L2 devices
@@ -14,13 +14,14 @@ the stack in how large it may build the GSO skbs.
 Fixes: d52aec97e5bc ("qeth: enable scatter/gather in layer 2 mode")
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
-index 85162712d207..f21c94810373 100644
+index bd2df62a5cdf..305f3fb53b30 100644
 --- a/drivers/s390/net/qeth_l2_main.c
 +++ b/drivers/s390/net/qeth_l2_main.c
-@@ -1030,8 +1030,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
- 
+@@ -1001,8 +1001,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
+ 	}
  	card->info.broadcast_capable = 1;
  	qeth_l2_request_initial_mac(card);
 -	card->dev->gso_max_size = (QETH_MAX_BUFFER_ELEMENTS(card) - 1) *
@@ -29,10 +30,10 @@ index 85162712d207..f21c94810373 100644
  	netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT);
  	netif_carrier_off(card->dev);
 diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
-index 46a841258fc8..2a25f20566d8 100644
+index d8df1e635163..17ee8c93b54e 100644
 --- a/drivers/s390/net/qeth_l3_main.c
 +++ b/drivers/s390/net/qeth_l3_main.c
-@@ -2987,8 +2987,8 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
+@@ -3027,8 +3027,8 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
  				NETIF_F_HW_VLAN_CTAG_RX |
  				NETIF_F_HW_VLAN_CTAG_FILTER;
  	netif_keep_dst(card->dev);
diff --git a/queue/s390-qeth-fix-GSO-throughput-regression.patch b/queue/s390-qeth-fix-GSO-throughput-regression.patch
index aa19471..9891030 100644
--- a/queue/s390-qeth-fix-GSO-throughput-regression.patch
+++ b/queue/s390-qeth-fix-GSO-throughput-regression.patch
@@ -1,4 +1,4 @@
-From 6d69b1f1eb7a2edf8a3547f361c61f2538e054bb Mon Sep 17 00:00:00 2001
+From e110114ee9b7f903982e3f964836b2320ff40b4f Mon Sep 17 00:00:00 2001
 From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Date: Fri, 1 Dec 2017 10:14:50 +0100
 Subject: [PATCH] s390/qeth: fix GSO throughput regression
@@ -32,23 +32,24 @@ Fixes: 5722963a8e83 ("qeth: do not turn on SG per default")
 Reported-by: Nils Hoppmann <niho@de.ibm.com>
 Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
-index 9cd569ef43ec..15015a24f8ad 100644
+index 30bc6105aac3..ff16624787fe 100644
 --- a/drivers/s390/net/qeth_core.h
 +++ b/drivers/s390/net/qeth_core.h
-@@ -987,6 +987,9 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *,
+@@ -984,6 +984,9 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *,
  int qeth_set_features(struct net_device *, netdev_features_t);
- void qeth_recover_features(struct net_device *dev);
+ int qeth_recover_features(struct net_device *);
  netdev_features_t qeth_fix_features(struct net_device *, netdev_features_t);
 +netdev_features_t qeth_features_check(struct sk_buff *skb,
 +				      struct net_device *dev,
 +				      netdev_features_t features);
- int qeth_vm_request_mac(struct qeth_card *card);
- int qeth_push_hdr(struct sk_buff *skb, struct qeth_hdr **hdr, unsigned int len);
  
+ /* exports for OSN */
+ int qeth_osn_assist(struct net_device *, void *, int);
 diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
-index 49b9efeba1bd..d9b0e07d4fa7 100644
+index fc6d85f2b38d..3f0711ecda8b 100644
 --- a/drivers/s390/net/qeth_core_main.c
 +++ b/drivers/s390/net/qeth_core_main.c
 @@ -19,6 +19,11 @@
@@ -63,7 +64,7 @@ index 49b9efeba1bd..d9b0e07d4fa7 100644
  #include <net/iucv/af_iucv.h>
  #include <net/dsfield.h>
  
-@@ -6438,6 +6443,32 @@ netdev_features_t qeth_fix_features(struct net_device *dev,
+@@ -6421,6 +6426,32 @@ netdev_features_t qeth_fix_features(struct net_device *dev,
  }
  EXPORT_SYMBOL_GPL(qeth_fix_features);
  
@@ -97,10 +98,10 @@ index 49b9efeba1bd..d9b0e07d4fa7 100644
  {
  	int rc;
 diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
-index d2537c09126d..85162712d207 100644
+index 305f3fb53b30..96b163476761 100644
 --- a/drivers/s390/net/qeth_l2_main.c
 +++ b/drivers/s390/net/qeth_l2_main.c
-@@ -960,6 +960,7 @@ static const struct net_device_ops qeth_l2_netdev_ops = {
+@@ -943,6 +943,7 @@ static const struct net_device_ops qeth_l2_netdev_ops = {
  	.ndo_stop		= qeth_l2_stop,
  	.ndo_get_stats		= qeth_get_stats,
  	.ndo_start_xmit		= qeth_l2_hard_start_xmit,
@@ -108,7 +109,7 @@ index d2537c09126d..85162712d207 100644
  	.ndo_validate_addr	= eth_validate_addr,
  	.ndo_set_rx_mode	= qeth_l2_set_rx_mode,
  	.ndo_do_ioctl		= qeth_do_ioctl,
-@@ -1010,6 +1011,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
+@@ -989,6 +990,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
  	if (card->info.type == QETH_CARD_TYPE_OSD && !card->info.guestlan) {
  		card->dev->hw_features = NETIF_F_SG;
  		card->dev->vlan_features = NETIF_F_SG;
@@ -117,10 +118,10 @@ index d2537c09126d..85162712d207 100644
  		if (qeth_is_supported(card, IPA_OUTBOUND_CHECKSUM)) {
  			card->dev->hw_features |= NETIF_F_IP_CSUM;
 diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
-index e79936b50698..46a841258fc8 100644
+index b8b858242699..97d29555061a 100644
 --- a/drivers/s390/net/qeth_l3_main.c
 +++ b/drivers/s390/net/qeth_l3_main.c
-@@ -2918,6 +2918,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = {
+@@ -2946,6 +2946,7 @@ static const struct net_device_ops qeth_l3_netdev_ops = {
  	.ndo_stop		= qeth_l3_stop,
  	.ndo_get_stats		= qeth_get_stats,
  	.ndo_start_xmit		= qeth_l3_hard_start_xmit,
@@ -128,7 +129,7 @@ index e79936b50698..46a841258fc8 100644
  	.ndo_validate_addr	= eth_validate_addr,
  	.ndo_set_rx_mode	= qeth_l3_set_multicast_list,
  	.ndo_do_ioctl		= qeth_do_ioctl,
-@@ -2958,6 +2959,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
+@@ -3002,6 +3003,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
  				card->dev->vlan_features = NETIF_F_SG |
  					NETIF_F_RXCSUM | NETIF_F_IP_CSUM |
  					NETIF_F_TSO;