diff options
| author | Jiri Benc <jbenc@redhat.com> | 2014-12-05 11:24:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 16:01:21 -0500 |
| commit | d2b2a132458ebbab02e51dc81190e4092da6b6c3 (patch) | |
| tree | ab8cea518db584099c7edee6a215d2f1294820f7 | |
| parent | 62dbe83015ed15b307eb22b89568dd41091dda76 (diff) | |
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>
| -rw-r--r-- | net/openvswitch/vport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index e771a46933e5..9584526c0778 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, | |||
| 600 | fl.saddr = tun_key->ipv4_src; | 600 | fl.saddr = tun_key->ipv4_src; |
| 601 | fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos); | 601 | fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos); |
| 602 | fl.flowi4_mark = skb_mark; | 602 | fl.flowi4_mark = skb_mark; |
| 603 | fl.flowi4_proto = IPPROTO_GRE; | 603 | fl.flowi4_proto = ipproto; |
| 604 | 604 | ||
| 605 | rt = ip_route_output_key(net, &fl); | 605 | rt = ip_route_output_key(net, &fl); |
| 606 | if (IS_ERR(rt)) | 606 | if (IS_ERR(rt)) |