Message ID | 0ead411e38bc57a8971ffd9826f7bf9bfdc6ccf1.1417796557.git.jbenc@redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, Dec 5, 2014 at 8:24 AM, Jiri Benc <jbenc@redhat.com> wrote: > 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> Thanks for the fix. Acked-by: Pravin B Shelar <pshelar@nicira.com> > --- > net/openvswitch/vport.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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, > 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)) > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Benc <jbenc@redhat.com> Date: Fri, 5 Dec 2014 17:24:28 +0100 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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, 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))
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> --- net/openvswitch/vport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)