diff options
| author | Fan Du <fan.du@intel.com> | 2015-01-14 06:10:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-14 22:32:06 +0100 |
| commit | 3f4c1d87af2a0c8a599b95bfebbc6338de343aca (patch) | |
| tree | eb8a54a9c56cec232bbebf303c18f749965a1e59 /net/openvswitch/vport-gre.c | |
| parent | Merge branch 'vxlan_rco' (diff) | |
| download | linux-3f4c1d87af2a0c8a599b95bfebbc6338de343aca.tar.xz linux-3f4c1d87af2a0c8a599b95bfebbc6338de343aca.zip | |
openvswitch: Introduce ovs_tunnel_route_lookup
Introduce ovs_tunnel_route_lookup to consolidate route lookup
shared by vxlan, gre, and geneve ports.
Signed-off-by: Fan Du <fan.du@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-gre.c')
| -rw-r--r-- | net/openvswitch/vport-gre.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c index e9aedb7c7106..f17ac9642f4e 100644 --- a/net/openvswitch/vport-gre.c +++ b/net/openvswitch/vport-gre.c @@ -134,7 +134,7 @@ static int gre_err(struct sk_buff *skb, u32 info, static int gre_tnl_send(struct vport *vport, struct sk_buff *skb) { struct net *net = ovs_dp_get_net(vport->dp); - struct ovs_key_ipv4_tunnel *tun_key; + const struct ovs_key_ipv4_tunnel *tun_key; struct flowi4 fl; struct rtable *rt; int min_headroom; @@ -148,15 +148,7 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb) } tun_key = &OVS_CB(skb)->egress_tun_info->tunnel; - /* Route lookup */ - memset(&fl, 0, sizeof(fl)); - fl.daddr = tun_key->ipv4_dst; - 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; - - rt = ip_route_output_key(net, &fl); + rt = ovs_tunnel_route_lookup(net, tun_key, skb->mark, &fl, IPPROTO_GRE); if (IS_ERR(rt)) { err = PTR_ERR(rt); goto err_free_skb; |