[ovs-dev] [PATCH v3 21/28] datapath: backport: geneve: add IPv6 bits to geneve_fill_metadata_dst
Pravin B Shelar
pshelar at ovn.org
Sat Jul 2 01:00:52 UTC 2016
Upstream commit:
commit b8812fa88371ae567c907448d9a7ba62d09b90c9
Author: John W. Linville <linville at tuxdriver.com>
geneve: add IPv6 bits to geneve_fill_metadata_dst
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Reviewed-by: Jesse Gross <jesse at ovn.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Pravin B Shelar <pshelar at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>
---
datapath/linux/compat/geneve.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/datapath/linux/compat/geneve.c b/datapath/linux/compat/geneve.c
index dbb220f..4dee940 100644
--- a/datapath/linux/compat/geneve.c
+++ b/datapath/linux/compat/geneve.c
@@ -1177,16 +1177,31 @@ int ovs_geneve_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
struct geneve_dev *geneve = netdev_priv(dev);
struct rtable *rt;
struct flowi4 fl4;
+#if IS_ENABLED(CONFIG_IPV6)
+ struct dst_entry *dst;
+ struct flowi6 fl6;
+#endif
- if (ip_tunnel_info_af(info) != AF_INET)
- return -EINVAL;
+ if (ip_tunnel_info_af(info) == AF_INET) {
+ rt = geneve_get_v4_rt(skb, dev, &fl4, info);
+ if (IS_ERR(rt))
+ return PTR_ERR(rt);
- rt = geneve_get_v4_rt(skb, dev, &fl4, info);
- if (IS_ERR(rt))
- return PTR_ERR(rt);
+ ip_rt_put(rt);
+ info->key.u.ipv4.src = fl4.saddr;
+#if IS_ENABLED(CONFIG_IPV6)
+ } else if (ip_tunnel_info_af(info) == AF_INET6) {
+ dst = geneve_get_v6_dst(skb, dev, &fl6, info);
+ if (IS_ERR(dst))
+ return PTR_ERR(dst);
+
+ dst_release(dst);
+ info->key.u.ipv6.src = fl6.saddr;
+#endif
+ } else {
+ return -EINVAL;
+ }
- ip_rt_put(rt);
- info->key.u.ipv4.src = fl4.saddr;
info->key.tp_src = udp_flow_src_port(geneve->net, skb,
1, USHRT_MAX, true);
info->key.tp_dst = geneve->dst_port;
--
1.9.1
More information about the dev
mailing list