Commit d43a7e67 authored by Vladislav Zolotarov's avatar Vladislav Zolotarov Committed by David S. Miller

bnx2x: Do not allow enabling LRO if disable_tpa=1

Bug fix: Do not allow enabling LRO if disable_tpa=1.
Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1e1a199
...@@ -9968,12 +9968,14 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data) ...@@ -9968,12 +9968,14 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
/* TPA requires Rx CSUM offloading */ /* TPA requires Rx CSUM offloading */
if ((data & ETH_FLAG_LRO) && bp->rx_csum) { if ((data & ETH_FLAG_LRO) && bp->rx_csum) {
if (!(dev->features & NETIF_F_LRO)) { if (!disable_tpa) {
dev->features |= NETIF_F_LRO; if (!(dev->features & NETIF_F_LRO)) {
bp->flags |= TPA_ENABLE_FLAG; dev->features |= NETIF_F_LRO;
changed = 1; bp->flags |= TPA_ENABLE_FLAG;
} changed = 1;
}
} else
rc = -EINVAL;
} else if (dev->features & NETIF_F_LRO) { } else if (dev->features & NETIF_F_LRO) {
dev->features &= ~NETIF_F_LRO; dev->features &= ~NETIF_F_LRO;
bp->flags &= ~TPA_ENABLE_FLAG; bp->flags &= ~TPA_ENABLE_FLAG;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment