| Message ID | 1416911328-10979-2-git-send-email-jiri@resnulli.us |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Nov 25, 2014 at 11:28:32AM +0100, Jiri Pirko wrote: > 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> > --- > new in v2 as suggested by DaveM > v2->v3: > -moved the patch to the patchset head > --- > net/bridge/br_fdb.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c > index 6f6c95c..08ef4e7 100644 > --- a/net/bridge/br_fdb.c > +++ b/net/bridge/br_fdb.c > @@ -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); > } > } > > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/25/14 05:28, Jiri Pirko wrote: > 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: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/25/14 at 11:28am, Jiri Pirko wrote: > 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> FWIW Acked-by: Thomas Graf <tgraf@suug.ch> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 25/11/14 02:28, Jiri Pirko wrote: > 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> FWIW: Acked-by: Florian Fainelli <f.fainelli@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 6f6c95c..08ef4e7 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -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); } }
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> --- new in v2 as suggested by DaveM v2->v3: -moved the patch to the patchset head --- net/bridge/br_fdb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)