|
@@ -90,7 +90,7 @@ static void fdb_rcu_free(struct rcu_head *head)
|
|
|
* are then updated with the new information.
|
|
|
* Called under RTNL.
|
|
|
*/
|
|
|
-static void fdb_add_hw(struct net_bridge *br, const unsigned char *addr)
|
|
|
+static void fdb_add_hw_addr(struct net_bridge *br, const unsigned char *addr)
|
|
|
{
|
|
|
int err;
|
|
|
struct net_bridge_port *p;
|
|
@@ -118,7 +118,7 @@ undo:
|
|
|
* the ports with needed information.
|
|
|
* Called under RTNL.
|
|
|
*/
|
|
|
-static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr)
|
|
|
+static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
|
|
|
{
|
|
|
struct net_bridge_port *p;
|
|
|
|
|
@@ -133,7 +133,7 @@ static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr)
|
|
|
static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
|
|
|
{
|
|
|
if (f->is_static)
|
|
|
- fdb_del_hw(br, f->addr.addr);
|
|
|
+ fdb_del_hw_addr(br, f->addr.addr);
|
|
|
|
|
|
hlist_del_rcu(&f->hlist);
|
|
|
fdb_notify(br, f, RTM_DELNEIGH);
|
|
@@ -514,7 +514,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
|
|
return -ENOMEM;
|
|
|
|
|
|
fdb->is_local = fdb->is_static = 1;
|
|
|
- fdb_add_hw(br, addr);
|
|
|
+ fdb_add_hw_addr(br, addr);
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
|
|
return 0;
|
|
|
}
|
|
@@ -754,19 +754,19 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,
|
|
|
fdb->is_local = 1;
|
|
|
if (!fdb->is_static) {
|
|
|
fdb->is_static = 1;
|
|
|
- fdb_add_hw(br, addr);
|
|
|
+ fdb_add_hw_addr(br, addr);
|
|
|
}
|
|
|
} else if (state & NUD_NOARP) {
|
|
|
fdb->is_local = 0;
|
|
|
if (!fdb->is_static) {
|
|
|
fdb->is_static = 1;
|
|
|
- fdb_add_hw(br, addr);
|
|
|
+ fdb_add_hw_addr(br, addr);
|
|
|
}
|
|
|
} else {
|
|
|
fdb->is_local = 0;
|
|
|
if (fdb->is_static) {
|
|
|
fdb->is_static = 0;
|
|
|
- fdb_del_hw(br, addr);
|
|
|
+ fdb_del_hw_addr(br, addr);
|
|
|
}
|
|
|
}
|
|
|
|