diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-06-27 23:29:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-29 00:53:26 -0700 |
| commit | d92be4b1661be0cef5f277f10078c71c166f16ad (patch) | |
| tree | 0f14bef6119ef4e36e581fe155a7f557c653c8db /drivers/net/vmxnet3 | |
| parent | 52b6dcfe59d73347a598ba0826a6191a1e497679 (diff) | |
| download | op-kernel-dev-d92be4b1661be0cef5f277f10078c71c166f16ad.zip op-kernel-dev-d92be4b1661be0cef5f277f10078c71c166f16ad.tar.gz | |
vmxnet3: fail when try to setup unsupported features
Return EOPNOTSUPP in ethtool_ops->set_flags.
Fix coding style while at it.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethtool.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 3935c44..8a71a21 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c @@ -276,16 +276,21 @@ vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf) } static u32 -vmxnet3_get_flags(struct net_device *netdev) { +vmxnet3_get_flags(struct net_device *netdev) +{ return netdev->features; } static int -vmxnet3_set_flags(struct net_device *netdev, u32 data) { +vmxnet3_set_flags(struct net_device *netdev, u32 data) +{ struct vmxnet3_adapter *adapter = netdev_priv(netdev); u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1; u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1; + if (data & ~ETH_FLAG_LRO) + return -EOPNOTSUPP; + if (lro_requested ^ lro_present) { /* toggle the LRO feature*/ netdev->features ^= NETIF_F_LRO; |
