diff options
Diffstat (limited to 'net/bridge/br_fdb.c')
-rw-r--r-- | net/bridge/br_fdb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 5945c54bc2de..d21f32383517 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -107,8 +107,8 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr) | |||
107 | struct net_bridge_port *op; | 107 | struct net_bridge_port *op; |
108 | list_for_each_entry(op, &br->port_list, list) { | 108 | list_for_each_entry(op, &br->port_list, list) { |
109 | if (op != p && | 109 | if (op != p && |
110 | !compare_ether_addr(op->dev->dev_addr, | 110 | ether_addr_equal(op->dev->dev_addr, |
111 | f->addr.addr)) { | 111 | f->addr.addr)) { |
112 | f->dst = op; | 112 | f->dst = op; |
113 | goto insert; | 113 | goto insert; |
114 | } | 114 | } |
@@ -214,8 +214,8 @@ void br_fdb_delete_by_port(struct net_bridge *br, | |||
214 | struct net_bridge_port *op; | 214 | struct net_bridge_port *op; |
215 | list_for_each_entry(op, &br->port_list, list) { | 215 | list_for_each_entry(op, &br->port_list, list) { |
216 | if (op != p && | 216 | if (op != p && |
217 | !compare_ether_addr(op->dev->dev_addr, | 217 | ether_addr_equal(op->dev->dev_addr, |
218 | f->addr.addr)) { | 218 | f->addr.addr)) { |
219 | f->dst = op; | 219 | f->dst = op; |
220 | goto skip_delete; | 220 | goto skip_delete; |
221 | } | 221 | } |
@@ -237,7 +237,7 @@ struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, | |||
237 | struct net_bridge_fdb_entry *fdb; | 237 | struct net_bridge_fdb_entry *fdb; |
238 | 238 | ||
239 | hlist_for_each_entry_rcu(fdb, h, &br->hash[br_mac_hash(addr)], hlist) { | 239 | hlist_for_each_entry_rcu(fdb, h, &br->hash[br_mac_hash(addr)], hlist) { |
240 | if (!compare_ether_addr(fdb->addr.addr, addr)) { | 240 | if (ether_addr_equal(fdb->addr.addr, addr)) { |
241 | if (unlikely(has_expired(br, fdb))) | 241 | if (unlikely(has_expired(br, fdb))) |
242 | break; | 242 | break; |
243 | return fdb; | 243 | return fdb; |
@@ -331,7 +331,7 @@ static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head, | |||
331 | struct net_bridge_fdb_entry *fdb; | 331 | struct net_bridge_fdb_entry *fdb; |
332 | 332 | ||
333 | hlist_for_each_entry(fdb, h, head, hlist) { | 333 | hlist_for_each_entry(fdb, h, head, hlist) { |
334 | if (!compare_ether_addr(fdb->addr.addr, addr)) | 334 | if (ether_addr_equal(fdb->addr.addr, addr)) |
335 | return fdb; | 335 | return fdb; |
336 | } | 336 | } |
337 | return NULL; | 337 | return NULL; |
@@ -344,7 +344,7 @@ static struct net_bridge_fdb_entry *fdb_find_rcu(struct hlist_head *head, | |||
344 | struct net_bridge_fdb_entry *fdb; | 344 | struct net_bridge_fdb_entry *fdb; |
345 | 345 | ||
346 | hlist_for_each_entry_rcu(fdb, h, head, hlist) { | 346 | hlist_for_each_entry_rcu(fdb, h, head, hlist) { |
347 | if (!compare_ether_addr(fdb->addr.addr, addr)) | 347 | if (ether_addr_equal(fdb->addr.addr, addr)) |
348 | return fdb; | 348 | return fdb; |
349 | } | 349 | } |
350 | return NULL; | 350 | return NULL; |