Commit 28e55d07 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) Out of bounds array access in 802.11 minstrel code, from Adrien
    Schildknecht.

 2) Don't use skb_get() in IGMP/MLD code paths, as this makes
    pskb_may_pull() BUG.  From Linus Luessing.

 3) Fix off by one in ipv4 route dumping code, from Andy Whitcroft.

 4) Fix deadlock in reqsk_queue_unlink(), from Eric Dumazet.

 5) Fix ppp device deregistration wrt.  netns deletion, from Guillaume
    Nault.

 6) Fix deadlock when creating per-cpu ipv6 routes, from Martin KaFai
    Lau.

 7) Fix memory leak in batman-adv code, from Sven Eckelmann.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  batman-adv: Fix memory leak on tt add with invalid vlan
  net: phy: fix semicolon.cocci warnings
  net: qmi_wwan: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module
  be2net: avoid vxlan offloading on multichannel configs
  ipv6: Fix a potential deadlock when creating pcpu rt
  ipv6: Add rt6_make_pcpu_route()
  ipv6: Remove un-used argument from ip6_dst_alloc()
  net: phy: workaround for buggy cable detection by LAN8700 after cable plugging
  net: ethernet: micrel: fix an error code
  ppp: fix device unregistration upon netns deletion
  net: phy: fix PHY_RUNNING in phy_state_machine
  Revert "net: limit tcp/udp rmem/wmem to SOCK_{RCV,SND}BUF_MIN"
  inet: fix potential deadlock in reqsk_queue_unlink()
  gianfar: Restore link state settings after MAC reset
  ipv4: off-by-one in continuation handling in /proc/net/route
  net: fix wrong skb_get() usage / crash in IGMP/MLD parsing code
  mac80211: fix invalid read in minstrel_sort_best_tp_rates()
parents 3d3e66ba fd7dec25

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

+2 −2
Original line number Diff line number Diff line
@@ -5174,7 +5174,7 @@ static void be_add_vxlan_port(struct net_device *netdev, sa_family_t sa_family, 
	struct device *dev = &adapter->pdev->dev;

	int status;



	if (lancer_chip(adapter) || BEx_chip(adapter))

	if (lancer_chip(adapter) || BEx_chip(adapter) || be_is_mc(adapter))

		return;



	if (adapter->flags & BE_FLAGS_VXLAN_OFFLOADS) {
@@ -5221,7 +5221,7 @@ static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family, 
{

	struct be_adapter *adapter = netdev_priv(netdev);



	if (lancer_chip(adapter) || BEx_chip(adapter))

	if (lancer_chip(adapter) || BEx_chip(adapter) || be_is_mc(adapter))

		return;



	if (adapter->vxlan_port != port)

drivers/net/ethernet/freescale/gianfar.c

+5 −0
Original line number Diff line number Diff line
@@ -2102,6 +2102,11 @@ int startup_gfar(struct net_device *ndev) 
	/* Start Rx/Tx DMA and enable the interrupts */

	gfar_start(priv);



	/* force link state update after mac reset */

	priv->oldlink = 0;

	priv->oldspeed = 0;

	priv->oldduplex = -1;



	phy_start(priv->phydev);



	enable_napi(priv);

drivers/net/ethernet/micrel/ks8842.c

+2 −3
Original line number Diff line number Diff line
@@ -952,9 +952,8 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev) 


	sg_dma_address(&tx_ctl->sg) = dma_map_single(adapter->dev,

		tx_ctl->buf, DMA_BUFFER_SIZE, DMA_TO_DEVICE);

	err = dma_mapping_error(adapter->dev,

		sg_dma_address(&tx_ctl->sg));

	if (err) {

	if (dma_mapping_error(adapter->dev, sg_dma_address(&tx_ctl->sg))) {

		err = -ENOMEM;

		sg_dma_address(&tx_ctl->sg) = 0;

		goto err;

	}

drivers/net/phy/phy.c

+12 −4
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ void phy_state_machine(struct work_struct *work) 
	bool needs_aneg = false, do_suspend = false;

	enum phy_state old_state;

	int err = 0;

	int old_link;



	mutex_lock(&phydev->lock);
@@ -896,11 +897,18 @@ void phy_state_machine(struct work_struct *work) 
		phydev->adjust_link(phydev->attached_dev);

		break;

	case PHY_RUNNING:

		/* Only register a CHANGE if we are

		 * polling or ignoring interrupts

		/* Only register a CHANGE if we are polling or ignoring

		 * interrupts and link changed since latest checking.

		 */

		if (!phy_interrupt_is_valid(phydev))

		if (!phy_interrupt_is_valid(phydev)) {

			old_link = phydev->link;

			err = phy_read_status(phydev);

			if (err)

				break;



			if (old_link != phydev->link)

				phydev->state = PHY_CHANGELINK;

		}

		break;

	case PHY_CHANGELINK:

		err = phy_read_status(phydev);

drivers/net/phy/smsc.c

+19 −12
Original line number Diff line number Diff line
@@ -91,19 +91,18 @@ static int lan911x_config_init(struct phy_device *phydev) 
}



/*

 * The LAN8710/LAN8720 requires a minimum of 2 link pulses within 64ms of each

 * other in order to set the ENERGYON bit and exit EDPD mode.  If a link partner

 * does send the pulses within this interval, the PHY will remained powered

 * down.

 *

 * This workaround will manually toggle the PHY on/off upon calls to read_status

 * in order to generate link test pulses if the link is down.  If a link partner

 * is present, it will respond to the pulses, which will cause the ENERGYON bit

 * to be set and will cause the EDPD mode to be exited.

 * The LAN87xx suffers from rare absence of the ENERGYON-bit when Ethernet cable

 * plugs in while LAN87xx is in Energy Detect Power-Down mode. This leads to

 * unstable detection of plugging in Ethernet cable.

 * This workaround disables Energy Detect Power-Down mode and waiting for

 * response on link pulses to detect presence of plugged Ethernet cable.

 * The Energy Detect Power-Down mode is enabled again in the end of procedure to

 * save approximately 220 mW of power if cable is unplugged.

 */

static int lan87xx_read_status(struct phy_device *phydev)

{

	int err = genphy_read_status(phydev);

	int i;



	if (!phydev->link) {

		/* Disable EDPD to wake up PHY */
@@ -116,8 +115,16 @@ static int lan87xx_read_status(struct phy_device *phydev) 
		if (rc < 0)

			return rc;



		/* Sleep 64 ms to allow ~5 link test pulses to be sent */

		msleep(64);

		/* Wait max 640 ms to detect energy */

		for (i = 0; i < 64; i++) {

			/* Sleep to allow link test pulses to be sent */

			msleep(10);

			rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);

			if (rc < 0)

				return rc;

			if (rc & MII_LAN83C185_ENERGYON)

				break;

		}



		/* Re-enable EDPD */

		rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
@@ -191,7 +198,7 @@ static struct phy_driver smsc_phy_driver[] = { 


	/* basic functions */

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,

	.read_status	= lan87xx_read_status,

	.config_init	= smsc_phy_config_init,

	.soft_reset	= smsc_phy_reset,

CRA Git | Maintained and supported by SUSTech CRA and CCSE