- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / atlx / atl1.c

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 963df50..b6cf326 100644 (file)
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -1344,8 +1344,8 @@ static u32 atl1_check_link(struct atl1_adapter *adapter)
 
        /* link result is our setting */
        if (!reconfig) {
-               if (adapter->link_speed != speed
-                   || adapter->link_duplex != duplex) {
+               if (adapter->link_speed != speed ||
+                   adapter->link_duplex != duplex) {
                        adapter->link_speed = speed;
                        adapter->link_duplex = duplex;
                        atl1_setup_mac_ctrl(adapter);
@@ -2087,8 +2087,8 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
        }
        atomic_set(&tpd_ring->next_to_clean, sw_tpd_next_to_clean);
 
-       if (netif_queue_stopped(adapter->netdev)
-           && netif_carrier_ok(adapter->netdev))
+       if (netif_queue_stopped(adapter->netdev) &&
+           netif_carrier_ok(adapter->netdev))
                netif_wake_queue(adapter->netdev);
 }
 
@@ -2589,7 +2589,7 @@ static s32 atl1_up(struct atl1_adapter *adapter)
                irq_flags |= IRQF_SHARED;
        }
 
-       err = request_irq(adapter->pdev->irq, &atl1_intr, irq_flags,
+       err = request_irq(adapter->pdev->irq, atl1_intr, irq_flags,
                        netdev->name, netdev);
        if (unlikely(err))
                goto err_up;