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

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 42 insertions, 10 deletions

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 53759c315b97..877c9516e781 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -854,6 +854,13 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
         if (cdc_ncm_init(dev))
                 goto error2;
 
+        /* Some firmwares need a pause here or they will silently fail
+         * to set up the interface properly.  This value was decided
+         * empirically on a Sierra Wireless MC7455 running 02.08.02.00
+         * firmware.
+         */
+        usleep_range(10000, 20000);
+
         /* configure data interface */
         temp = usb_set_interface(dev->udev, iface_no, data_altsetting);
         if (temp) {
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 24d367280ecf..b225bc27fbe2 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -31,7 +31,7 @@
 #define NETNEXT_VERSION         "08"
 
 /* Information for net */
-#define NET_VERSION             "4"
+#define NET_VERSION             "5"
 
 #define DRIVER_VERSION          "v1." NETNEXT_VERSION "." NET_VERSION
 #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
@@ -625,6 +625,7 @@ struct r8152 {
                 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
                 bool (*in_nway)(struct r8152 *);
                 void (*hw_phy_cfg)(struct r8152 *);
+                void (*autosuspend_en)(struct r8152 *tp, bool enable);
         } rtl_ops;
 
         int intr_interval;
@@ -2412,9 +2413,6 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
         if (enable) {
                 u32 ocp_data;
 
-                r8153_u1u2en(tp, false);
-                r8153_u2p3en(tp, false);
-
                 __rtl_set_wol(tp, WAKE_ANY);
 
                 ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
@@ -2425,7 +2423,28 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
 
                 ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
         } else {
+                u32 ocp_data;
+
                 __rtl_set_wol(tp, tp->saved_wolopts);
+
+                ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
+
+                ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34);
+                ocp_data &= ~LINK_OFF_WAKE_EN;
+                ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data);
+
+                ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
+        }
+}
+
+static void rtl8153_runtime_enable(struct r8152 *tp, bool enable)
+{
+        rtl_runtime_suspend_enable(tp, enable);
+
+        if (enable) {
+                r8153_u1u2en(tp, false);
+                r8153_u2p3en(tp, false);
+        } else {
                 r8153_u2p3en(tp, true);
                 r8153_u1u2en(tp, true);
         }
@@ -3530,7 +3549,7 @@ static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
                 napi_disable(&tp->napi);
                 if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
                         rtl_stop_rx(tp);
-                        rtl_runtime_suspend_enable(tp, true);
+                        tp->rtl_ops.autosuspend_en(tp, true);
                 } else {
                         cancel_delayed_work_sync(&tp->schedule);
                         tp->rtl_ops.down(tp);
@@ -3557,7 +3576,7 @@ static int rtl8152_resume(struct usb_interface *intf)
 
         if (netif_running(tp->netdev) && tp->netdev->flags & IFF_UP) {
                 if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-                        rtl_runtime_suspend_enable(tp, false);
+                        tp->rtl_ops.autosuspend_en(tp, false);
                         clear_bit(SELECTIVE_SUSPEND, &tp->flags);
                         napi_disable(&tp->napi);
                         set_bit(WORK_ENABLE, &tp->flags);
@@ -3572,7 +3591,7 @@ static int rtl8152_resume(struct usb_interface *intf)
                 usb_submit_urb(tp->intr_urb, GFP_KERNEL);
         } else if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
                 if (tp->netdev->flags & IFF_UP)
-                        rtl_runtime_suspend_enable(tp, false);
+                        tp->rtl_ops.autosuspend_en(tp, false);
                 clear_bit(SELECTIVE_SUSPEND, &tp->flags);
         }
 
@@ -4158,6 +4177,7 @@ static int rtl_ops_init(struct r8152 *tp)
                 ops->eee_set            = r8152_set_eee;
                 ops->in_nway            = rtl8152_in_nway;
                 ops->hw_phy_cfg         = r8152b_hw_phy_cfg;
+                ops->autosuspend_en     = rtl_runtime_suspend_enable;
                 break;
 
         case RTL_VER_03:
@@ -4174,6 +4194,7 @@ static int rtl_ops_init(struct r8152 *tp)
                 ops->eee_set            = r8153_set_eee;
                 ops->in_nway            = rtl8153_in_nway;
                 ops->hw_phy_cfg         = r8153_hw_phy_cfg;
+                ops->autosuspend_en     = rtl8153_runtime_enable;
                 break;
 
         default:
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 61ba46404937..6086a0163249 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -395,8 +395,11 @@ int usbnet_change_mtu (struct net_device *net, int new_mtu)
         dev->hard_mtu = net->mtu + net->hard_header_len;
         if (dev->rx_urb_size == old_hard_mtu) {
                 dev->rx_urb_size = dev->hard_mtu;
-                if (dev->rx_urb_size > old_rx_urb_size)
+                if (dev->rx_urb_size > old_rx_urb_size) {
+                        usbnet_pause_rx(dev);
                         usbnet_unlink_rx_urbs(dev);
+                        usbnet_resume_rx(dev);
+                }
         }
 
         /* max qlen depend on hard_mtu and rx_urb_size */
@@ -1508,8 +1511,9 @@ static void usbnet_bh (unsigned long param)
         } else if (netif_running (dev->net) &&
                    netif_device_present (dev->net) &&
                    netif_carrier_ok(dev->net) &&
-                   !timer_pending (&dev->delay) &&
-                   !test_bit (EVENT_RX_HALT, &dev->flags)) {
+                   !timer_pending(&dev->delay) &&
+                   !test_bit(EVENT_RX_PAUSED, &dev->flags) &&
+                   !test_bit(EVENT_RX_HALT, &dev->flags)) {
                 int     temp = dev->rxq.qlen;
 
                 if (temp < RX_QLEN(dev)) {