sfc: Move test of rx_checksum_enabled from nic.c to rx.c

This is preparation for using the generic netdev features interface,
and should have no effect in itself.

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

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index e8396614daf3..2594f39c3ba4 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -850,7 +850,6 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
         unsigned expected_ptr;
         bool rx_ev_pkt_ok, discard = false, checksummed;
         struct efx_rx_queue *rx_queue;
-        struct efx_nic *efx = channel->efx;
 
         /* Basic packet information */
         rx_ev_byte_cnt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_BYTE_CNT);
@@ -873,9 +872,8 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
                  * UDP/IP, then we can rely on the hardware checksum.
                  */
                 checksummed =
-                        likely(efx->rx_checksum_enabled) &&
-                        (rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_TCP ||
-                         rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_UDP);
+                        rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_TCP ||
+                        rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_UDP;
         } else {
                 efx_handle_rx_not_ok(rx_queue, event, &rx_ev_pkt_ok, &discard);
                 checksummed = false;
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index c0fdb59030fb..fb402c52aaff 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -605,6 +605,9 @@ void __efx_rx_packet(struct efx_channel *channel,
                 skb_record_rx_queue(skb, channel->channel);
         }
 
+        if (unlikely(!efx->rx_checksum_enabled))
+                checksummed = false;
+
         if (likely(checksummed || rx_buf->is_page)) {
                 efx_rx_packet_gro(channel, rx_buf, eh, checksummed);
                 return;