leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vxlan: use ip_route_output

Browse Source 
Select source address for VXLAN packet based on route destination
and don't lie to route code. VXLAN is not GRE.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2012-10-09 20:35:48 +00:00 committed by David S. Miller
parent 321fb99139
commit ca78f18129
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/vxlan.c
View File

@ -680,9 +680,13 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
hash = skb_get_rxhash(skb); hash = skb_get_rxhash(skb);
rt = ip_route_output_gre(dev_net(dev), &fl4, dst, memset(&fl4, 0, sizeof(fl4));
vxlan->saddr, vxlan->vni, fl4.flowi4_oif = vxlan->link;
RT_TOS(tos), vxlan->link); fl4.flowi4_tos = RT_TOS(tos);
fl4.daddr = dst;
fl4.saddr = vxlan->saddr;
rt = ip_route_output_key(dev_net(dev), &fl4);
if (IS_ERR(rt)) { if (IS_ERR(rt)) {
netdev_dbg(dev, "no route to %pI4\n", &dst); netdev_dbg(dev, "no route to %pI4\n", &dst);
dev->stats.tx_carrier_errors++; dev->stats.tx_carrier_errors++;
@ -724,7 +728,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
iph->frag_off = df; iph->frag_off = df;
iph->protocol = IPPROTO_UDP; iph->protocol = IPPROTO_UDP;
iph->tos = vxlan_ecn_encap(tos, old_iph, skb); iph->tos = vxlan_ecn_encap(tos, old_iph, skb);
iph->daddr = fl4.daddr; iph->daddr = dst;
iph->saddr = fl4.saddr; iph->saddr = fl4.saddr;
iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst);