diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-03 00:55:57 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-17 14:34:54 +0100 |
commit | 9f2bfe818ec71806d5a0defd2a5c9bacce7998cb (patch) | |
tree | a1db97acb48fbbdec273c4834061683926f75b4a /drivers/net/ethernet/freescale/fec_main.c | |
parent | e3ce425b0ad0e862234cecec2695b8b35d5cc3ae (diff) |
net: fec: avoid hitting transmitter if it is still running
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
-rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 87120522ba66..4e164e6ab945 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -568,7 +568,8 @@ static int fec_enet_txq_submit_skb(struct sk_buff *skb, struct net_device *ndev) fep->cur_tx = bdp; /* Trigger transmission start */ - writel(0, fep->hwp + FEC_X_DES_ACTIVE); + if (readl(fep->hwp + FEC_X_DES_ACTIVE) == 0) + writel(0, fep->hwp + FEC_X_DES_ACTIVE); return 0; } @@ -752,7 +753,8 @@ static int fec_enet_txq_submit_tso(struct sk_buff *skb, struct net_device *ndev) fep->cur_tx = bdp; /* Trigger transmission start */ - writel(0, fep->hwp + FEC_X_DES_ACTIVE); + if (readl(fep->hwp + FEC_X_DES_ACTIVE) == 0) + writel(0, fep->hwp + FEC_X_DES_ACTIVE); return 0; |