hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ramips: raeth: don't process disabled interrupts 

Also rename the 'fe_int' variable.

SVN-Revision: 30713
owl
Gabor Juhos 2012-02-25 11:59:19 +00:00
parent 6b37484883
commit 30143b715c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_main.c
View File

@ -755,21 +755,27 @@ static irqreturn_t
ramips_eth_irq(int irq, void *dev) ramips_eth_irq(int irq, void *dev)
{ {
struct raeth_priv *re = netdev_priv(dev); struct raeth_priv *re = netdev_priv(dev);
unsigned long fe_int = ramips_fe_rr(RAMIPS_FE_INT_STATUS); unsigned int status;
ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS); status = ramips_fe_rr(RAMIPS_FE_INT_STATUS);
status &= ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
if (fe_int & RAMIPS_RX_DLY_INT) { if (!status)
return IRQ_NONE;
ramips_fe_wr(status, RAMIPS_FE_INT_STATUS);
if (status & RAMIPS_RX_DLY_INT) {
ramips_fe_int_disable(RAMIPS_RX_DLY_INT); ramips_fe_int_disable(RAMIPS_RX_DLY_INT);
tasklet_schedule(&re->rx_tasklet); tasklet_schedule(&re->rx_tasklet);
} }
if (fe_int & RAMIPS_TX_DLY_INT) { if (status & RAMIPS_TX_DLY_INT) {
ramips_fe_int_disable(RAMIPS_TX_DLY_INT); ramips_fe_int_disable(RAMIPS_TX_DLY_INT);
tasklet_schedule(&re->tx_housekeeping_tasklet); tasklet_schedule(&re->tx_housekeeping_tasklet);
} }
raeth_debugfs_update_int_stats(re, fe_int); raeth_debugfs_update_int_stats(re, status);
return IRQ_HANDLED; return IRQ_HANDLED;
} }