aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_link.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/bnx2x_link.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/bnx2x_link.c')
-rw-r--r--drivers/net/bnx2x_link.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c
index 41b9b7bd3d8e..cf5778919b4b 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -4717,8 +4717,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
4717 0xc809, &val1); 4717 0xc809, &val1);
4718 4718
4719 DP(NETIF_MSG_LINK, "8705 1.c809 val=0x%x\n", val1); 4719 DP(NETIF_MSG_LINK, "8705 1.c809 val=0x%x\n", val1);
4720 ext_phy_link_up = ((rx_sd & 0x1) && (val1 & (1<<9)) 4720 ext_phy_link_up = ((rx_sd & 0x1) && (val1 & (1<<9)) &&
4721 && ((val1 & (1<<8)) == 0)); 4721 ((val1 & (1<<8)) == 0));
4722 if (ext_phy_link_up) 4722 if (ext_phy_link_up)
4723 vars->line_speed = SPEED_10000; 4723 vars->line_speed = SPEED_10000;
4724 break; 4724 break;