diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-01-26 14:10:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-28 02:11:07 +0100 |
| commit | 4967082b469320eeba54ffbca632af1962858fb7 (patch) | |
| tree | 358f3258d1ab3bbcf261786d3bd66a7a9650943b /drivers/net/vxlan.c | |
| parent | Merge branch 'bonding-next' (diff) | |
| download | linux-4967082b469320eeba54ffbca632af1962858fb7.tar.xz linux-4967082b469320eeba54ffbca632af1962858fb7.zip | |
vxlan: advertise link netns in fdb messages
Previous commit is based on a wrong assumption, fdb messages are always sent
into the netns where the interface stands (see vxlan_fdb_notify()).
These fdb messages doesn't embed the rtnl attribute IFLA_LINK_NETNSID, thus we
need to add it (useful to interpret NDA_IFINDEX or NDA_DST for example).
Note also that vxlan_nlmsg_size() was not updated.
Fixes: 193523bf9373 ("vxlan: advertise netns of vxlan dev in fdb msg")
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 87736e65cd15..31bac2a21ce3 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -341,8 +341,8 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan, 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)))) + nla_put_s32(skb, NDA_LINK_NETNSID, + peernet2id(dev_net(vxlan->dev), vxlan->net))) goto nla_put_failure; if (send_eth && nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->eth_addr)) @@ -385,6 +385,7 @@ static inline size_t vxlan_nlmsg_size(void) + nla_total_size(sizeof(__be16)) /* NDA_PORT */ + nla_total_size(sizeof(__be32)) /* NDA_VNI */ + nla_total_size(sizeof(__u32)) /* NDA_IFINDEX */ + + nla_total_size(sizeof(__s32)) /* NDA_LINK_NETNSID */ + nla_total_size(sizeof(struct nda_cacheinfo)); } |