linux-toradex.git/drivers/net/vmxnet3/vmxnet3_ethtool.c, branch v3.0.2

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-17T21:33:11+00:00

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

vmxnet3: Fix inconsistent LRO state after initialization

2011-05-16T19:05:23+00:00

During initialization of vmxnet3, the state of LRO
gets out of sync with netdev->features.

This leads to very poor TCP performance in a IP forwarding
setup and is hitting many VMware users.

Simplified call sequence:
1. vmxnet3_declare_features() initializes "adapter->lro" to true.

2. The kernel automatically disables LRO if IP forwarding is enabled,
so vmxnet3_set_flags() gets called. This also updates netdev->features.

3. Now vmxnet3_setup_driver_shared() is called. "adapter->lro" is still
set to true and LRO gets enabled again, even though
netdev->features shows it's disabled.

Fix it by updating "adapter->lro", too.

The private vmxnet3 adapter flags are scheduled for removal
in net-next, see commit a0d2730c9571aeba793cb5d3009094ee1d8fda35
"net: vmxnet3: convert to hw_features".

Patch applies to 2.6.37 / 2.6.38 and 2.6.39-rc6.

Please CC: comments.

Signed-off-by: Thomas Jarosch 
Acked-by: Stephen Hemminger 
Signed-off-by: David S. Miller

ethtool: cosmetic: Use ethtool ethtool_cmd_speed API

2011-04-29T21:03:01+00:00

This updates the network drivers so that they don't access the
ethtool_cmd::speed field directly, but use ethtool_cmd_speed()
instead.

For most of the drivers, these changes are purely cosmetic and don't
fix any problem, such as for those 1GbE/10GbE drivers that indirectly
call their own ethtool get_settings()/mii_ethtool_gset(). The changes
are meant to enforce code consistency and provide robustness with
future larger throughputs, at the expense of a few CPU cycles for each
ethtool operation.

All drivers compiled with make allyesconfig ion x86_64 have been
updated.

Tested: make allyesconfig on x86_64 + e1000e/bnx2x work
Signed-off-by: David Decotigny 
Signed-off-by: David S. Miller

net: vmxnet3: convert to hw_features

2011-04-19T06:04:00+00:00

This also removes private feature flags that were always set to true.

You may want to move vmxnet3_set_features() to vmxnet3_drv.c as a following
cleanup.

Signed-off-by: Michał Mirosław 
Signed-off-by: David S. Miller

net: fix ethtool->set_flags not intended -EINVAL return value

2011-03-28T06:35:24+00:00

After commit d5dbda23804156ae6f35025ade5307a49d1db6d7 "ethtool: Add
support for vlan accleration.", drivers that have NETIF_F_HW_VLAN_TX,
and/or NETIF_F_HW_VLAN_RX feature, but do not allow enable/disable vlan
acceleration via ethtool set_flags, always return -EINVAL from that
function. Fix by returning -EINVAL only if requested features do not
match current settings and can not be changed by driver.

Change any driver that define ethtool->set_flags to use
ethtool_invalid_flags() to avoid similar problems in the future
(also on drivers that do not have the problem).

Tested with modified (to reproduce this bug) myri10ge driver.

Cc: stable@kernel.org # 2.6.37+
Signed-off-by: Stanislaw Gruszka 
Signed-off-by: David S. Miller

vmxnet3: Add locking for access to command register

2011-01-16T05:21:14+00:00

Access to cmd register is racey, especially in smp environments. Protect
it using a spinlock.

Signed-off-by: Matthieu Bucchianeri 
Signed-off-by: Shreyas N Bhatewara 
Signed-off-by: David S. Miller

vmxnet3: Make ethtool handlers multiqueue aware

2011-01-16T05:21:13+00:00

Show per-queue stats in ethtool -S output for vmxnet3 interface. Register dump
of ethtool should dump registers for all tx and rx queues.

Signed-off-by: Shreyas N Bhatewara 
Signed-off-by: David S. Miller

vmxnet3: fix compilation when RSS is disabled

2010-11-29T02:25:33+00:00

If RSS is disabled, we can ifdef out some RSS specific code. This fixes
the compile error found by Randy Dunlap.

Signed-off-by: Scott J. Goldman 
Reviewed-by: Bhavesh Davda 
Signed-off-by: David S. Miller

net-next: Add multiqueue support to vmxnet3 driver

2010-11-19T22:22:57+00:00

Add multiqueue support to vmxnet3 driver

This change adds multiqueue and thus receive side scaling support
to vmxnet3 device driver. Number of rx queues is limited to 1 in cases
where MSI is not configured or one MSIx vector is not available per rx
queue

Signed-off-by: Shreyas Bhatewara 
Reviewed-by: Bhavesh Davda 
Signed-off-by: David S. Miller

vmxnet3: remove set_flag_le{16,64} helpers

2010-10-24T22:52:31+00:00

It's easier to just annotate the constants as little endian types and set/clear
the flags directly.

Signed-off-by: Harvey Harrison 
Signed-off-by: Shreyas Bhatewara 
Signed-off-by: David S. Miller