Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9b9e860 authored by Michal Schmidt's avatar Michal Schmidt Committed by David S. Miller
Browse files

bnx2x: mark LRO as a fixed disabled feature if disable_tpa is set 



If disable_tpa is set, remove NETIF_F_LRO from hw_features, so ethtool sees
it as "off [fixed]".

Note that setting the NETIF_F_LRO bit in dev->features in the 'else'
branch is not needed, because the bit was already set by
bnx2x_init_dev().

Then the check for disable_tpa in in bnx2x_fix_features() becomes unnecessary.

Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f300ff4

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+0 −4
Original line number Diff line number Diff line
@@ -4834,10 +4834,6 @@ netdev_features_t bnx2x_fix_features(struct net_device *dev, 
		features &= ~NETIF_F_GRO;

	}



	/* Note: do not disable SW GRO in kernel when HW GRO is off */

	if (bp->disable_tpa)

		features &= ~NETIF_F_LRO;



	return features;

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -12108,10 +12108,10 @@ static int bnx2x_init_bp(struct bnx2x *bp) 
	/* Set TPA flags */

	if (bp->disable_tpa) {

		bp->flags &= ~(TPA_ENABLE_FLAG | GRO_ENABLE_FLAG);

		bp->dev->hw_features &= ~NETIF_F_LRO;

		bp->dev->features &= ~NETIF_F_LRO;

	} else {

		bp->flags |= (TPA_ENABLE_FLAG | GRO_ENABLE_FLAG);

		bp->dev->features |= NETIF_F_LRO;

	}



	if (CHIP_IS_E1(bp))