Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / ethernet / intel / ice / ice_base.c

diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
index 1e32438081780892061be751f825ee868096cf47..1e97242a8f857a5a13511f584e16be3eb0be433b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -405,7 +405,7 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring)
        /* Strip the Ethernet CRC bytes before the packet is posted to host
         * memory.
         */
-       rlan_ctx.crcstrip = 1;
+       rlan_ctx.crcstrip = !(ring->flags & ICE_RX_FLAGS_CRC_STRIP_DIS);
 
        /* L2TSEL flag defines the reported L2 Tags in the receive descriptor
         * and it needs to remain 1 for non-DVM capable configurations to not