aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-11-28 08:34:12 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-02 23:01:16 -0500
commit020ec6ba2a0c4c1e147c506a0970b58a90d1146b (patch)
treea37b4ca551fd6d5235d56b90347bfeefc8cd9686 /net/bridge
parentcd4c910e00751a451b34476c52eb17f904a844b6 (diff)
bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
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>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_fdb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6f6c95cfe8f2..08ef4e7a2439 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)
90 * are then updated with the new information. 90 * are then updated with the new information.
91 * Called under RTNL. 91 * Called under RTNL.
92 */ 92 */
93static void fdb_add_hw(struct net_bridge *br, const unsigned char *addr) 93static void fdb_add_hw_addr(struct net_bridge *br, const unsigned char *addr)
94{ 94{
95 int err; 95 int err;
96 struct net_bridge_port *p; 96 struct net_bridge_port *p;
@@ -118,7 +118,7 @@ undo:
118 * the ports with needed information. 118 * the ports with needed information.
119 * Called under RTNL. 119 * Called under RTNL.
120 */ 120 */
121static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr) 121static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
122{ 122{
123 struct net_bridge_port *p; 123 struct net_bridge_port *p;
124 124
@@ -133,7 +133,7 @@ static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr)
133static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f) 133static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
134{ 134{
135 if (f->is_static) 135 if (f->is_static)
136 fdb_del_hw(br, f->addr.addr); 136 fdb_del_hw_addr(br, f->addr.addr);
137 137
138 hlist_del_rcu(&f->hlist); 138 hlist_del_rcu(&f->hlist);
139 fdb_notify(br, f, RTM_DELNEIGH); 139 fdb_notify(br, f, RTM_DELNEIGH);
@@ -514,7 +514,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
514 return -ENOMEM; 514 return -ENOMEM;
515 515
516 fdb->is_local = fdb->is_static = 1; 516 fdb->is_local = fdb->is_static = 1;
517 fdb_add_hw(br, addr); 517 fdb_add_hw_addr(br, addr);
518 fdb_notify(br, fdb, RTM_NEWNEIGH); 518 fdb_notify(br, fdb, RTM_NEWNEIGH);
519 return 0; 519 return 0;
520} 520}
@@ -754,19 +754,19 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,
754 fdb->is_local = 1; 754 fdb->is_local = 1;
755 if (!fdb->is_static) { 755 if (!fdb->is_static) {
756 fdb->is_static = 1; 756 fdb->is_static = 1;
757 fdb_add_hw(br, addr); 757 fdb_add_hw_addr(br, addr);
758 } 758 }
759 } else if (state & NUD_NOARP) { 759 } else if (state & NUD_NOARP) {
760 fdb->is_local = 0; 760 fdb->is_local = 0;
761 if (!fdb->is_static) { 761 if (!fdb->is_static) {
762 fdb->is_static = 1; 762 fdb->is_static = 1;
763 fdb_add_hw(br, addr); 763 fdb_add_hw_addr(br, addr);
764 } 764 }
765 } else { 765 } else {
766 fdb->is_local = 0; 766 fdb->is_local = 0;
767 if (fdb->is_static) { 767 if (fdb->is_static) {
768 fdb->is_static = 0; 768 fdb->is_static = 0;
769 fdb_del_hw(br, addr); 769 fdb_del_hw_addr(br, addr);
770 } 770 }
771 } 771 }
772 772