4 files changed, 19 insertions, 7 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 13d57b0a88fa..0c9a6f7104d2 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3919,7 +3919,7 @@ e1000_clean(struct napi_struct *napi, int budget)
 {
         struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
         struct net_device *poll_dev = adapter->netdev;
-        int work_done = 0;
+        int tx_cleaned = 0, work_done = 0;
 
         /* Must NOT use netdev_priv macro here. */
         adapter = poll_dev->priv;
@@ -3929,14 +3929,17 @@ e1000_clean(struct napi_struct *napi, int budget)
          * simultaneously.  A failure obtaining the lock means
          * tx_ring[0] is currently being cleaned anyway. */
         if (spin_trylock(&adapter->tx_queue_lock)) {
-                e1000_clean_tx_irq(adapter,
-                                   &adapter->tx_ring[0]);
+                tx_cleaned = e1000_clean_tx_irq(adapter,
+                                                &adapter->tx_ring[0]);
                 spin_unlock(&adapter->tx_queue_lock);
         }
 
         adapter->clean_rx(adapter, &adapter->rx_ring[0],
                           &work_done, budget);
 
+        if (tx_cleaned)
+                work_done = budget;
+
         /* If budget not fully consumed, exit the polling mode */
         if (work_done < budget) {
                 if (likely(adapter->itr_setting & 3))
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4a6fc7453776..2ab3bfbb8a63 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1384,7 +1384,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
 {
         struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
         struct net_device *poll_dev = adapter->netdev;
-        int work_done = 0;
+        int tx_cleaned = 0, work_done = 0;
 
         /* Must NOT use netdev_priv macro here. */
         adapter = poll_dev->priv;
@@ -1394,12 +1394,15 @@ static int e1000_clean(struct napi_struct *napi, int budget)
          * simultaneously.  A failure obtaining the lock means
          * tx_ring is currently being cleaned anyway. */
         if (spin_trylock(&adapter->tx_queue_lock)) {
-                e1000_clean_tx_irq(adapter);
+                tx_cleaned = e1000_clean_tx_irq(adapter);
                 spin_unlock(&adapter->tx_queue_lock);
         }
 
         adapter->clean_rx(adapter, &work_done, budget);
 
+        if (tx_cleaned)
+                work_done = budget;
+
         /* If budget not fully consumed, exit the polling mode */
         if (work_done < budget) {
                 if (adapter->itr_setting & 3)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index a56491617661..de3f45e4c5ae 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1468,13 +1468,16 @@ static int ixgbe_clean(struct napi_struct *napi, int budget)
         struct ixgbe_adapter *adapter = container_of(napi,
                                         struct ixgbe_adapter, napi);
         struct net_device *netdev = adapter->netdev;
-        int work_done = 0;
+        int tx_cleaned = 0, work_done = 0;
 
         /* In non-MSIX case, there is no multi-Tx/Rx queue */
-        ixgbe_clean_tx_irq(adapter, adapter->tx_ring);
+        tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring);
         ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done,
                            budget);
 
+        if (tx_cleaned)
+                work_done = budget;
+
         /* If budget not fully consumed, exit the polling mode */
         if (work_done < budget) {
                 netif_rx_complete(netdev, napi);
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 3bbcea11329f..5f6beabf2d17 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -1319,6 +1319,7 @@ static int link_status_10g(struct niu *np, int *link_up_p)
 
 static int link_status_1g(struct niu *np, int *link_up_p)
 {
+        struct niu_link_config *lp = &np->link_config;
         u16 current_speed, bmsr;
         unsigned long flags;
         u8 current_duplex;
@@ -1386,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p)
                                 link_up = 0;
                 }
         }
+        lp->active_speed = current_speed;
+        lp->active_duplex = current_duplex;
         err = 0;
 
 out: