diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2015-08-13 22:59:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-14 07:43:21 +0200 |
| commit | f7ba868b71bc858cf06de11fc8150c4552cfad81 (patch) | |
| tree | ee3ef636a8e732e60009dd72348790c163934e04 /net/ipv4/ip_output.c | |
| parent | net: Use passed in table for nexthop lookups (diff) | |
| download | linux-f7ba868b71bc858cf06de11fc8150c4552cfad81.tar.xz linux-f7ba868b71bc858cf06de11fc8150c4552cfad81.zip | |
net: Use VRF index for oif in ip_send_unicast_reply
If output device is not specified use VRF device if input device is
enslaved. This is needed to ensure tcp acks and resets go out VRF device.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6bf89a6312bc..0138fada0951 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1542,6 +1542,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, struct net *net = sock_net(sk); struct sk_buff *nskb; int err; + int oif; if (__ip_options_echo(&replyopts.opt.opt, skb, sopt)) return; @@ -1559,7 +1560,11 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, daddr = replyopts.opt.opt.faddr; } - flowi4_init_output(&fl4, arg->bound_dev_if, + oif = arg->bound_dev_if; + if (!oif && netif_index_is_vrf(net, skb->skb_iif)) + oif = skb->skb_iif; + + flowi4_init_output(&fl4, oif, IP4_REPLY_MARK(net, skb->mark), RT_TOS(arg->tos), RT_SCOPE_UNIVERSE, ip_hdr(skb)->protocol, |