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

Pull networking fixes from David Miller:

 1) Clear up some recent tipc regressions because of registration
    ordering. Fix from Junwei Hu.

 2) tipc's TLV_SET() can read past the end of the supplied buffer during
    the copy. From Chris Packham.

 3) ptp example program doesn't match the kernel, from Richard Cochran.

 4) Outgoing message type fix in qrtr, from Bjorn Andersson.

 5) Flow control regression in stmmac, from Tan Tee Min.

 6) Fix inband autonegotiation in phylink, from Russell King.

 7) Fix sk_bound_dev_if handling in rawv6_bind(), from Mike Manning.

 8) Fix usbnet crash after disconnect, from Kloetzke Jan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
  usbnet: fix kernel crash after disconnect
  selftests: fib_rule_tests: use pre-defined DEV_ADDR
  net-next: net: Fix typos in ip-sysctl.txt
  ipv6: Consider sk_bound_dev_if when binding a raw socket to an address
  net: phylink: ensure inband AN works correctly
  usbnet: ipheth: fix racing condition
  net: stmmac: dma channel control register need to be init first
  net: stmmac: fix ethtool flow control not able to get/set
  net: qrtr: Fix message type of outgoing packets
  networking: : fix typos in code comments
  ptp: Fix example program to match kernel.
  fddi: fix typos in code comments
  selftests: fib_rule_tests: enable forwarding before ipv4 from/iif test
  selftests: fib_rule_tests: fix local IPv4 address typo
  tipc: Avoid copying bytes beyond the supplied data
  2/2] net: xilinx_emaclite: use readx_poll_timeout() in mdio wait function
  1/2] net: axienet: use readx_poll_timeout() in mdio wait function
  vlan: Mark expected switch fall-through
  macvlan: Mark expected switch fall-through
  net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query
  ...

12 files changed, 52 insertions, 57 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index d290f0787dfb..94c59939a8cf 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -2010,6 +2010,8 @@ static int mlx4_en_set_tunable(struct net_device *dev,
         return ret;
 }
 
+#define MLX4_EEPROM_PAGE_LEN 256
+
 static int mlx4_en_get_module_info(struct net_device *dev,
                                    struct ethtool_modinfo *modinfo)
 {
@@ -2044,7 +2046,7 @@ static int mlx4_en_get_module_info(struct net_device *dev,
                 break;
         case MLX4_MODULE_ID_SFP:
                 modinfo->type = ETH_MODULE_SFF_8472;
-                modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
+                modinfo->eeprom_len = MLX4_EEPROM_PAGE_LEN;
                 break;
         default:
                 return -EINVAL;
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 10fcc22f4590..ba6ac31a339d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -2077,11 +2077,6 @@ int mlx4_get_module_info(struct mlx4_dev *dev, u8 port,
                 size -= offset + size - I2C_PAGE_SIZE;
 
         i2c_addr = I2C_ADDR_LOW;
-        if (offset >= I2C_PAGE_SIZE) {
-                /* Reset offset to high page */
-                i2c_addr = I2C_ADDR_HIGH;
-                offset -= I2C_PAGE_SIZE;
-        }
 
         cable_info = (struct mlx4_cable_info *)inmad->data;
         cable_info->dev_mem_address = cpu_to_be16(offset);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 3c749c327cbd..e09522c5509a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -460,7 +460,7 @@ stmmac_get_pauseparam(struct net_device *netdev,
         } else {
                 if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
                                        netdev->phydev->supported) ||
-                    linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+                    !linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
                                       netdev->phydev->supported))
                         return;
         }
@@ -491,7 +491,7 @@ stmmac_set_pauseparam(struct net_device *netdev,
         } else {
                 if (!linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
                                        phy->supported) ||
-                    linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+                    !linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
                                       phy->supported))
                         return -EOPNOTSUPP;
         }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5678b869cbff..2a1052704885 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2208,6 +2208,10 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
         if (priv->plat->axi)
                 stmmac_axi(priv, priv->ioaddr, priv->plat->axi);
 
