From 05163ffcd88ae718bc09d280c896e8d99813e51b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 14 May 2007 12:38:13 -0700 Subject: [PATCH] --- yaml --- r: 56544 b: refs/heads/master c: a3caeada948535f126e407457e15f2633ee7168a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a8c283e200a5..59a7eb1e8433 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3225b919036a3ec2e96bb36b7a4fd64c43fdbe84 +refs/heads/master: a3caeada948535f126e407457e15f2633ee7168a diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index bde28ad9797d..6e360f816605 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -2345,6 +2345,12 @@ static void sky2_mac_intr(struct sky2_hw *hw, unsigned port) printk(KERN_INFO PFX "%s: mac interrupt status 0x%x\n", dev->name, status); + if (status & GM_IS_RX_CO_OV) + gma_read16(hw, port, GM_RX_IRQ_SRC); + + if (status & GM_IS_TX_CO_OV) + gma_read16(hw, port, GM_TX_IRQ_SRC); + if (status & GM_IS_RX_FF_OR) { ++sky2->net_stats.rx_fifo_errors; sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_CLI_RX_FO);