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: Dmitry Kravkov <Dmitry.Kravkov@qlogic.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 2f46f181cac8d8f207c1e346ace53c13c3a0a45d..a54ac4560900a52d45b72f9e4535fd86bac83a79 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -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;