+        /* DMA CSR Channel configuration */
+        for (chan = 0; chan < dma_csr_ch; chan++)
+                stmmac_init_chan(priv, priv->ioaddr, priv->plat->dma_cfg, chan);
+
         /* DMA RX Channel Configuration */
         for (chan = 0; chan < rx_channels_count; chan++) {
                 rx_q = &priv->rx_queue[chan];
@@ -2233,10 +2237,6 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
                                        tx_q->tx_tail_addr, chan);
         }
 
-        /* DMA CSR Channel configuration */
-        for (chan = 0; chan < dma_csr_ch; chan++)
-                stmmac_init_chan(priv, priv->ioaddr, priv->plat->dma_cfg, chan);
-
         return ret;
 }
 
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index c337400485da..011adae32b89 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -484,6 +484,11 @@ static inline u32 axienet_ior(struct axienet_local *lp, off_t offset)
         return in_be32(lp->regs + offset);
 }
 
+static inline u32 axinet_ior_read_mcr(struct axienet_local *lp)
+{
+        return axienet_ior(lp, XAE_MDIO_MCR_OFFSET);
+}
+
 /**
  * axienet_iow - Memory mapped Axi Ethernet register write
  * @lp:         Pointer to axienet local structure
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index 757a3b37ae8a..704babdbc8a2 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -11,6 +11,7 @@
 #include <linux/of_address.h>
 #include <linux/of_mdio.h>
 #include <linux/jiffies.h>
+#include <linux/iopoll.h>
 
 #include "xilinx_axienet.h"
 
@@ -20,16 +21,11 @@
 /* Wait till MDIO interface is ready to accept a new transaction.*/
 int axienet_mdio_wait_until_ready(struct axienet_local *lp)
 {
-        unsigned long end = jiffies + 2;
-        while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
-                 XAE_MDIO_MCR_READY_MASK)) {
-                if (time_before_eq(end, jiffies)) {
-                        WARN_ON(1);
-                        return -ETIMEDOUT;
-                }
-                udelay(1);
-        }
-        return 0;
+        u32 val;
+
+        return readx_poll_timeout(axinet_ior_read_mcr, lp,
+                                  val, val & XAE_MDIO_MCR_READY_MASK,
+                                  1, 20000);
 }
 
 /**
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 6886270da695..c409bab63bd3 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -27,6 +27,7 @@
 #include <linux/of_net.h>
 #include <linux/phy.h>
 #include <linux/interrupt.h>
+#include <linux/iopoll.h>
 
 #define DRIVER_NAME "xilinx_emaclite"
 
@@ -714,20 +715,15 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
 
 static int xemaclite_mdio_wait(struct net_local *lp)
 {
-        unsigned long end = jiffies + 2;
+        u32 val;
 
         /* wait for the MDIO interface to not be busy or timeout
          * after some time.
          */
