lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bnx2x: Do not allow enabling LRO if disable_tpa=1

Browse Source 
Bug fix: Do not allow enabling LRO if disable_tpa=1.

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladislav Zolotarov
2010-02-17 02:03:40 +00:00
committed by David S. Miller
parent f1e1a199f3
commit d43a7e67ae
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/bnx2x_main.c
View File

@@ -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;