diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-26 13:49:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 13:49:30 -0800 |
| commit | b4e69ac670d71b5748dc81e536b2cb103489badd (patch) | |
| tree | 26a04ba5d950657132fd6acb4e0ef17d0bcabe93 /drivers/net/bnx2.c | |
| parent | 144ce879b057c760194d808c90826cd96308f423 (diff) | |
| parent | 7cc2edb83447775a34ed3bf9d29d8295a434b523 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index cab96fa4cd3a..231aa97745ef 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -7553,6 +7553,10 @@ bnx2_set_flags(struct net_device *dev, u32 data) !(data & ETH_FLAG_RXVLAN)) return -EINVAL; + /* TSO with VLAN tag won't work with current firmware */ + if (!(data & ETH_FLAG_TXVLAN)) + return -EINVAL; + rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN); if (rc) |