diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-09-01 21:53:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-04 11:39:58 -0700 |
| commit | 38f507f1ba013effec3d7deb84273ac1829e6b87 (patch) | |
| tree | fb72a2befafc19018e4dd8880b39c4599df69e3d | |
| parent | 76644232e6122808947aa329bb995ea68ad01442 (diff) | |
| download | linux-stable-38f507f1ba013effec3d7deb84273ac1829e6b87.tar.gz linux-stable-38f507f1ba013effec3d7deb84273ac1829e6b87.tar.bz2 linux-stable-38f507f1ba013effec3d7deb84273ac1829e6b87.zip | |
vxlan: call peernet2id() in fdb notification
netns id should be already allocated each time we change
netns, that is, in dev_change_net_namespace() (more precisely
in rtnl_fill_ifinfo()). It is safe to just call peernet2id() here.
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/vxlan.c | 2 | ||||
| -rw-r--r-- | net/core/net_namespace.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index f605a3684a7f..9735059dee99 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -287,7 +287,7 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan, if (!net_eq(dev_net(vxlan->dev), vxlan->net) && nla_put_s32(skb, NDA_LINK_NETNSID, - peernet2id_alloc(dev_net(vxlan->dev), vxlan->net))) + peernet2id(dev_net(vxlan->dev), vxlan->net))) goto nla_put_failure; if (send_eth && nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->eth_addr)) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 7a77dcabd4e8..f3fa43506f16 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -227,7 +227,6 @@ int peernet2id_alloc(struct net *net, struct net *peer) rtnl_net_notifyid(net, RTM_NEWNSID, id); return id; } -EXPORT_SYMBOL(peernet2id_alloc); /* This function returns, if assigned, the id of a peer netns. */ int peernet2id(struct net *net, struct net *peer) @@ -240,6 +239,7 @@ int peernet2id(struct net *net, struct net *peer) spin_unlock_irqrestore(&net->nsid_lock, flags); return id; } +EXPORT_SYMBOL(peernet2id); /* This function returns true is the peer netns has an id assigned into the * current netns. |