bridge: Add fdb dst check during fdb update
Subsystems (3)
PATCH v2 1/1 bridge: Add fdb dst check during fdb update
From: roopa <[email protected]>
Current bridge fdb update code does not seem to update the port during fdb update. This patch adds a check for fdb dst (port) change during fdb update. Also rearranges the call to fdb_notify to send only one notification for create and update.
Changelog:
v2 - Change notify flag to bool
--- net/bridge/br_fdb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/bridge/br_fdb.c +10 -1
@@ -615,6 +615,7 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,struct net_bridge *br = source->br;struct hlist_head *head = &br->hash[br_mac_hash (addr, vid)];struct net_bridge_fdb_entry *fdb; +bool notify = false; fdb =fdb_find (head, addr, vid);if (fdb ==NULL ) {
@@ -624,7 +625,7 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, fdb =fdb_create (head, source, addr, vid);if (!fdb)return -ENOMEM ; -fdb_notify (br, fdb,RTM_NEWNEIGH ); + notify = true; }else {if (flags &NLM_F_EXCL )return -EEXIST ;
@@ -638,7 +639,15 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, fdb->is_static =1 ; }else fdb->is_local = fdb->is_static =0 ; + notify = true; + } + +if (fdb->dst != source) { + fdb->dst = source; + notify = true; + } +if (notify) { fdb->updated = fdb->used = jiffies;fdb_notify (br, fdb,RTM_NEWNEIGH ); }
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: [email protected]
Date: Sun, 14 Apr 2013 12:43:13 -0700
Quoted 11 lines
From: roopa <[email protected]>
Current bridge fdb update code does not seem to update the port during fdb update. This patch adds a check for fdb dst (port) change during fdb update. Also rearranges the call to
fdb_notifyto send only one notification for create and update.Changelog:
v2 - Change notify flag to boolSigned-off-by Roopa Prabhu <[email protected]>
This needs review and is just rotting in my patchwork backlog.
Please someone with bridge knowledge take a look at this patch.
Thanks.
David Miller
maintainerOk, if nobody with bridgining expertiece can be bothered to review this I'm simply not going to apply it, it must not be that important.
PATCH v3 1/1 bridge: Add fdb dst check during fdb update
In reply to [email protected]The patch fixes a real oversight in the forwarding database management stuff.
A couple of minor tweaks.
1. Always update used value but don't change 'updated' value unless changed.
2. Rename notify flag to modified
3. Add some whitespace.
From: roopa <[email protected]>
Current bridge fdb update code does not seem to update the port during fdb update. This patch adds a check for fdb dst (port) change during fdb update. Also rearranges the call to fdb_notify to send only one notification for create and update.
Changelog:
v2 - Change notify flag to bool
--- net/bridge/br_fdb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/bridge/br_fdb.c +14 -2
@@ -615,6 +615,7 @@ static int fdb_add_entry(struct net_bridstruct net_bridge *br = source->br;struct hlist_head *head = &br->hash[br_mac_hash (addr, vid)];struct net_bridge_fdb_entry *fdb; +bool modified = false; fdb =fdb_find (head, addr, vid);if (fdb ==NULL ) {
@@ -624,10 +625,16 @@ static int fdb_add_entry(struct net_brid fdb =fdb_create (head, source, addr, vid);if (!fdb)return -ENOMEM ; -fdb_notify (br, fdb,RTM_NEWNEIGH ); + + modified = true; }else {if (flags &NLM_F_EXCL )return -EEXIST ; + +if (fdb->dst != source) { + fdb->dst = source; + modified = true; + } }if (fdb_to_nud (fdb) != state) {
@@ -639,7 +646,12 @@ static int fdb_add_entry(struct net_brid }else fdb->is_local = fdb->is_static =0 ; - fdb->updated = fdb->used = jiffies; + modified = true; + } + + fdb->used = jiffies; +if (modified) { + fdb->updated = jiffies;fdb_notify (br, fdb,RTM_NEWNEIGH ); }
From: Stephen Hemminger <[email protected]>
Date: Mon, 22 Apr 2013 15:56:49 -0700
Quoted 7 lines
From: roopa <[email protected]>
Current bridge fdb update code does not seem to update the port during fdb update. This patch adds a check for fdb dst (port) change during fdb update. Also rearranges the call to
fdb_notifyto send only one notification for create and update.
Quoted 5 lines
Changelog:
v2 - Change notify flag to boolSigned-off-by Roopa Prabhu <[email protected]>Signed-off-by Stephen Hemminger <[email protected]>
Applied.