diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2020-03-18 13:54:47 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-18 16:33:35 -0700 |
| commit | 1c103cf819da7af23c96d968d3172b4358970502 (patch) | |
| tree | 548f3469580e88b8225e23fb6a45072ed043695b /drivers/s390/net/qeth_l3_main.c | |
| parent | s390/qeth: use memory reserves in TX slow path (diff) | |
| download | linux-dev-1c103cf819da7af23c96d968d3172b4358970502.tar.xz linux-dev-1c103cf819da7af23c96d968d3172b4358970502.zip | |
s390/qeth: remove prio-queueing support for z/VM NICs
z/VM NICs don't offer HW QoS for TX rings. So just use netdev_pick_tx()
to distribute the connections equally over all enabled TX queues.
We start with just 1 enabled TX queue (this matches the typical
configuration without prio-queueing). A follow-on patch will allow users
to enable additional TX queues.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 8a803d6c9357..81ec0d2b7ea5 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -1880,7 +1880,8 @@ static u16 qeth_l3_osa_select_queue(struct net_device *dev, struct sk_buff *skb, { struct qeth_card *card = dev->ml_priv; - return qeth_get_priority_queue(card, skb); + return IS_VM_NIC(card) ? netdev_pick_tx(dev, skb, sb_dev) : + qeth_get_priority_queue(card, skb); } static const struct net_device_ops qeth_l3_netdev_ops = { @@ -1922,6 +1923,10 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok) unsigned int headroom; int rc; + rc = qeth_setup_netdev(card); + if (rc) + return rc; + if (IS_OSD(card) || IS_OSX(card)) { if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) || (card->info.link_type == QETH_LINK_TYPE_HSTR)) { |