Changeset 30713


Ignore:
Timestamp:
2012-02-25T12:59:19+01:00 (6 years ago)
Author:
juhosg
Message:

ramips: raeth: don't process disabled interrupts

Also rename the 'fe_int' variable.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_main.c

    r30681 r30713  
    756756{ 
    757757        struct raeth_priv *re = netdev_priv(dev); 
    758         unsigned long fe_int = ramips_fe_rr(RAMIPS_FE_INT_STATUS); 
    759  
    760         ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS); 
    761  
    762         if (fe_int & RAMIPS_RX_DLY_INT) { 
     758        unsigned int status; 
     759 
     760        status = ramips_fe_rr(RAMIPS_FE_INT_STATUS); 
     761        status &= ramips_fe_rr(RAMIPS_FE_INT_ENABLE); 
     762 
     763        if (!status) 
     764                return IRQ_NONE; 
     765 
     766        ramips_fe_wr(status, RAMIPS_FE_INT_STATUS); 
     767 
     768        if (status & RAMIPS_RX_DLY_INT) { 
    763769                ramips_fe_int_disable(RAMIPS_RX_DLY_INT); 
    764770                tasklet_schedule(&re->rx_tasklet); 
    765771        } 
    766772 
    767         if (fe_int & RAMIPS_TX_DLY_INT) { 
     773        if (status & RAMIPS_TX_DLY_INT) { 
    768774                ramips_fe_int_disable(RAMIPS_TX_DLY_INT); 
    769775                tasklet_schedule(&re->tx_housekeeping_tasklet); 
    770776        } 
    771777 
    772         raeth_debugfs_update_int_stats(re, fe_int); 
     778        raeth_debugfs_update_int_stats(re, status); 
    773779 
    774780        return IRQ_HANDLED; 
Note: See TracChangeset for help on using the changeset viewer.