summaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_diag.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-03-13 23:51:10 +0100
committerDavid S. Miller <davem@davemloft.net>2015-03-14 20:05:10 +0100
commit16f86165bd0a94a96ab99629828cc9057db50221 (patch)
treeabb1a7c6f69f2f424dd08e035091945d252dd141 /net/ipv4/inet_diag.c
parentMerge branch 'tipc-next' (diff)
downloadlinux-16f86165bd0a94a96ab99629828cc9057db50221.tar.xz
linux-16f86165bd0a94a96ab99629828cc9057db50221.zip
inet: fill request sock ir_iif for IPv4
Once request socks will be in ehash table, they will need to have a valid ir_iff field. This is currently true only for IPv6. This patch extends support for IPv4 as well. This means inet_diag_fill_req() can now properly use ir_iif, which is better for IPv6 link locals anyway, as request sockets and established sockets will propagate consistent netlink idiag_if. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
-rw-r--r--net/ipv4/inet_diag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 43789c99031f..e1e4d8c0384a 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -733,7 +733,7 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
r->idiag_timer = 1;
r->idiag_retrans = req->num_retrans;
- r->id.idiag_if = sk->sk_bound_dev_if;
+ r->id.idiag_if = ireq->ir_iif;
BUILD_BUG_ON(offsetof(struct inet_request_sock, ir_cookie) !=
offsetof(struct sock, sk_cookie));