sfc: Wrap __efx_rx_packet() with efx_rx_flush_packet()

The pipeline mechanism will need to change a bit for scattered
packets.  Add a wrapper to insulate efx_process_channel() from this.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

3 files changed, 9 insertions, 7 deletions

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 34b56ec87fba..f8013c3ea37c 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -250,11 +250,7 @@ static int efx_process_channel(struct efx_channel *channel, int budget)
                 struct efx_rx_queue *rx_queue =
                         efx_channel_get_rx_queue(channel);
 
-                /* Deliver last RX packet. */
-                if (channel->rx_pkt) {
-                        __efx_rx_packet(channel, channel->rx_pkt);
-                        channel->rx_pkt = NULL;
-                }
+                efx_rx_flush_packet(channel);
                 if (rx_queue->enabled)
                         efx_fast_push_rx_descriptors(rx_queue);
         }
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 64c555e493be..00e7077fa1d8 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -43,6 +43,13 @@ extern void __efx_rx_packet(struct efx_channel *channel,
                             struct efx_rx_buffer *rx_buf);
 extern void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
                           unsigned int len, u16 flags);
+static inline void efx_rx_flush_packet(struct efx_channel *channel)
+{
+        if (channel->rx_pkt) {
+                __efx_rx_packet(channel, channel->rx_pkt);
+                channel->rx_pkt = NULL;
+        }
+}
 extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);
 
 #define EFX_MAX_DMAQ_SIZE 4096UL
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index 31361db28f91..60f4eb7cebc6 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -465,8 +465,7 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
          */
         rx_buf->len = len - efx->type->rx_buffer_hash_size;
 out:
-        if (channel->rx_pkt)
-                __efx_rx_packet(channel, channel->rx_pkt);
+        efx_rx_flush_packet(channel);
         channel->rx_pkt = rx_buf;
 }