diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-04 11:57:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-04 11:57:25 -0800 |
| commit | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (patch) | |
| tree | 10f8363cbf5e428c0cb5614959e37b67a7e0cfa2 /drivers/net/ehea | |
| parent | 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 (diff) | |
| parent | 9fc3bbb4a752f108cf096d96640f3b548bbbce6c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ehea')
| -rw-r--r-- | drivers/net/ehea/ehea_ethtool.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c index afebf2075779..3e2e734fecb7 100644 --- a/drivers/net/ehea/ehea_ethtool.c +++ b/drivers/net/ehea/ehea_ethtool.c @@ -265,6 +265,13 @@ static void ehea_get_ethtool_stats(struct net_device *dev, static int ehea_set_flags(struct net_device *dev, u32 data) { + /* Avoid changing the VLAN flags */ + if ((data & (ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN)) != + (ethtool_op_get_flags(dev) & (ETH_FLAG_RXVLAN | + ETH_FLAG_TXVLAN))){ + return -EINVAL; + } + return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO | ETH_FLAG_TXVLAN | ETH_FLAG_RXVLAN); |