Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24cac700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Fix rtnl deadlock in ipvs, from Julian Anastasov.

 2) s390 qeth fixes from Julian Wiedmann (control IO completion stalls,
    bad MAC address update sequence, request side races on command IO
    timeouts).

 3) Handle seq_file overflow properly in l2tp, from Guillaume Nault.

 4) Fix VLAN priority mappings in cpsw driver, from Ivan Khoronzhuk.

 5) Packet scheduler ife action fixes (malformed TLV lengths, etc.) from
    Alexander Aring.

 6) Fix out of bounds access in tcp md5 option parser, from Jann Horn.

 7) Missing netlink attribute policies in rtm_ipv6_policy table, from
    Eric Dumazet.

 8) Missing socket address length checks in l2tp and pppoe connect, from
    Guillaume Nault.

 9) Fix netconsole over team and bonding, from Xin Long.

10) Fix race with AF_PACKET socket state bitfields, from Willem de
    Bruijn.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (51 commits)
  ice: Fix insufficient memory issue in ice_aq_manage_mac_read
  sfc: ARFS filter IDs
  net: ethtool: Add missing kernel doc for FEC parameters
  packet: fix bitfield update race
  ice: Do not check INTEVENT bit for OICR interrupts
  ice: Fix incorrect comment for action type
  ice: Fix initialization for num_nodes_added
  igb: Fix the transmission mode of queue 0 for Qav mode
  ixgbevf: ensure xdp_ring resources are free'd on error exit
  team: fix netconsole setup over team
  amd-xgbe: Only use the SFP supported transceiver signals
  amd-xgbe: Improve KR auto-negotiation and training
  amd-xgbe: Add pre/post auto-negotiation phy hooks
  pppoe: check sockaddr length in pppoe_connect()
  l2tp: check sockaddr length in pppol2tp_connect()
  net: phy: marvell: clear wol event before setting it
  ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
  bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
  tcp: don't read out-of-bounds opsize
  ibmvnic: Clean actual number of RX or TX pools
  ...
parents 6d08b06e d19efb72

drivers/net/bonding/bond_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1660,8 +1660,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
	} /* switch(bond_mode) */



