diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2019-04-17 19:17:33 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-17 20:33:59 +0300 |
| commit | 73dc2daf110f4a4e777003b22dda09bb40948fc9 (patch) | |
| tree | 49b9f62d80fc361a419002b6d86ced8fe4230017 /drivers/s390/net/qeth_l3_main.c | |
| parent | 3a18d75400ff14cf3518637579974e22aa0113bd (diff) | |
| download | linux-73dc2daf110f4a4e777003b22dda09bb40948fc9.tar.xz | |
s390/qeth: add TX multiqueue support for OSA devices
This adds trivial support for multiple TX queues on OSA-style devices
(both real HW and z/VM NICs). For now we expose the driver's existing
QoS mechanism via .ndo_select_queue, and adjust the number of available
TX queues when qeth_update_from_chp_desc() detects that the
HW configuration has changed.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_l3_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 120193e90adb..65244da4f415 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -2084,7 +2084,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, else cast_type = RTN_UNICAST; } else { - queue = qeth_get_tx_queue(card, skb, ipv); + queue = card->qdio.out_qs[txq]; cast_type = qeth_l3_get_cast_type(skb); } @@ -2162,6 +2162,14 @@ static u16 qeth_l3_iqd_select_queue(struct net_device *dev, struct sk_buff *skb, sb_dev); } +static u16 qeth_l3_osa_select_queue(struct net_device *dev, struct sk_buff *skb, + struct net_device *sb_dev) +{ + struct qeth_card *card = dev->ml_priv; + + return qeth_get_priority_queue(card, skb); +} + static const struct net_device_ops qeth_l3_netdev_ops = { .ndo_open = qeth_open, .ndo_stop = qeth_stop, @@ -2184,6 +2192,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { .ndo_get_stats64 = qeth_get_stats64, .ndo_start_xmit = qeth_l3_hard_start_xmit, .ndo_features_check = qeth_l3_osa_features_check, + .ndo_select_queue = qeth_l3_osa_select_queue, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = qeth_l3_set_rx_mode, .ndo_do_ioctl = qeth_do_ioctl, |