aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Wiedmann <jwi@linux.vnet.ibm.com>2017-12-01 04:14:51 -0500
committerDavid S. Miller <davem@davemloft.net>2017-12-02 21:35:21 -0500
commit0cbff6d4546613330a1c5f139f5c368e4ce33ca1 (patch)
tree14e2711455df8f47abeedf8692d8f4f0b3cdbe92
parent6d69b1f1eb7a2edf8a3547f361c61f2538e054bb (diff)
s390/qeth: build max size GSO skbs on L2 devices
The current GSO skb size limit was copy&pasted over from the L3 path, where it is needed due to a TSO limitation. As L2 devices don't offer TSO support (and thus all GSO skbs are segmented before they reach the driver), there's no reason to restrict 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>
-rw-r--r--drivers/s390/net/qeth_l2_main.c2
-rw-r--r--drivers/s390/net/qeth_l3_main.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 85162712d207..f21c94810373 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)
1030 1030
1031 card->info.broadcast_capable = 1; 1031 card->info.broadcast_capable = 1;
1032 qeth_l2_request_initial_mac(card); 1032 qeth_l2_request_initial_mac(card);
1033 card->dev->gso_max_size = (QETH_MAX_BUFFER_ELEMENTS(card) - 1) *
1034 PAGE_SIZE;
1035 SET_NETDEV_DEV(card->dev, &card->gdev->dev); 1033 SET_NETDEV_DEV(card->dev, &card->gdev->dev);
1036 netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT); 1034 netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT);
1037 netif_carrier_off(card->dev); 1035 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
--- 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)
2987 NETIF_F_HW_VLAN_CTAG_RX | 2987 NETIF_F_HW_VLAN_CTAG_RX |
2988 NETIF_F_HW_VLAN_CTAG_FILTER; 2988 NETIF_F_HW_VLAN_CTAG_FILTER;
2989 netif_keep_dst(card->dev); 2989 netif_keep_dst(card->dev);
2990 card->dev->gso_max_size = (QETH_MAX_BUFFER_ELEMENTS(card) - 1) * 2990 netif_set_gso_max_size(card->dev, (QETH_MAX_BUFFER_ELEMENTS(card) - 1) *
2991 PAGE_SIZE; 2991 PAGE_SIZE);
2992 2992
2993 SET_NETDEV_DEV(card->dev, &card->gdev->dev); 2993 SET_NETDEV_DEV(card->dev, &card->gdev->dev);
2994 netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT); 2994 netif_napi_add(card->dev, &card->napi, qeth_poll, QETH_NAPI_WEIGHT);