Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / ethernet / broadcom / bcmsysport.c

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 9530ee1..3cb99ce 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1997,6 +1997,9 @@ static int bcm_sysport_resume(struct device *d)
 
        umac_reset(priv);
 
+       /* Disable the UniMAC RX/TX */
+       umac_enable_set(priv, CMD_RX_EN | CMD_TX_EN, 0);
+
        /* We may have been suspended and never received a WOL event that
         * would turn off MPD detection, take care of that now
         */