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/bonding/bonding.h | |
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/bonding/bonding.h')
-rw-r--r-- | drivers/net/bonding/bonding.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index a51ae7dc8d51..558ec1352527 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -254,8 +254,8 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) | |||
254 | 254 | ||
255 | static inline bool bond_is_lb(const struct bonding *bond) | 255 | static inline bool bond_is_lb(const struct bonding *bond) |
256 | { | 256 | { |
257 | return bond->params.mode == BOND_MODE_TLB | 257 | return (bond->params.mode == BOND_MODE_TLB || |
258 | || bond->params.mode == BOND_MODE_ALB; | 258 | bond->params.mode == BOND_MODE_ALB); |
259 | } | 259 | } |
260 | 260 | ||
261 | #define BOND_PRI_RESELECT_ALWAYS 0 | 261 | #define BOND_PRI_RESELECT_ALWAYS 0 |