aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index d26d8ae98148..7b9542846e36 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -564,10 +564,8 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq,
564 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || 564 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) ||
565 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || 565 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) ||
566 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || 566 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) ||
567 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue))) { 567 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)))
568 dmb(); 568 writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue));
569 __raw_writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue));
570 }
571 569
572 return 0; 570 return 0;
573} 571}
@@ -764,15 +762,12 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq,
764 txq->cur_tx = bdp; 762 txq->cur_tx = bdp;
765 763
766 /* Trigger transmission start */ 764 /* Trigger transmission start */
767 /* Trigger transmission start */
768 if (!(id_entry->driver_data & FEC_QUIRK_TKT210582) || 765 if (!(id_entry->driver_data & FEC_QUIRK_TKT210582) ||
769 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || 766 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) ||
770 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || 767 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) ||
771 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || 768 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) ||
772 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue))) { 769 !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)))
773 dmb(); 770 writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue));
774 __raw_writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue));
775 }
776 771
777 return 0; 772 return 0;
778 773