Commit 87ffabb1 authored by David S. Miller's avatar David S. Miller
Browse files

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



The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5e0e0dc1 b50edd78

Documentation/networking/rds.txt

+4 −5
Original line number Diff line number Diff line
@@ -62,11 +62,10 @@ Socket Interface 
================



  AF_RDS, PF_RDS, SOL_RDS

        These constants haven't been assigned yet, because RDS isn't in

        mainline yet. Currently, the kernel module assigns some constant

        and publishes it to user space through two sysctl files

                /proc/sys/net/rds/pf_rds

                /proc/sys/net/rds/sol_rds

	AF_RDS and PF_RDS are the domain type to be used with socket(2)

	to create RDS sockets. SOL_RDS is the socket-level to be used

	with setsockopt(2) and getsockopt(2) for RDS specific socket

	options.



  fd = socket(PF_RDS, SOCK_SEQPACKET, 0);

        This creates a new, unbound RDS socket.

drivers/net/ethernet/emulex/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#define BE_NAPI_WEIGHT		64

#define MAX_RX_POST		BE_NAPI_WEIGHT /* Frags posted at a time */

#define RX_FRAGS_REFILL_WM	(RX_Q_LEN - MAX_RX_POST)

#define MAX_NUM_POST_ERX_DB	255u



#define MAX_VFS			30 /* Max VFs supported by BE3 FW */

#define FW_VER_LEN		32

drivers/net/ethernet/emulex/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static void be_post_rx_frags(struct be_rx_obj *rxo, gfp_t gfp, u32 frags_needed) 
		if (rxo->rx_post_starved)

			rxo->rx_post_starved = false;

		do {

			notify = min(256u, posted);

			notify = min(MAX_NUM_POST_ERX_DB, posted);

			be_rxq_notify(adapter, rxq->id, notify);

			posted -= notify;

		} while (posted);

drivers/net/phy/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ config SMSC_PHY 
config BROADCOM_PHY

	tristate "Drivers for Broadcom PHYs"

	---help---

	  Currently supports the BCM5411, BCM5421, BCM5461, BCM5464, BCM5481

	  and BCM5482 PHYs.

	  Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,

	  BCM5481 and BCM5482 PHYs.



config BCM63XX_PHY

	tristate "Drivers for Broadcom 63xx SOCs internal PHY"

drivers/net/phy/broadcom.c

+14 −0
Original line number Diff line number Diff line
@@ -548,6 +548,19 @@ static struct phy_driver broadcom_drivers[] = { 
	.ack_interrupt	= bcm54xx_ack_interrupt,

	.config_intr	= bcm54xx_config_intr,

	.driver		= { .owner = THIS_MODULE },

}, {

	.phy_id		= PHY_ID_BCM54616S,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom BCM54616S",

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= bcm54xx_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,

	.ack_interrupt	= bcm54xx_ack_interrupt,

	.config_intr	= bcm54xx_config_intr,

	.driver		= { .owner = THIS_MODULE },

}, {

	.phy_id		= PHY_ID_BCM5464,

	.phy_id_mask	= 0xfffffff0,
@@ -660,6 +673,7 @@ static struct mdio_device_id __maybe_unused broadcom_tbl[] = { 
	{ PHY_ID_BCM5411, 0xfffffff0 },

	{ PHY_ID_BCM5421, 0xfffffff0 },

	{ PHY_ID_BCM5461, 0xfffffff0 },

	{ PHY_ID_BCM54616S, 0xfffffff0 },

	{ PHY_ID_BCM5464, 0xfffffff0 },

	{ PHY_ID_BCM5482, 0xfffffff0 },

	{ PHY_ID_BCM5482, 0xfffffff0 },