linux/drivers/net/ethernet/broadcom
David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-26 23:42:21 -05:00
..
bnx2x bnx2x: switch to napi_complete_done() 2016-11-16 13:40:58 -05:00
bnxt Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-11-26 23:42:21 -05:00
genet net: bcmgenet: Utilize phy_ethtool_nway_reset 2016-11-15 16:33:35 -05:00
Kconfig net: ethernet: bgmac: Add platform device support 2016-07-09 18:10:41 -04:00
Makefile net: ethernet: bgmac: Add platform device support 2016-07-09 18:10:41 -04:00
b44.c ethernet/broadcom: use core min/max MTU checking 2016-10-18 11:34:18 -04:00
b44.h net: ethernet: broadcom: b44: use phydev from struct net_device 2016-09-19 21:39:11 -04:00
bcm63xx_enet.c net: bcm63xx_enet: Fix build failure with phy_ethtool_nway_reset 2016-11-15 21:56:25 -05:00
bcm63xx_enet.h net: ethernet: broadcom: bcm63xx: use phydev from struct net_device 2016-09-19 21:39:12 -04:00
bcmsysport.c net: systemport: constify ethtool_ops structures 2016-08-31 09:22:31 -07:00
bcmsysport.h net: ethernet: bcmsysport: use phydev from struct net_device 2016-06-19 16:15:55 -07:00
bgmac-bcma-mdio.c net: ethernet: bgmac: Add platform device support 2016-07-09 18:10:41 -04:00
bgmac-bcma.c net: ethernet: bgmac: device tree phy enablement 2016-11-07 13:11:22 -05:00
bgmac-platform.c net: ethernet: bgmac: add NS2 support 2016-11-07 13:11:22 -05:00
bgmac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-11-15 10:54:36 -05:00
bgmac.h net: ethernet: bgmac: add NS2 support 2016-11-07 13:11:22 -05:00
bnx2.c bnx2: use READ_ONCE() instead of barrier() 2016-11-21 11:32:34 -05:00
bnx2.h ethernet/broadcom: use core min/max MTU checking 2016-10-18 11:34:18 -04:00
bnx2_fw.h bnx2-cnic: Driver Rebranding Changes 2015-02-20 15:46:49 -05:00
cnic.c cnic: call cp->stop_hw() in cnic_start_hw() on allocation failure 2016-05-06 15:44:54 -04:00
cnic.h cnic: Rebranding cnic driver. 2014-06-25 16:27:27 -07:00
cnic_defs.h cnic: Rebranding cnic driver. 2014-06-25 16:27:27 -07:00
cnic_if.h cnic: Add the interfaces to get FC-NPIV table. 2015-08-06 21:54:12 -07:00
sb1250-mac.c ethernet: fix min/max MTU typos 2016-10-27 16:18:50 -04:00
tg3.c ethernet/broadcom: use core min/max MTU checking 2016-10-18 11:34:18 -04:00
tg3.h mdio: Move allocation of interrupts into core 2016-01-07 14:31:26 -05:00