diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_fdb.c | 4 | ||||
-rw-r--r-- | net/bridge/br_sysfs_br.c | 6 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_stp.c | 4 |
3 files changed, 7 insertions, 7 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) |
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index ee4820aa1843..bee4f300d0c8 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c | |||
@@ -316,9 +316,9 @@ static ssize_t store_group_addr(struct device *d, | |||
316 | if (new_addr[5] & ~0xf) | 316 | if (new_addr[5] & ~0xf) |
317 | return -EINVAL; | 317 | return -EINVAL; |
318 | 318 | ||
319 | if (new_addr[5] == 1 /* 802.3x Pause address */ | 319 | if (new_addr[5] == 1 || /* 802.3x Pause address */ |
320 | || new_addr[5] == 2 /* 802.3ad Slow protocols */ | 320 | new_addr[5] == 2 || /* 802.3ad Slow protocols */ |
321 | || new_addr[5] == 3) /* 802.1X PAE address */ | 321 | new_addr[5] == 3) /* 802.1X PAE address */ |
322 | return -EINVAL; | 322 | return -EINVAL; |
323 | 323 | ||
324 | spin_lock_bh(&br->lock); | 324 | spin_lock_bh(&br->lock); |
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c index 48527e621626..75e29a9cebda 100644 --- a/net/bridge/netfilter/ebt_stp.c +++ b/net/bridge/netfilter/ebt_stp.c | |||
@@ -135,8 +135,8 @@ ebt_stp_mt(const struct sk_buff *skb, const struct xt_match_param *par) | |||
135 | if (memcmp(sp, header, sizeof(header))) | 135 | if (memcmp(sp, header, sizeof(header))) |
136 | return false; | 136 | return false; |
137 | 137 | ||
138 | if (info->bitmask & EBT_STP_TYPE | 138 | if (info->bitmask & EBT_STP_TYPE && |
139 | && FWINV(info->type != sp->type, EBT_STP_TYPE)) | 139 | FWINV(info->type != sp->type, EBT_STP_TYPE)) |
140 | return false; | 140 | return false; |
141 | 141 | ||
142 | if (sp->type == BPDU_TYPE_CONFIG && | 142 | if (sp->type == BPDU_TYPE_CONFIG && |