linux.git/drivers/net, branch v3.3-rc5

Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2012-02-25T04:03:14+00:00

One InfiniBand/RDMA regression fix for 3.3:

 - mlx4 SR-IOV changes added static exported functions, which doesn't
   build on powerpc at least.  Fix from Doug Ledford for this.

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  mlx4_core: Exported functions can't be static

mlx4_core: Exported functions can't be static

2012-02-23T07:00:38+00:00

At least on powerpc, it breaks the build if exported functions are
static.  Fix some static exported functions introduced with the mlx4
SR-IOV support added in 3.3-rc1.

Signed-off-by: Doug Ledford 
Signed-off-by: Roland Dreier

net/ethernet: ks8851_mll fix irq handling

2012-02-15T20:41:10+00:00

There a two different irq variables ks->irq and netdev->irq.
Only ks->irq is set on probe, so disabling irq in ks_start_xmit fails.

This patches remove ks->irq from private data and use only netdev->irq.

Tested on a kernel 3.0 based OMAP4430 SMP Board

Signed-off-by: Jan Weitzel 
Signed-off-by: David S. Miller

veth: Enforce minimum size of VETH_INFO_PEER

2012-02-15T19:59:20+00:00

VETH_INFO_PEER carries struct ifinfomsg plus optional IFLA
attributes. A minimal size of sizeof(struct ifinfomsg) must be
enforced or we may risk accessing that struct beyond the limits
of the netlink message.

Signed-off-by: Thomas Graf 
Signed-off-by: David S. Miller

stmmac: update the driver version to Feb 2012 (v2)

2012-02-15T19:52:10+00:00

Signed-off-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: move hw init in the probe (v2)

2012-02-15T19:52:10+00:00

This patch moves the MAC HW initialization and
the HW feature verification from the open to the probe
function as D. Miller suggested.
So the patch actually reorganizes and tidies-up some parts of
the driver and indeed fixes some problem when tune its HW features.
These can be overwritten by looking at the HW cap register at
run-time and that generated problems.

Signed-off-by: Giuseppe Cavallaro 
Reviewed-by: Francesco Virlinzi 
Signed-off-by: David S. Miller

stmmac: request_irq when use an ext wake irq line (v2)

2012-02-15T19:52:10+00:00

In case of we use an external Wake-Up IRQ line
(priv->wol_irq != dev->irq) we need to invoke the
request_irq.

Signed-off-by: Francesco Virlinzi 
Signed-off-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

stmmac: do not discard frame on dribbling bit assert

2012-02-15T19:52:10+00:00

If this bit is set and the CRC error is reset, then the packet is valid.
Only report this as stat info.

Signed-off-by: Giuseppe Cavallaro 
Signed-off-by: David S. Miller

ipheth: Add iPhone 4S

2012-02-15T19:50:16+00:00

BugLink: http://bugs.launchpad.net/bugs/900802

Cc: stable@vger.kernel.org 3.2+
Signed-off-by: Till Kamppeter 
Signed-off-by: Tim Gardner 
Signed-off-by: David S. Miller

mlx4: add unicast steering entries to resource_tracker

2012-02-15T19:50:16+00:00

Add unicast steering entries to resource tracker.
Do qp_detach also for these entries when VF doesn't shut down gracefully.
Otherwise there is leakage of these resources, since they are not tracked.

Signed-off-by: Eugenia Emantayev 
Reviewed-by: Yevgeny Petrilin 
Signed-off-by: David S. Miller