diff options
Diffstat (limited to 'drivers/net/ethernet/ti/cpsw.c')
-rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 1fd8125e58a8..90d41d26ec6d 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
@@ -637,13 +637,6 @@ void cpsw_rx_handler(void *token, int len, int status) | |||
637 | static irqreturn_t cpsw_interrupt(int irq, void *dev_id) | 637 | static irqreturn_t cpsw_interrupt(int irq, void *dev_id) |
638 | { | 638 | { |
639 | struct cpsw_priv *priv = dev_id; | 639 | struct cpsw_priv *priv = dev_id; |
640 | u32 rx, tx, rx_thresh; | ||
641 | |||
642 | rx_thresh = __raw_readl(&priv->wr_regs->rx_thresh_stat); | ||
643 | rx = __raw_readl(&priv->wr_regs->rx_stat); | ||
644 | tx = __raw_readl(&priv->wr_regs->tx_stat); | ||
645 | if (!rx_thresh && !rx && !tx) | ||
646 | return IRQ_NONE; | ||
647 | 640 | ||
648 | cpsw_intr_disable(priv); | 641 | cpsw_intr_disable(priv); |
649 | if (priv->irq_enabled == true) { | 642 | if (priv->irq_enabled == true) { |
@@ -1171,9 +1164,9 @@ static int cpsw_ndo_open(struct net_device *ndev) | |||
1171 | } | 1164 | } |
1172 | } | 1165 | } |
1173 | 1166 | ||
1167 | napi_enable(&priv->napi); | ||
1174 | cpdma_ctlr_start(priv->dma); | 1168 | cpdma_ctlr_start(priv->dma); |
1175 | cpsw_intr_enable(priv); | 1169 | cpsw_intr_enable(priv); |
1176 | napi_enable(&priv->napi); | ||
1177 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX); | 1170 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX); |
1178 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX); | 1171 | cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX); |
1179 | 1172 | ||