diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-01-21 14:41:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-21 14:41:32 -0800 |
| commit | fa7f3a8d56b38a3ed1880a3780afba82387da277 (patch) | |
| tree | a4628ee966f21963e5e97a6d1a227a3e8138183e /net/bridge/br_fdb.c | |
| parent | Merge branch 'mlxsw-spectrum_router-Add-GRE-tunnel-support-for-Spectrum-2' (diff) | |
| parent | Linux 5.0-rc3 (diff) | |
| download | linux-dev-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.xz linux-dev-fa7f3a8d56b38a3ed1880a3780afba82387da277.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 6664cb8590f8..00573cc46c98 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -1129,6 +1129,8 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, err = -ENOMEM; goto err_unlock; } + if (swdev_notify) + fdb->added_by_user = 1; fdb->added_by_external_learn = 1; fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } else { @@ -1148,6 +1150,9 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, modified = true; } + if (swdev_notify) + fdb->added_by_user = 1; + if (modified) fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } |