diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/bridge/br_fdb.c | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
-rw-r--r-- | net/bridge/br_fdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 57bf05c353bc..3b8e038ab32c 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -60,8 +60,8 @@ static inline unsigned long hold_time(const struct net_bridge *br) | |||
60 | static inline int has_expired(const struct net_bridge *br, | 60 | static inline int has_expired(const struct net_bridge *br, |
61 | const struct net_bridge_fdb_entry *fdb) | 61 | const struct net_bridge_fdb_entry *fdb) |
62 | { | 62 | { |
63 | return !fdb->is_static | 63 | return !fdb->is_static && |
64 | && time_before_eq(fdb->ageing_timer + hold_time(br), jiffies); | 64 | time_before_eq(fdb->ageing_timer + hold_time(br), jiffies); |
65 | } | 65 | } |
66 | 66 | ||
67 | static inline int br_mac_hash(const unsigned char *mac) | 67 | static inline int br_mac_hash(const unsigned char *mac) |