diff options
| author |   Tony Zelenoff <antonz@parallels.com> | 2012-04-13 06:09:46 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-04-15 12:54:15 -0400 |
| commit | 3e1d83f711cda05e326d8a4baa6fa34ee18ad7b8 (patch) | |
| tree | be033022266a29c66f8e994a1dbead3033bed964 /drivers/net/ethernet/atheros/atlx/atl1.c | |
| parent | bridge: Add multicast_querier toggle and disable queries by default (diff) | |
| download | linux-dev-3e1d83f711cda05e326d8a4baa6fa34ee18ad7b8.tar.xz linux-dev-3e1d83f711cda05e326d8a4baa6fa34ee18ad7b8.zip | |
atl1: handle rx in separate condition
Remove rx from unlikely optimization in case of rx is very
likely thing for network card. This also reduce code a bit.
Signed-off-by: Tony Zelenoff <antonz@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atlx/atl1.c')
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 40ac41436549..c63152886b3e 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/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); } |