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

Commit aebf6244 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: Be more forgiving toward SW GRO 



This introduces 2 new relaxations in the bnx2x driver regarding GRO:
  1. Don't prevent SW GRO if HW GRO is disabled.
  2. If all aggregations are disabled, when GRO configuration changes
     there's no need to perform an inner-reload [since it will have no
     actual effect].

Signed-off-by: default avatarDmitry Kravkov <Dmitry.Kravkov@qlogic.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarAriel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14f806a0

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

+9 −1
Original line number Diff line number Diff line
@@ -4811,11 +4811,15 @@ netdev_features_t bnx2x_fix_features(struct net_device *dev, 
	struct bnx2x *bp = netdev_priv(dev);



	/* TPA requires Rx CSUM offloading */

	if (!(features & NETIF_F_RXCSUM) || bp->disable_tpa) {

	if (!(features & NETIF_F_RXCSUM)) {

		features &= ~NETIF_F_LRO;

		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;

}
@@ -4854,6 +4858,10 @@ int bnx2x_set_features(struct net_device *dev, netdev_features_t features) 
	if ((changes & GRO_ENABLE_FLAG) && (flags & TPA_ENABLE_FLAG))

		changes &= ~GRO_ENABLE_FLAG;



	/* if GRO is changed while HW TPA is off, don't force a reload */

	if ((changes & GRO_ENABLE_FLAG) && bp->disable_tpa)

		changes &= ~GRO_ENABLE_FLAG;



	if (changes)

		bnx2x_reload = true;