diff options
| author | Stefan Raspl | 2014-04-28 10:05:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-04-28 19:44:10 +0200 |
| commit | 290b8348c0ef7f23de8a974d83c96fc095d3bda7 (patch) | |
| tree | 0d417277f8da4933d3f1a31ea144d95338358639 /drivers/s390/net/qeth_l2_main.c | |
| parent | qeth: replace PTR_RET with PTR_ERR_OR_ZERO (diff) | |
| download | kernel-qcow2-linux-290b8348c0ef7f23de8a974d83c96fc095d3bda7.tar.gz kernel-qcow2-linux-290b8348c0ef7f23de8a974d83c96fc095d3bda7.tar.xz kernel-qcow2-linux-290b8348c0ef7f23de8a974d83c96fc095d3bda7.zip | |
qeth: Extend priority queueing to IPv6
Make the current priority queueing logic apply to IPv6 traffic.
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_l2_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 8dea3f12ccc1..e232ceca38fe 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -725,15 +725,20 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) int elements = 0; struct qeth_card *card = dev->ml_priv; struct sk_buff *new_skb = skb; - int ipv = qeth_get_ip_version(skb); int cast_type = qeth_l2_get_cast_type(card, skb); - struct qeth_qdio_out_q *queue = card->qdio.out_qs - [qeth_get_priority_queue(card, skb, ipv, cast_type)]; + struct qeth_qdio_out_q *queue; int tx_bytes = skb->len; int data_offset = -1; int elements_needed = 0; int hd_len = 0; + if (card->qdio.do_prio_queueing || (cast_type && + card->info.is_multicast_different)) + queue = card->qdio.out_qs[qeth_get_priority_queue(card, skb, + qeth_get_ip_version(skb), cast_type)]; + else + queue = card->qdio.out_qs[card->qdio.default_out_queue]; + if ((card->state != CARD_STATE_UP) || !card->lan_online) { card->stats.tx_carrier_errors++; goto tx_drop; |