Commit fdd3c5f0 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: clarify remaining dev_kfree_skb_any() users 



For none of the users we are under risk of running in HW IRQ context or
or with IRQs disabled. Thus we always end up in consume_skb().

But the two occurences in the RX path should really report the dropped
packet to dropmon, so have them use kfree_skb() instead. That's also
consistent with what napi_free_frags() does internally.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a18c28f0

drivers/s390/net/qeth_core_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2630,7 +2630,7 @@ static void qeth_free_qdio_queues(struct qeth_card *card) 
	qeth_free_cq(card);

	for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) {

		if (card->qdio.in_q->bufs[j].rx_skb)

			dev_kfree_skb_any(card->qdio.in_q->bufs[j].rx_skb);

			consume_skb(card->qdio.in_q->bufs[j].rx_skb);

	}

	qeth_free_qdio_queue(card->qdio.in_q);

	card->qdio.in_q = NULL;
@@ -5606,7 +5606,7 @@ static void qeth_receive_skb(struct qeth_card *card, struct sk_buff *skb, 
		if (uses_frags)

			napi_free_frags(napi);

		else

			dev_kfree_skb_any(skb);

			kfree_skb(skb);

		return;

	}
@@ -5797,7 +5797,7 @@ static int qeth_extract_skb(struct qeth_card *card, 
					if (uses_frags)

						napi_free_frags(napi);

					else

						dev_kfree_skb_any(skb);

						kfree_skb(skb);

					QETH_CARD_STAT_INC(card,

							   rx_length_errors);

				}