diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-17 23:33:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-17 23:33:11 +0200 |
| commit | 9cbc94eabb0791906051bbfac024ef2c2be8e079 (patch) | |
| tree | 41ba194e687c6c60f5c883f98737ac83257d0c00 /drivers/net/vmxnet3 | |
| parent | ipv4: Don't use enums as bitmasks in ip_fragment.c (diff) | |
| parent | net: ethtool: fix IPV6 checksum feature name string (diff) | |
| download | linux-9cbc94eabb0791906051bbfac024ef2c2be8e079.tar.xz linux-9cbc94eabb0791906051bbfac024ef2c2be8e079.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c
Diffstat (limited to 'drivers/net/vmxnet3')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 64303eb3a5fc..dc959fe27aa5 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c @@ -276,6 +276,7 @@ int vmxnet3_set_features(struct net_device *netdev, u32 features) adapter->shared->devRead.misc.uptFeatures &= ~UPT1_F_RXCSUM; + /* update harware LRO capability accordingly */ if (features & NETIF_F_LRO) adapter->shared->devRead.misc.uptFeatures |= UPT1_F_LRO; |