aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx/atl1.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/atlx/atl1.c
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atlx/atl1.c')
-rw-r--r--drivers/net/atlx/atl1.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index e547f788a266..b6cf3263127c 100644
--- 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)
1344 1344
1345 /* link result is our setting */ 1345 /* link result is our setting */
1346 if (!reconfig) { 1346 if (!reconfig) {
1347 if (adapter->link_speed != speed 1347 if (adapter->link_speed != speed ||
1348 || adapter->link_duplex != duplex) { 1348 adapter->link_duplex != duplex) {
1349 adapter->link_speed = speed; 1349 adapter->link_speed = speed;
1350 adapter->link_duplex = duplex; 1350 adapter->link_duplex = duplex;
1351 atl1_setup_mac_ctrl(adapter); 1351 atl1_setup_mac_ctrl(adapter);
@@ -2087,8 +2087,8 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
2087 } 2087 }
2088 atomic_set(&tpd_ring->next_to_clean, sw_tpd_next_to_clean); 2088 atomic_set(&tpd_ring->next_to_clean, sw_tpd_next_to_clean);
2089 2089
2090 if (netif_queue_stopped(adapter->netdev) 2090 if (netif_queue_stopped(adapter->netdev) &&
2091 && netif_carrier_ok(adapter->netdev)) 2091 netif_carrier_ok(adapter->netdev))
2092 netif_wake_queue(adapter->netdev); 2092 netif_wake_queue(adapter->netdev);
2093} 2093}
2094 2094