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

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



Merge in networking bug fixes for merge window.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c431047c e58c1912

drivers/net/dsa/sja1105/sja1105_main.c

+5 −5
Original line number Diff line number Diff line
@@ -557,15 +557,15 @@ static int sja1105_parse_rgmii_delays(struct sja1105_private *priv, 
	int i;



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

		if (ports->role == XMII_MAC)

		if (ports[i].role == XMII_MAC)

			continue;



		if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||

		    ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)

		if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||

		    ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)

			priv->rgmii_rx_delay[i] = true;



		if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||

		    ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)

		if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||

		    ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)

			priv->rgmii_tx_delay[i] = true;



		if ((priv->rgmii_rx_delay[i] || priv->rgmii_tx_delay[i]) &&

drivers/net/macvlan.c

+2 −1
Original line number Diff line number Diff line
@@ -359,10 +359,11 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port, 
	}

	spin_unlock(&port->bc_queue.lock);



	schedule_work(&port->bc_work);



	if (err)

		goto free_nskb;



	schedule_work(&port->bc_work);

	return;



free_nskb:

drivers/net/phy/mdio_bus.c

+4 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev) 
	struct reset_control *reset = NULL;



	if (mdiodev->dev.of_node)

		reset = devm_reset_control_get_exclusive(&mdiodev->dev,

		reset = of_reset_control_get_exclusive(mdiodev->dev.of_node,

						       "phy");

	if (IS_ERR(reset)) {

		if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOTSUPP)
@@ -107,6 +107,8 @@ int mdiobus_unregister_device(struct mdio_device *mdiodev) 
	if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev)

		return -EINVAL;



	reset_control_put(mdiodev->reset_ctrl);



	mdiodev->bus->mdio_map[mdiodev->addr] = NULL;



	return 0;

drivers/net/slip/slip.c

+1 −0
Original line number Diff line number Diff line
@@ -855,6 +855,7 @@ static int slip_open(struct tty_struct *tty) 
	sl->tty = NULL;

	tty->disc_data = NULL;

	clear_bit(SLF_INUSE, &sl->flags);

	sl_free_netdev(sl->dev);

	free_netdev(sl->dev);



err_exit:

include/net/sctp/structs.h

+3 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,9 @@ struct sctp_ep_common { 
	/* What socket does this endpoint belong to?  */

	struct sock *sk;



	/* Cache netns and it won't change once set */

	struct net *net;



	/* This is where we receive inbound chunks.  */

	struct sctp_inq	  inqueue;