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

[pandora-kernel.git] / drivers / net / sfc / rx.c

diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index c0fdb59..fb402c5 100644 (file)
--- 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;