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

netdevice: add queue selection fallback handler for ndo_select_queue

2014-02-17T05:36:34+00:00

Add a new argument for ndo_select_queue() callback that passes a
fallback handler. This gets invoked through netdev_pick_tx();
fallback handler is currently __netdev_pick_tx() as most drivers
invoke this function within their customized implementation in
case for skbs that don't need any special handling. This fallback
handler can then be replaced on other call-sites with different
queue selection methods (e.g. in packet sockets, pktgen etc).

This also has the nice side-effect that __netdev_pick_tx() is
then only invoked from netdev_pick_tx() and export of that
function to modules can be undone.

Suggested-by: David S. Miller 
Signed-off-by: Daniel Borkmann 
Signed-off-by: David S. Miller

e100: Fix "disabling already-disabled device" warning

2014-01-31T00:46:14+00:00

In https://bugzilla.redhat.com/show_bug.cgi?id=994438 and
https://bugzilla.redhat.com/show_bug.cgi?id=970480  we
received different reports of e100 throwing the following
warning:

 [] ? pci_disable_device+0x85/0x90
 [] warn_slowpath_fmt+0x33/0x40
 [] pci_disable_device+0x85/0x90
 [] __e100_shutdown+0x80/0x120 [e100]
 [] ? check_preempt_curr+0x65/0x90
 [] e100_suspend+0x16/0x30 [e100]
 [] pci_legacy_suspend+0x2b/0xb0
 [] ? wait_for_completion+0x1f/0xd0
 [] ? pci_pm_poweroff+0xb0/0xb0
 [] pci_pm_freeze+0x94/0xa0
 [] dpm_run_callback+0x37/0x80
 [] ? pm_wakeup_pending+0xc4/0x140
 [] __device_suspend+0xb2/0x1f0
 [] async_suspend+0x1f/0x90
 [] async_run_entry_fn+0x35/0x140
 [] ? wake_up_process+0x1f/0x40
 [] process_one_work+0x115/0x370
 [] ? start_worker+0x25/0x30
 [] ? manage_workers.isra.27+0x1a5/0x250
 [] worker_thread+0xfe/0x330
 [] ? manage_workers.isra.27+0x250/0x250
 [] kthread+0x94/0xa0
 [] ret_from_kernel_thread+0x1b/0x28
 [] ? insert_kthread_work+0x30/0x30

This patch removes pci_disable_device() from __e100_shutdown().
pci_clear_master() is enough.

Signed-off-by: Michele Baldessari 
Tested-by: Mark Harig 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller

i40e: Add missing braces to i40e_dcb_need_reconfig()

2014-01-28T04:17:31+00:00

Indentation mismatch spotted with Coverity.
Introduced in 4e3b35b044ea ("i40e: add DCB and DCBNL support")

Signed-off-by: Dave Jones 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-01-18T08:55:41+00:00

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	net/ipv4/tcp_metrics.c

Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.

Minor overlapping changes in bnx2x driver.

Signed-off-by: David S. Miller

ixgbevf: merge ixgbevf_tx_map and ixgbevf_tx_queue into a single function

2014-01-18T03:15:10+00:00

This change merges the ixgbevf_tx_map call and the ixgbevf_tx_queue call
into a single function.  In order to make room for this setting of cmd_type
and olinfo flags is done in separate functions.

Signed-off-by: Alexander Duyck 
Signed-off-by: Emil Tantilov 
Tested-by: Phil Schmitt 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller

ixgbevf: redo dma mapping using the tx buffer info

2014-01-18T03:15:10+00:00

This patch takes advantage of the dma buffer always being present in the
first descriptor and mapped as single. As such we can call dma_unmap_single
and don't need to check for DMA mapping in ixgbevf_clean_tx_irq().

In addition this patch makes use of the DMA API.

Signed-off-by: Emil Tantilov 
Signed-off-by: Alexander Duyck 
Tested-by: Phil Schmitt 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller

ixgbevf: make the first tx_buffer a repository for most of the skb info

2014-01-18T03:15:10+00:00

This change makes it so that the first tx_buffer structure acts as a
central storage location for most of the info about the skb we are about
to transmit.

In addition this patch makes tx_flags part of the ixgbevf_tx_buffer struct.
This allows us to use the flags directly from the stucture and as result
removes the tx_flags parameter from some functions. Also as a cleanup
mapped_as_page is folded into tx_flags and some unused flags were removed.

Signed-off-by: Alexander Duyck 
Signed-off-by: Emil Tantilov 
Tested-by: Phil Schmitt 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller

ixgbevf: add tx counters

2014-01-18T03:15:10+00:00

This patch adds counters for tx_restart_queue and tx_timeout_count.

Signed-off-by: Alexander Duyck 
Signed-off-by: Emil Tantilov 
Tested-by: Phil Schmitt 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller

ixgbevf: remove counters for Tx/Rx checksum offload

2014-01-18T03:15:10+00:00

This patch removes the Tx/Rx counters for checksum offload.

The Tx counter was never updated and the Rx counter is of limited use.
This is in effort to clean up the counters and make them consistent
with the counters shown by ixgbe.

Also this patch removes some members of the adapter structure that were
never used and shuffles others to reduce number of holes.

before:
	/* size: 1568, cachelines: 25, members: 48 */
	/* sum members: 1519, holes: 10, sum holes: 43 */
	/* padding: 6 */
	/* last cacheline: 32 bytes */

after:
	/* size: 1480, cachelines: 24, members: 43 */
	/* sum members: 1479, holes: 1, sum holes: 1 */
	/* last cacheline: 8 bytes */

Signed-off-by: Alexander Duyck 
Signed-off-by: Emil Tantilov 
Tested-by: Phil Schmitt 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller

ixgbevf: move ring specific stats into ring specific structure

2014-01-18T03:15:10+00:00

This patch moves hot-path specific statistics into the ring structure.
This allows us to drop the adapter structure in some functions and should
help with performance.

Signed-off-by: Alexander Duyck 
Signed-off-by: Emil Tantilov 
Tested-by: Phil Schmitt 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller