linux-stable.git/drivers/net/ethernet, branch v3.13

e1000e: Fix compilation warning when !CONFIG_PM_SLEEP

2014-01-16T23:36:26+00:00

Commit 7509963c703b (e1000e: Fix a compile flag mis-match for
suspend/resume) moved suspend and resume hooks to be available when
CONFIG_PM is set. However, it can be set even if CONFIG_PM_SLEEP is not set
causing following warnings to be emitted:

drivers/net/ethernet/intel/e1000e/netdev.c:6178:12: warning:
  	‘e1000_suspend’ defined but not used [-Wunused-function]

drivers/net/ethernet/intel/e1000e/netdev.c:6185:12: warning:
	‘e1000_resume’ defined but not used [-Wunused-function]

To fix this make the hooks to be available only when CONFIG_PM_SLEEP is set
and remove CONFIG_PM wrapping from driver ops because this is already
handled by SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS().

Signed-off-by: Mika Westerberg 
Cc: Dave Ertman 
Cc: Aaron Brown 
Cc: Jeff Kirsher 
Signed-off-by: David S. Miller

be2net: add dma_mapping_error() check for dma_map_page()

2014-01-16T00:50:32+00:00

The driver does not check value returned by dma_map_page. The patch
fixes this.

v2: Removed the bugfix for non-bug ;-) (thanks Sathya)

Signed-off-by: Ivan Vecera 
Acked-by: Sathya Perla 
Signed-off-by: David S. Miller

bnx2x: Don't release PCI bars on shutdown

2014-01-16T00:48:34+00:00

The bnx2x driver in its pci shutdown() callback releases its pci bars (in the
same manner it does during its pci remove() callback).
During a system reboot while VFs are enabled, its possible for the VF's remove
to be called (as a result of pci_disable_sriov()) after its shutdown callback
has already finished running; This will cause a paging request fault as the VF
tries to access the pci bar which it has previously released, crashing the
system.

This patch further differentiates the shutdown and remove callbacks, preventing the
pci release procedures from being called during shutdown.

Signed-off-by: Yuval Mintz 
Signed-off-by: Ariel Elior 
Signed-off-by: David S. Miller

net,via-rhine: Fix tx_timeout handling

2014-01-15T23:21:08+00:00

rhine_reset_task() misses to disable the tx scheduler upon reset,
this can lead to a crash if work is still scheduled while we're resetting
the tx queue.

Fixes:
[   93.591707] BUG: unable to handle kernel NULL pointer dereference at 0000004c
[   93.595514] IP: [] rhine_napipoll+0x491/0x6

Signed-off-by: Richard Weinberger 
Signed-off-by: David S. Miller

qlge: Fix vlan netdev features.

2014-01-15T03:02:35+00:00

vlan gets the same netdev features except vlan filter.

Signed-off-by: Jitendra Kalsaria 
Signed-off-by: David S. Miller

cxgb4: silence shift wrapping static checker warning

2014-01-13T19:15:58+00:00

I don't know how large "tp->vlan_shift" is but static checkers worry
about shift wrapping bugs here.

Signed-off-by: Dan Carpenter 
Acked-by: Dimitris Michailidis 
Signed-off-by: David S. Miller

qlcnic: Fix ethtool statistics length calculation

2014-01-10T18:25:29+00:00

o Consider number of Tx queues while calculating the length of
  Tx statistics as part of ethtool stats.
o Calculate statistics lenght properly for 82xx and 83xx adapter

Signed-off-by: Shahed Shaikh 
Signed-off-by: David S. Miller

qlcnic: Fix bug in TX statistics

2014-01-10T18:25:29+00:00

o Driver was not updating TX stats so it was not populating
  statistics in `ifconfig` command output.

Signed-off-by: Manish Chopra 
Signed-off-by: David S. Miller

net: core: explicitly select a txq before doing l2 forwarding

2014-01-10T18:23:08+00:00

Currently, the tx queue were selected implicitly in ndo_dfwd_start_xmit(). The
will cause several issues:

- NETIF_F_LLTX were removed for macvlan, so txq lock were done for macvlan
  instead of lower device which misses the necessary txq synchronization for
  lower device such as txq stopping or frozen required by dev watchdog or
  control path.
- dev_hard_start_xmit() was called with NULL txq which bypasses the net device
  watchdog.
- dev_hard_start_xmit() does not check txq everywhere which will lead a crash
  when tso is disabled for lower device.

Fix this by explicitly introducing a new param for .ndo_select_queue() for just
selecting queues in the case of l2 forwarding offload. netdev_pick_tx() was also
extended to accept this parameter and dev_queue_xmit_accel() was used to do l2
forwarding transmission.

With this fixes, NETIF_F_LLTX could be preserved for macvlan and there's no need
to check txq against NULL in dev_hard_start_xmit(). Also there's no need to keep
a dedicated ndo_dfwd_start_xmit() and we can just reuse the code of
dev_queue_xmit() to do the transmission.

In the future, it was also required for macvtap l2 forwarding support since it
provides a necessary synchronization method.

Cc: John Fastabend 
Cc: Neil Horman 
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: Jason Wang 
Acked-by: Neil Horman 
Acked-by: John Fastabend 
Signed-off-by: David S. Miller

bnx2x: fix DMA unmapping of TSO split BDs

2014-01-10T18:18:07+00:00

bnx2x triggers warnings with CONFIG_DMA_API_DEBUG=y:

  WARNING: CPU: 0 PID: 2253 at lib/dma-debug.c:887 check_unmap+0xf8/0x920()
  bnx2x 0000:28:00.0: DMA-API: device driver frees DMA memory with
  different size [device address=0x00000000da2b389e] [map size=1490 bytes]
  [unmap size=66 bytes]

The reason is that bnx2x splits a TSO BD into two BDs (headers + data)
using one DMA mapping for both, but it uses only the length of the first
BD when unmapping.

This patch fixes the bug by unmapping the whole length of the two BDs.

Signed-off-by: Michal Schmidt 
Reviewed-by: Eric Dumazet 
Acked-by: Dmitry Kravkov 
Signed-off-by: David S. Miller