diff options
Diffstat (limited to 'net/bridge/br_fdb.c')
-rw-r--r-- | net/bridge/br_fdb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 57bf05c353bc..9101a4e56201 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
21 | #include <linux/jhash.h> | 21 | #include <linux/jhash.h> |
22 | #include <linux/random.h> | 22 | #include <linux/random.h> |
23 | #include <linux/slab.h> | ||
23 | #include <asm/atomic.h> | 24 | #include <asm/atomic.h> |
24 | #include <asm/unaligned.h> | 25 | #include <asm/unaligned.h> |
25 | #include "br_private.h" | 26 | #include "br_private.h" |
@@ -60,8 +61,8 @@ static inline unsigned long hold_time(const struct net_bridge *br) | |||
60 | static inline int has_expired(const struct net_bridge *br, | 61 | static inline int has_expired(const struct net_bridge *br, |
61 | const struct net_bridge_fdb_entry *fdb) | 62 | const struct net_bridge_fdb_entry *fdb) |
62 | { | 63 | { |
63 | return !fdb->is_static | 64 | return !fdb->is_static && |
64 | && time_before_eq(fdb->ageing_timer + hold_time(br), jiffies); | 65 | time_before_eq(fdb->ageing_timer + hold_time(br), jiffies); |
65 | } | 66 | } |
66 | 67 | ||
67 | static inline int br_mac_hash(const unsigned char *mac) | 68 | static inline int br_mac_hash(const unsigned char *mac) |