From d47a2d07700c76cbb7b0f71c33ee208abc12cfe4 Mon Sep 17 00:00:00 2001 From: Tony Zelenoff Date: Fri, 13 Apr 2012 06:09:46 +0000 Subject: [PATCH] --- yaml --- r: 300761 b: refs/heads/master c: 3e1d83f711cda05e326d8a4baa6fa34ee18ad7b8 h: refs/heads/master i: 300759: f025491a3d615044bca928c27246ff7410ee49ca v: v3 --- [refs] | 2 +- .../drivers/net/ethernet/atheros/atlx/atl1.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a13f2b8d89aa..64ca62018834 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5c23260594c5701af66ef754916775ba6a46bbc +refs/heads/master: 3e1d83f711cda05e326d8a4baa6fa34ee18ad7b8 diff --git a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c index 40ac41436549..c63152886b3e 100644 --- a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c @@ -2502,18 +2502,19 @@ static irqreturn_t atl1_intr(int irq, void *data) if (status & ISR_CMB_TX) atl1_intr_tx(adapter); + /* rx event */ + if (status & ISR_CMB_RX) + alt1_intr_rx(adapter); + /* rx exception */ if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN | ISR_RRD_OV | ISR_HOST_RFD_UNRUN | - ISR_HOST_RRD_OV | ISR_CMB_RX))) { - if (status & (ISR_RXF_OV | ISR_RFD_UNRUN | - ISR_RRD_OV | ISR_HOST_RFD_UNRUN | - ISR_HOST_RRD_OV)) - if (netif_msg_intr(adapter)) - dev_printk(KERN_DEBUG, - &adapter->pdev->dev, - "rx exception, ISR = 0x%x\n", - status); + ISR_HOST_RRD_OV))) { + if (netif_msg_intr(adapter)) + dev_printk(KERN_DEBUG, + &adapter->pdev->dev, + "rx exception, ISR = 0x%x\n", + status); atl1_intr_rx(adapter); }