diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/vxge/vxge-traffic.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (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/vxge/vxge-traffic.c')
-rw-r--r-- | drivers/net/vxge/vxge-traffic.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c index 61ce754fa9d..2c012f4ce46 100644 --- a/drivers/net/vxge/vxge-traffic.c +++ b/drivers/net/vxge/vxge-traffic.c | |||
@@ -1963,14 +1963,14 @@ enum vxge_hw_status __vxge_hw_vpath_alarm_process( | |||
1963 | val64 = readq(&vp_reg->asic_ntwk_vp_err_reg); | 1963 | val64 = readq(&vp_reg->asic_ntwk_vp_err_reg); |
1964 | 1964 | ||
1965 | if (((val64 & | 1965 | if (((val64 & |
1966 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT) && | 1966 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT) && |
1967 | (!(val64 & | 1967 | (!(val64 & |
1968 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK))) || | 1968 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK))) || |
1969 | ((val64 & | 1969 | ((val64 & |
1970 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT_OCCURR) | 1970 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT_OCCURR) && |
1971 | && (!(val64 & | 1971 | (!(val64 & |
1972 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK_OCCURR) | 1972 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK_OCCURR) |
1973 | ))) { | 1973 | ))) { |
1974 | sw_stats->error_stats.network_sustained_fault++; | 1974 | sw_stats->error_stats.network_sustained_fault++; |
1975 | 1975 | ||
1976 | writeq( | 1976 | writeq( |
@@ -1983,14 +1983,14 @@ enum vxge_hw_status __vxge_hw_vpath_alarm_process( | |||
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | if (((val64 & | 1985 | if (((val64 & |
1986 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK) && | 1986 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK) && |
1987 | (!(val64 & | 1987 | (!(val64 & |
1988 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT))) || | 1988 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT))) || |
1989 | ((val64 & | 1989 | ((val64 & |
1990 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK_OCCURR) | 1990 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_OK_OCCURR) && |
1991 | && (!(val64 & | 1991 | (!(val64 & |
1992 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT_OCCURR) | 1992 | VXGE_HW_ASIC_NW_VP_ERR_REG_XMACJ_STN_FLT_OCCURR) |
1993 | ))) { | 1993 | ))) { |
1994 | 1994 | ||
1995 | sw_stats->error_stats.network_sustained_ok++; | 1995 | sw_stats->error_stats.network_sustained_ok++; |
1996 | 1996 | ||