Skip to content

Commit

Permalink
bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
Browse files Browse the repository at this point in the history
The current name might seem that this actually offloads the fdb entry to
hw. So rename it to clearly present that this for hardware address
addition/removal.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Dec 3, 2014
1 parent cd4c910 commit 020ec6b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/bridge/br_fdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -118,7 +118,7 @@ static void fdb_add_hw(struct net_bridge *br, const unsigned char *addr)
* 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;

Expand All @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 020ec6b

Please sign in to comment.