drivers/net: Move && and || to end of previous line

[mirror_ubuntu-zesty-kernel.git] / drivers / net / atlx / atl1.c

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index e547f788a2660c4d22e7c11ad3ae2d4f6a076cb2..b6cf3263127c77be7b7dd3f68521e3fb910aa1a4 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);
 }