Message ID | 1493408347-44779-1-git-send-email-arkadis@mellanox.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 28/04/17 22:39, Arkadi Sharshevsky wrote: > Commit 7e26bf45e4cb ("net: bridge: allow SW learn to take over HW fdb > entries") added the ability to "take over an entry which was previously > learned via HW when it shows up from a SW port". > > However, if an entry was learned via HW and then a control packet > (e.g., ARP request) was trapped to the CPU, the bridge driver will > update the entry and remove the externally learned flag, although the > entry is still present in HW. Instead, only clear the externally learned > flag in case of roaming. > > Fixes: 7e26bf45e4cb ("net: bridge: allow SW learn to take over HW fdb entries") > Signed-off-by: Ido Schimmel <idosch@mellanox.com> > Signed-off-by: Arkadi Sharashevsky <arkadis@mellanox.com> > Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> > --- > v1->v2 > - net-next rebase. > > v2->v3 > - remove redundant line. > --- > net/bridge/br_fdb.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
From: Arkadi Sharshevsky <arkadis@mellanox.com> Date: Fri, 28 Apr 2017 22:39:07 +0300 > Commit 7e26bf45e4cb ("net: bridge: allow SW learn to take over HW fdb > entries") added the ability to "take over an entry which was previously > learned via HW when it shows up from a SW port". > > However, if an entry was learned via HW and then a control packet > (e.g., ARP request) was trapped to the CPU, the bridge driver will > update the entry and remove the externally learned flag, although the > entry is still present in HW. Instead, only clear the externally learned > flag in case of roaming. > > Fixes: 7e26bf45e4cb ("net: bridge: allow SW learn to take over HW fdb entries") > Signed-off-by: Ido Schimmel <idosch@mellanox.com> > Signed-off-by: Arkadi Sharashevsky <arkadis@mellanox.com> Applied, thanks.
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index de7988b..ab0c7cc 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -589,16 +589,14 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, if (unlikely(source != fdb->dst)) { fdb->dst = source; fdb_modified = true; + /* Take over HW learned entry */ + if (unlikely(fdb->added_by_external_learn)) + fdb->added_by_external_learn = 0; } if (now != fdb->updated) fdb->updated = now; if (unlikely(added_by_user)) fdb->added_by_user = 1; - /* Take over HW learned entry */ - if (unlikely(fdb->added_by_external_learn)) { - fdb->added_by_external_learn = 0; - fdb_modified = true; - } if (unlikely(fdb_modified)) fdb_notify(br, fdb, RTM_NEWNEIGH); }