2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index ada5e4b89cd8..7e9e43d1074e 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -513,6 +513,7 @@ struct cmac {
         u64 rx_mcnt;
         unsigned int toggle_cnt;
         unsigned int txen;
+        u64 rx_pause;
         struct mac_stats stats;
 };
 
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index 1d1c3919ab66..ff9e9dcbd87d 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -452,6 +452,7 @@ int t3_mac_enable(struct cmac *mac, int which)
                                                 A_XGM_TX_SPI4_SOP_EOP_CNT +
                                                 oft)));
                 mac->rx_mcnt = s->rx_frames;
+                mac->rx_pause = s->rx_pause;
                 mac->rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,
                                                 A_XGM_RX_SPI4_SOP_EOP_CNT +
                                                 oft)));
@@ -504,7 +505,7 @@ int t3b2_mac_watchdog_task(struct cmac *mac)
         tx_xcnt = 1;            /* By default tx_xcnt is making progress */
         tx_tcnt = mac->tx_tcnt; /* If tx_mcnt is progressing ignore tx_tcnt */
         rx_xcnt = 1;            /* By default rx_xcnt is making progress */
-        if (tx_mcnt == mac->tx_mcnt) {
+        if (tx_mcnt == mac->tx_mcnt && mac->rx_pause == s->rx_pause) {
                 tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,
                                                 A_XGM_TX_SPI4_SOP_EOP_CNT +
                                                 mac->offset)));
@@ -560,6 +561,7 @@ out:
         mac->tx_mcnt = s->tx_frames;
         mac->rx_xcnt = rx_xcnt;
         mac->rx_mcnt = s->rx_frames;
+        mac->rx_pause = s->rx_pause;
         if (status == 1) {
                 t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0);
                 t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset);  /* flush */