Message ID | 20100628112811.29881285@dhcp-lab-109.englab.brq.redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, 2010-06-28 at 02:28 -0700, Stanislaw Gruszka wrote: > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Thanks Stanislaw! > --- > drivers/net/bnx2x_main.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c > index 57ff5b3..0809f6c 100644 > --- a/drivers/net/bnx2x_main.c > +++ b/drivers/net/bnx2x_main.c > @@ -10982,6 +10982,9 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data) > int changed = 0; > int rc = 0; > > + if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH)) > + return -EOPNOTSUPP; > + > if (bp->recovery_state != BNX2X_RECOVERY_DONE) { > printk(KERN_ERR "Handling parity error recovery. Try again later\n"); > return -EAGAIN; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stanislaw Gruszka <sgruszka@redhat.com> Date: Mon, 28 Jun 2010 11:28:11 +0200 > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 57ff5b3..0809f6c 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -10982,6 +10982,9 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data) int changed = 0; int rc = 0; + if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH)) + return -EOPNOTSUPP; + if (bp->recovery_state != BNX2X_RECOVERY_DONE) { printk(KERN_ERR "Handling parity error recovery. Try again later\n"); return -EAGAIN;
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/bnx2x_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)