summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2010-02-17 02:03:40 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-17 13:35:42 -0800
commitd43a7e67ae2f911765b3d5b6cbb85221a9ffd0a4 (patch)
treeb21a43a0bceccb2eca7bbe52c2e20cfa09198cbb /drivers
parentf1e1a199f3a68a32cf86095b3650d761ee8798b9 (diff)
downloadlinux-stable-d43a7e67ae2f911765b3d5b6cbb85221a9ffd0a4.tar.gz
linux-stable-d43a7e67ae2f911765b3d5b6cbb85221a9ffd0a4.tar.bz2
linux-stable-d43a7e67ae2f911765b3d5b6cbb85221a9ffd0a4.zip
bnx2x: Do not allow enabling LRO if disable_tpa=1
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bnx2x_main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 16685a153c10..ccdc3fe13414 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -9968,12 +9968,14 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
/* TPA requires Rx CSUM offloading */
if ((data & ETH_FLAG_LRO) && bp->rx_csum) {
- if (!(dev->features & NETIF_F_LRO)) {
- dev->features |= NETIF_F_LRO;
- bp->flags |= TPA_ENABLE_FLAG;
- changed = 1;
- }
-
+ if (!disable_tpa) {
+ if (!(dev->features & NETIF_F_LRO)) {
+ dev->features |= NETIF_F_LRO;
+ bp->flags |= TPA_ENABLE_FLAG;
+ changed = 1;
+ }
+ } else
+ rc = -EINVAL;
} else if (dev->features & NETIF_F_LRO) {
dev->features &= ~NETIF_F_LRO;
bp->flags &= ~TPA_ENABLE_FLAG;