summaryrefslogtreecommitdiffstats
path: root/drivers/net/vxlan.c
diff options
context:
space:
mode:
authorNicolas Dichtel2015-01-20 15:15:47 +0100
committerDavid S. Miller2015-01-24 02:51:15 +0100
commit193523bf937309d57c6dd7839bcf34d7a029dbee (patch)
tree0dbb105a5d413ab622e6b9b5d18137ec93d7f809 /drivers/net/vxlan.c
parentveth: advertise link netns via netlink (diff)
downloadkernel-qcow2-linux-193523bf937309d57c6dd7839bcf34d7a029dbee.tar.gz
kernel-qcow2-linux-193523bf937309d57c6dd7839bcf34d7a029dbee.tar.xz
kernel-qcow2-linux-193523bf937309d57c6dd7839bcf34d7a029dbee.zip
vxlan: advertise netns of vxlan dev in fdb msg
Netlink FDB messages are sent in the link netns. The header of these messages contains the ifindex (ndm_ifindex) of the netdevice, but this ifindex is unusable in case of x-netns vxlan. I named the new attribute NDA_NDM_IFINDEX_NETNSID, to avoid confusion with NDA_IFINDEX. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
-rw-r--r--drivers/net/vxlan.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 0346eaa6d236..19d3664ab9dd 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -339,6 +339,11 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
ndm->ndm_flags = fdb->flags;
ndm->ndm_type = RTN_UNICAST;
+ if (!net_eq(dev_net(vxlan->dev), vxlan->net) &&
+ nla_put_s32(skb, NDA_NDM_IFINDEX_NETNSID,
+ peernet2id(vxlan->net, dev_net(vxlan->dev))))
+ goto nla_put_failure;
+
if (send_eth && nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->eth_addr))
goto nla_put_failure;