Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300211
b: refs/heads/master
c: 062e55e
h: refs/heads/master
i:
  300209: 91f154f
  300207: ac46d38
v: v3
  • Loading branch information
Stephen Boyd authored and David S. Miller committed May 11, 2012
1 parent abe75a6 commit 7ea9a61
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: f09e2249c4f5c7c13261ec73f5a7807076af0c8e
refs/heads/master: 062e55e3960062fc2fb62a7274b4c253003eba73
7 changes: 4 additions & 3 deletions trunk/drivers/net/ethernet/micrel/ks8851.c
Original file line number Diff line number Diff line change
Expand Up @@ -618,10 +618,8 @@ static void ks8851_irq_work(struct work_struct *work)
netif_dbg(ks, intr, ks->netdev,
"%s: status 0x%04x\n", __func__, status);

if (status & IRQ_LCI) {
/* should do something about checking link status */
if (status & IRQ_LCI)
handled |= IRQ_LCI;
}

if (status & IRQ_LDI) {
u16 pmecr = ks8851_rdreg16(ks, KS_PMECR);
Expand Down Expand Up @@ -684,6 +682,9 @@ static void ks8851_irq_work(struct work_struct *work)

mutex_unlock(&ks->lock);

if (status & IRQ_LCI)
mii_check_link(&ks->mii);

if (status & IRQ_TXI)
netif_wake_queue(ks->netdev);

Expand Down

0 comments on commit 7ea9a61

Please sign in to comment.