summaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorJiri Benc <jbenc@redhat.com>2014-12-05 17:24:28 +0100
committerDavid S. Miller <davem@davemloft.net>2014-12-09 16:01:21 -0500
commitd2b2a132458ebbab02e51dc81190e4092da6b6c3 (patch)
treeab8cea518db584099c7edee6a215d2f1294820f7 /net/openvswitch
parent62dbe83015ed15b307eb22b89568dd41091dda76 (diff)
downloadop-kernel-dev-d2b2a132458ebbab02e51dc81190e4092da6b6c3.zip
op-kernel-dev-d2b2a132458ebbab02e51dc81190e4092da6b6c3.tar.gz
openvswitch: set correct protocol on route lookup
Respect what the caller passed to ovs_tunnel_get_egress_info. Fixes: 8f0aad6f35f7e ("openvswitch: Extend packet attribute for egress tunnel info") Signed-off-by: Jiri Benc <jbenc@redhat.com> Acked-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/vport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index e771a46..9584526 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -600,7 +600,7 @@ int ovs_tunnel_get_egress_info(struct ovs_tunnel_info *egress_tun_info,
fl.saddr = tun_key->ipv4_src;
fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
fl.flowi4_mark = skb_mark;
- fl.flowi4_proto = IPPROTO_GRE;
+ fl.flowi4_proto = ipproto;
rt = ip_route_output_key(net, &fl);
if (IS_ERR(rt))
OpenPOWER on IntegriCloud