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
  ...

2 files changed, 8 insertions, 1 deletions

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 */