diff options
| author |   Patrick McHardy <kaber@trash.net> | 2007-06-04 21:32:46 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-06-07 13:38:51 -0700 |
| commit | f0e48dbfc5c74e967fea4c0fd0c5ad07557ae0c8 (patch) | |
| tree | 3e082e8946855e6a21f1f65582eb308b1cec0ed1 /net/ipv4/tcp_ipv4.c | |
| parent | [BNX2]: Update version and reldate. (diff) | |
| download | linux-dev-f0e48dbfc5c74e967fea4c0fd0c5ad07557ae0c8.tar.xz linux-dev-f0e48dbfc5c74e967fea4c0fd0c5ad07557ae0c8.zip | |
[TCP]: Honour sk_bound_dev_if in tcp_v4_send_ack
A time_wait socket inherits sk_bound_dev_if from the original socket,
but it is not used when sending ACK packets using ip_send_reply.
Fix by passing the oif to ip_send_reply in struct ip_reply_arg and
use it for output routing.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 47c61055eb60..97e294e82679 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -705,6 +705,8 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk, ip_hdr(skb)->saddr, /* XXX */ arg.iov[0].iov_len, IPPROTO_TCP, 0); arg.csumoffset = offsetof(struct tcphdr, check) / 2; + if (twsk) + arg.bound_dev_if = twsk->tw_sk.tw_bound_dev_if; ip_send_reply(tcp_socket->sk, skb, &arg, arg.iov[0].iov_len); |