diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-23 19:29:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-23 19:36:26 -0400 |
commit | 92101b3b2e3178087127709a556b091dae314e9e (patch) | |
tree | 06359f8823da3ed7617c5ea78e4a56bc5e958fea /include/net/inet_sock.h | |
parent | fe3edf45792a7d2f0edff4e2fcdd9a84c1a388a0 (diff) |
ipv4: Prepare for change of rt->rt_iif encoding.
Use inet_iif() consistently, and for TCP record the input interface of
cached RX dst in inet sock.
rt->rt_iif is going to be encoded differently, so that we can
legitimately cache input routes in the FIB info more aggressively.
When the input interface is "use SKB device index" the rt->rt_iif will
be set to zero.
This forces us to move the TCP RX dst cache installation into the ipv4
specific code, and as well it should since doing the route caching for
ipv6 is pointless at the moment since it is not inspected in the ipv6
input paths yet.
Also, remove the unlikely on dst->obsolete, all ipv4 dsts have
obsolete set to a non-zero value to force invocation of the check
callback.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_sock.h')
-rw-r--r-- | include/net/inet_sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 924d7b98ab60..613cfa401672 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
@@ -172,6 +172,7 @@ struct inet_sock { | |||
172 | int uc_index; | 172 | int uc_index; |
173 | int mc_index; | 173 | int mc_index; |
174 | __be32 mc_addr; | 174 | __be32 mc_addr; |
175 | int rx_dst_ifindex; | ||
175 | struct ip_mc_socklist __rcu *mc_list; | 176 | struct ip_mc_socklist __rcu *mc_list; |
176 | struct inet_cork_full cork; | 177 | struct inet_cork_full cork; |
177 | }; | 178 | }; |