-        while (xemaclite_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET) &
-                        XEL_MDIOCTRL_MDIOSTS_MASK) {
-                if (time_before_eq(end, jiffies)) {
-                        WARN_ON(1);
-                        return -ETIMEDOUT;
-                }
-                msleep(1);
-        }
-        return 0;
+        return readx_poll_timeout(xemaclite_readl,
+                                  lp->base_addr + XEL_MDIOCTRL_OFFSET,
+                                  val, !(val & XEL_MDIOCTRL_MDIOSTS_MASK),
+                                  1000, 20000);
 }
 
 /**
diff --git a/drivers/net/fddi/skfp/hwmtm.c b/drivers/net/fddi/skfp/hwmtm.c
index abbe309051d9..3d0f417e8586 100644
--- a/drivers/net/fddi/skfp/hwmtm.c
+++ b/drivers/net/fddi/skfp/hwmtm.c
@@ -1206,7 +1206,7 @@ void process_receive(struct s_smc *smc)
                 }
                 /*
                  * SUPERNET 3 Bug: FORMAC delivers status words
-                 * of aborded frames to the BMU
+                 * of aborted frames to the BMU
                  */
                 if (len <= 4) {
                         DB_RX(2, "Frame length = 0");
@@ -1343,7 +1343,7 @@ void process_receive(struct s_smc *smc)
                                 break ;
                         default :
                                 /*
-                                 * unknown FC abord the frame
+                                 * unknown FC abort the frame
                                  */
                                 DB_RX(2, "unknown FC error");
                                 smt_free_mbuf(smc,mb) ;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 92efa93649f0..61550122b563 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -838,6 +838,7 @@ static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         case SIOCSHWTSTAMP:
                 if (!net_eq(dev_net(dev), &init_net))
                         break;
+                /* fall through */
         case SIOCGHWTSTAMP:
                 if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
                         err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 89750c7dfd6f..74983593834b 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -422,28 +422,21 @@ static void phylink_resolve(struct work_struct *w)
 
                 case MLO_AN_INBAND:
                         phylink_get_mac_state(pl, &link_state);
-                        if (pl->phydev) {
-                                bool changed = false;
-
-                                link_state.link = link_state.link &&
-                                                  pl->phy_state.link;
-
-                                if (pl->phy_state.interface !=
-                                    link_state.interface) {
-                                        link_state.interface = pl->phy_state.interface;
-                                        changed = true;
-                                }
-
-                                /* Propagate the flow control from the PHY
-                                 * to the MAC. Also propagate the interface
-                                 * if changed.
-                                 */
-                                if (pl->phy_state.link || changed) {
-                                        link_state.pause |= pl->phy_state.pause;
-                                        phylink_resolve_flow(pl, &link_state);
-
-                                        phylink_mac_config(pl, &link_state);
-                                }
+
+                        /* If we have a phy, the "up" state is the union of
+                         * both the PHY and the MAC */
+                        if (pl->phydev)
+                                link_state.link &= pl->phy_state.link;
+
+                        /* Only update if the PHY link is up */
+                        if (pl->phydev && pl->phy_state.link) {
+                                link_state.interface = pl->phy_state.interface;
+
+                                /* If we have a PHY, we need to update with
+                                 * the pause mode bits. */
+                                link_state.pause |= pl->phy_state.pause;
+                                phylink_resolve_flow(pl, &link_state);
+                                phylink_mac_config(pl, &link_state);
                         }
                         break;
                 }
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index c247aed2dceb..8c01fbf68a89 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -383,17 +383,18 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
                           dev);
         dev->tx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
+        netif_stop_queue(net);
         retval = usb_submit_urb(dev->tx_urb, GFP_ATOMIC);
         if (retval) {
                 dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
                         __func__, retval);
                 dev->net->stats.tx_errors++;
                 dev_kfree_skb_any(skb);
+                netif_wake_queue(net);
         } else {
                 dev->net->stats.tx_packets++;
                 dev->net->stats.tx_bytes += skb->len;
                 dev_consume_skb_any(skb);
-                netif_stop_queue(net);
         }
 
         return NETDEV_TX_OK;
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 66f0e0f51711..72514c46b478 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -494,6 +494,7 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
 
         if (netif_running (dev->net) &&
             netif_device_present (dev->net) &&
+            test_bit(EVENT_DEV_OPEN, &dev->flags) &&
             !test_bit (EVENT_RX_HALT, &dev->flags) &&
             !test_bit (EVENT_DEV_ASLEEP, &dev->flags)) {
                 switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) {
@@ -1419,6 +1420,11 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
                 spin_unlock_irqrestore(&dev->txq.lock, flags);
                 goto drop;
         }
+        if (netif_queue_stopped(net)) {
+                usb_autopm_put_interface_async(dev->intf);
+                spin_unlock_irqrestore(&dev->txq.lock, flags);
+                goto drop;
+        }
 
 #ifdef CONFIG_PM
         /* if this triggers the device is still a sleep */