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>
This commit is contained in:
Tony Zelenoff 2012-04-13 06:09:46 +00:00 committed by David S. Miller
parent c5c2326059
commit 3e1d83f711

View file

@ -2502,13 +2502,14 @@ static irqreturn_t atl1_intr(int irq, void *data)
if (status & ISR_CMB_TX) if (status & ISR_CMB_TX)
atl1_intr_tx(adapter); atl1_intr_tx(adapter);
/* rx event */
if (status & ISR_CMB_RX)
alt1_intr_rx(adapter);
/* rx exception */ /* rx exception */
if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN | if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN |
ISR_RRD_OV | ISR_HOST_RFD_UNRUN | ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
ISR_HOST_RRD_OV | ISR_CMB_RX))) { ISR_HOST_RRD_OV))) {
if (status & (ISR_RXF_OV | ISR_RFD_UNRUN |
ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
ISR_HOST_RRD_OV))
if (netif_msg_intr(adapter)) if (netif_msg_intr(adapter))
dev_printk(KERN_DEBUG, dev_printk(KERN_DEBUG,
&adapter->pdev->dev, &adapter->pdev->dev,