From 7ea9a61398ef27e3c0e1bada78cc262d9b2f50a4 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 10 May 2012 12:51:30 +0000 Subject: [PATCH] --- yaml --- r: 300211 b: refs/heads/master c: 062e55e3960062fc2fb62a7274b4c253003eba73 h: refs/heads/master i: 300209: 91f154f6f464d3354c9cd5c9b538ddeab4bca80f 300207: ac46d38b1fbd04e7bcee6fd076227a1d67115c15 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/micrel/ks8851.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 24cee6515aa2..7756c9213161 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f09e2249c4f5c7c13261ec73f5a7807076af0c8e +refs/heads/master: 062e55e3960062fc2fb62a7274b4c253003eba73 diff --git a/trunk/drivers/net/ethernet/micrel/ks8851.c b/trunk/drivers/net/ethernet/micrel/ks8851.c index f8dda009d3c0..5e313e9a252f 100644 --- a/trunk/drivers/net/ethernet/micrel/ks8851.c +++ b/trunk/drivers/net/ethernet/micrel/ks8851.c @@ -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); @@ -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);