diff options
author | Tony Zelenoff <antonz@parallels.com> | 2012-04-13 02:09:46 -0400 |
---|---|---|
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 | c5c23260594c5701af66ef754916775ba6a46bbc (diff) |
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 40ac4143654..c63152886b3 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) | |||
2502 | if (status & ISR_CMB_TX) | 2502 | if (status & ISR_CMB_TX) |
2503 | atl1_intr_tx(adapter); | 2503 | atl1_intr_tx(adapter); |
2504 | 2504 | ||
2505 | /* rx event */ | ||
2506 | if (status & ISR_CMB_RX) | ||
2507 | alt1_intr_rx(adapter); | ||
2508 | |||
2505 | /* rx exception */ | 2509 | /* rx exception */ |
2506 | if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN | | 2510 | if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN | |
2507 | ISR_RRD_OV | ISR_HOST_RFD_UNRUN | | 2511 | ISR_RRD_OV | ISR_HOST_RFD_UNRUN | |
2508 | ISR_HOST_RRD_OV | ISR_CMB_RX))) { | 2512 | ISR_HOST_RRD_OV))) { |
2509 | if (status & (ISR_RXF_OV | ISR_RFD_UNRUN | | 2513 | if (netif_msg_intr(adapter)) |
2510 | ISR_RRD_OV | ISR_HOST_RFD_UNRUN | | 2514 | dev_printk(KERN_DEBUG, |
2511 | ISR_HOST_RRD_OV)) | 2515 | &adapter->pdev->dev, |
2512 | if (netif_msg_intr(adapter)) | 2516 | "rx exception, ISR = 0x%x\n", |
2513 | dev_printk(KERN_DEBUG, | 2517 | status); |
2514 | &adapter->pdev->dev, | ||
2515 | "rx exception, ISR = 0x%x\n", | ||
2516 | status); | ||
2517 | atl1_intr_rx(adapter); | 2518 | atl1_intr_rx(adapter); |
2518 | } | 2519 | } |
2519 | 2520 | ||