diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
| commit | e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06 (patch) | |
| tree | 04b1728c397ad4604a6163529f51dfd48dfdbc07 /drivers/s390/net/qeth_core_main.c | |
| parent | b4d9785ce5c035b672f25df56706d0ff4e68b74e (diff) | |
| parent | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (diff) | |
| download | linux-e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.
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) { |