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

tg3: Do not include vlan acceleration features in vlan_features

2014-03-26T19:55:10+00:00

Including hardware acceleration features in vlan_features breaks
stacked vlans (Q-in-Q) by marking the bottom vlan interface as
capable of acceleration.  This causes one of the tags to be lost
and the packets are sent with a sing vlan header.

CC: Nithin Nayak Sujir 
CC: Michael Chan 
Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

cnic: Update version to 2.5.20 and copyright year.

2014-03-18T20:02:16+00:00

Signed-off-by: Michael Chan 
Signed-off-by: David S. Miller

cnic,bnx2i,bnx2fc: Fix inconsistent use of page size

2014-03-18T20:02:16+00:00

The bnx2/bnx2x rings are made up of linked pages.  However there is an
upper limit on the page size as some the page size settings are 16-bit
in the hardware/firmware interface.  In the current code, some parts
use BNX2_PAGE_SIZE which has a 16K upper limit and some parts use
PAGE_SIZE.  On archs with >= 64K PAGE_SIZE, it generates some compile
warnings.  Define a new CNIC_PAGE_SZIE which has an upper limit of
16K and use it consistently in all relevant parts.

Signed-off-by: Michael Chan 
Signed-off-by: Eddie Wai 
Signed-off-by: David S. Miller

cnic: Use proper ulp_ops for per device operations.

2014-03-18T20:02:16+00:00

For per device operations, cnic needs to dereference the RCU protected
cp->ulp_ops instead of the global cnic_ulp_tbl.  In 2 locations,
cnic_send_nlmsg() and cnic_copy_ulp_stats(), it was referencing the
global table.  If the device has been unregistered and these functions
are still being called (very unlikely scenarios), it could lead to NULL
pointer dereference.

Signed-off-by: Michael Chan 
Signed-off-by: David S. Miller

bnx2: Fix shutdown sequence

2014-03-09T23:02:27+00:00

The pci shutdown handler added in:

    bnx2: Add pci shutdown handler
    commit 25bfb1dd4ba3b2d9a49ce9d9b0cd7be1840e15ed

created a shutdown down sequence without chip reset if the device was
never brought up.  This can cause the firmware to shutdown the PHY
prematurely and cause MMIO read cycles to be unresponsive.  On some
systems, it may generate NMI in the bnx2's pci shutdown handler.

The fix is to tell the firmware not to shutdown the PHY if there was
no prior chip reset.

Signed-off-by: Michael Chan 
Signed-off-by: David S. Miller

b44: always set duplex mode why phy changes

2014-03-03T00:05:25+00:00

Without this patch b44_check_phy() was called when the phy called the
adjust callback. This method only change the mac duplex mode when the
carrier was off. When the phy changed the duplex mode after the carrier
was on the mac was not changed. This happened when an external phy was
used.

Signed-off-by: Hauke Mehrtens 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

b44: add calls to phy_{start,stop}

2014-03-03T00:05:25+00:00

When support for external phys was added to b44, the calls to start and
stop the phy were missing in the mac driver. This adds the calls to
phy_start() and phy_stop().

Signed-off-by: Hauke Mehrtens 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

tg3: Don't check undefined error bits in RXBD

2014-02-28T22:16:16+00:00

Redefine the RXD_ERR_MASK to include only relevant error bits. This fixes
a customer reported issue of randomly dropping packets on the 5719.

Signed-off-by: Michael Chan 
Signed-off-by: David S. Miller

bnx2x: Add missing bit in default Tx switching

2014-02-27T22:16:28+00:00

Commit c14db2025 "bnx2x: Correct default Tx switching behaviour" supposedly
changed the default Tx switching behaviour, but was missing the fastpath change
required for FW to pass packets from PFs to VFs.

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

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