Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300769
b: refs/heads/master
c: 136cd14
h: refs/heads/master
i:
  300767: 1a76039
v: v3
  • Loading branch information
Tony Zelenoff authored and David S. Miller committed Apr 15, 2012
1 parent 993a8e8 commit 22810ca
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a9bc71e9a1a099e1aab745f1755a3c15a745ad8
refs/heads/master: 136cd14e1ea2bfde66d212d8e18e81552c94e4e3
14 changes: 10 additions & 4 deletions trunk/drivers/net/ethernet/atheros/atlx/atl1.c
Original file line number Diff line number Diff line change
Expand Up @@ -2504,8 +2504,12 @@ static irqreturn_t atl1_intr(int irq, void *data)
if (!status)
return IRQ_NONE;

/* clear CMB interrupt status at once */
adapter->cmb.cmb->int_stats = 0;
/* clear CMB interrupt status at once,
* but leave rx/tx interrupt status in case it should be dropped
* only if rx/tx processing queued. In other case interrupt
* can be lost.
*/
adapter->cmb.cmb->int_stats = status & (ISR_CMB_TX | ISR_CMB_RX);

if (status & ISR_GPHY) /* clear phy status */
atlx_clear_phy_int(adapter);
Expand Down Expand Up @@ -2547,8 +2551,10 @@ static irqreturn_t atl1_intr(int irq, void *data)
}

/* transmit or receive event */
if (status & (ISR_CMB_TX | ISR_CMB_RX))
atl1_sched_rings_clean(adapter);
if (status & (ISR_CMB_TX | ISR_CMB_RX) &&
atl1_sched_rings_clean(adapter))
adapter->cmb.cmb->int_stats = adapter->cmb.cmb->int_stats &
~(ISR_CMB_TX | ISR_CMB_RX);

/* rx exception */
if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN |
Expand Down

0 comments on commit 22810ca

Please sign in to comment.