#ifdef CONFIG_NET_POLL_CONTROLLER

	slave_dev->npinfo = bond->dev->npinfo;

	if (slave_dev->npinfo) {

	if (bond->dev->npinfo) {

		if (slave_enable_netpoll(new_slave)) {

			netdev_info(bond_dev, "master_dev is using netpoll, but new slave device does not support netpoll\n");

			res = -EBUSY;

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+8 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,10 @@ 
#define MDIO_VEND2_AN_STAT		0x8002

#endif



#ifndef MDIO_VEND2_PMA_CDR_CONTROL

#define MDIO_VEND2_PMA_CDR_CONTROL	0x8056

#endif



#ifndef MDIO_CTRL1_SPEED1G

#define MDIO_CTRL1_SPEED1G		(MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100)

#endif
@@ -1369,6 +1373,10 @@ 
#define XGBE_AN_CL37_TX_CONFIG_MASK	0x08

#define XGBE_AN_CL37_MII_CTRL_8BIT	0x0100



#define XGBE_PMA_CDR_TRACK_EN_MASK	0x01

#define XGBE_PMA_CDR_TRACK_EN_OFF	0x00

#define XGBE_PMA_CDR_TRACK_EN_ON	0x01



/* Bit setting and getting macros

 *  The get macro will extract the current bit field value from within

 *  the variable

drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c

+16 −0
Original line number Diff line number Diff line
@@ -519,6 +519,22 @@ void xgbe_debugfs_init(struct xgbe_prv_data *pdata) 
				   "debugfs_create_file failed\n");

	}



	if (pdata->vdata->an_cdr_workaround) {

		pfile = debugfs_create_bool("an_cdr_workaround", 0600,

					    pdata->xgbe_debugfs,

					    &pdata->debugfs_an_cdr_workaround);

		if (!pfile)

			netdev_err(pdata->netdev,

				   "debugfs_create_bool failed\n");



		pfile = debugfs_create_bool("an_cdr_track_early", 0600,

					    pdata->xgbe_debugfs,

					    &pdata->debugfs_an_cdr_track_early);

		if (!pfile)

			netdev_err(pdata->netdev,

				   "debugfs_create_bool failed\n");

	}



	kfree(buf);

}

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata) 
	XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, UDP4TE, 1);



	/* Call MDIO/PHY initialization routine */

	pdata->debugfs_an_cdr_workaround = pdata->vdata->an_cdr_workaround;

	ret = pdata->phy_if.phy_init(pdata);

	if (ret)

		return ret;

drivers/net/ethernet/amd/xgbe/xgbe-mdio.c

+19 −5
Original line number Diff line number Diff line
@@ -432,11 +432,16 @@ static void xgbe_an73_disable(struct xgbe_prv_data *pdata) 
	xgbe_an73_set(pdata, false, false);

	xgbe_an73_disable_interrupts(pdata);



	pdata->an_start = 0;



	netif_dbg(pdata, link, pdata->netdev, "CL73 AN disabled\n");

}



static void xgbe_an_restart(struct xgbe_prv_data *pdata)

{

	if (pdata->phy_if.phy_impl.an_pre)

		pdata->phy_if.phy_impl.an_pre(pdata);



	switch (pdata->an_mode) {

	case XGBE_AN_MODE_CL73:

	case XGBE_AN_MODE_CL73_REDRV:
@@ -453,6 +458,9 @@ static void xgbe_an_restart(struct xgbe_prv_data *pdata) 


static void xgbe_an_disable(struct xgbe_prv_data *pdata)

{

	if (pdata->phy_if.phy_impl.an_post)

		pdata->phy_if.phy_impl.an_post(pdata);



	switch (pdata->an_mode) {

	case XGBE_AN_MODE_CL73:

	case XGBE_AN_MODE_CL73_REDRV:
@@ -505,11 +513,11 @@ static enum xgbe_an xgbe_an73_tx_training(struct xgbe_prv_data *pdata, 
		XMDIO_WRITE(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL,

			    reg);



		if (pdata->phy_if.phy_impl.kr_training_post)

			pdata->phy_if.phy_impl.kr_training_post(pdata);



		netif_dbg(pdata, link, pdata->netdev,

			  "KR training initiated\n");



		if (pdata->phy_if.phy_impl.kr_training_post)

			pdata->phy_if.phy_impl.kr_training_post(pdata);

	}



	return XGBE_AN_PAGE_RECEIVED;
@@ -637,11 +645,11 @@ static enum xgbe_an xgbe_an73_incompat_link(struct xgbe_prv_data *pdata) 
			return XGBE_AN_NO_LINK;

	}



	xgbe_an73_disable(pdata);

	xgbe_an_disable(pdata);



	xgbe_switch_mode(pdata);



	xgbe_an73_restart(pdata);

	xgbe_an_restart(pdata);



	return XGBE_AN_INCOMPAT_LINK;

}
@@ -820,6 +828,9 @@ static void xgbe_an37_state_machine(struct xgbe_prv_data *pdata) 
		pdata->an_result = pdata->an_state;

		pdata->an_state = XGBE_AN_READY;



		if (pdata->phy_if.phy_impl.an_post)

			pdata->phy_if.phy_impl.an_post(pdata);



		netif_dbg(pdata, link, pdata->netdev, "CL37 AN result: %s\n",

			  xgbe_state_as_string(pdata->an_result));

	}
@@ -903,6 +914,9 @@ static void xgbe_an73_state_machine(struct xgbe_prv_data *pdata) 
		pdata->kx_state = XGBE_RX_BPA;

		pdata->an_start = 0;



		if (pdata->phy_if.phy_impl.an_post)

			pdata->phy_if.phy_impl.an_post(pdata);



		netif_dbg(pdata, link, pdata->netdev, "CL73 AN result: %s\n",

			  xgbe_state_as_string(pdata->an_result));

	}