diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-20 10:30:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-20 10:30:47 -0800 |
| commit | 0d5b8d7055652fd6b079671d00fa78fcd0e2cd7c (patch) | |
| tree | 8f3a001e656ec08d2279a6557ebfa08760250fcf /drivers/s390/net/qeth_core_main.c | |
| parent | 16a556eeb7ed2dc3709fe2c5be76accdfa4901ab (diff) | |
| parent | 54a61fbc020fd2e305680871c453abcf7fc0339b (diff) | |
Merge branch 's390-fixes'
Julian Wiedmann says:
====================
s390/qeth: fixes 2020-02-20
please apply the following patch series for qeth to netdev's net tree.
This corrects three minor issues:
1) return a more fitting errno when VNICC cmds are not supported,
2) remove a bogus WARN in the NAPI code, and
3) be _very_ pedantic about the RX copybreak.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 9639938581f5..5efcaa43615b 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -5344,7 +5344,7 @@ next_packet: } use_rx_sg = (card->options.cq == QETH_CQ_ENABLED) || - ((skb_len >= card->options.rx_sg_cb) && + (skb_len > card->options.rx_sg_cb && !atomic_read(&card->force_alloc_skb) && !IS_OSN(card)); @@ -5447,7 +5447,6 @@ static int qeth_extract_skbs(struct qeth_card *card, int budget, { int work_done = 0; - WARN_ON_ONCE(!budget); *done = false; while (budget) { |