diff options
author | Neal Cardwell <ncardwell@google.com> | 2012-10-22 17:41:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-23 13:03:44 -0400 |
commit | f3f121359caa069cefbc48008e94bcd862ca21e2 (patch) | |
tree | bfa8bbdf065bb5f0886935a8006f1ecfc43d02dc /net/ipv6/tcp_ipv6.c | |
parent | 598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0 (diff) |
ipv6: tcp: clean up tcp_v6_early_demux() icsk variable
Remove an icsk variable, which by convention should refer to an
inet_connection_sock rather than an inet_sock. In the process, make
the tcp_v6_early_demux() code and formatting a bit more like
tcp_v4_early_demux(), to ease comparisons and maintenance.
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 26175bffbaa..bb6782e8499 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1741,11 +1741,11 @@ static void tcp_v6_early_demux(struct sk_buff *skb) | |||
1741 | skb->destructor = sock_edemux; | 1741 | skb->destructor = sock_edemux; |
1742 | if (sk->sk_state != TCP_TIME_WAIT) { | 1742 | if (sk->sk_state != TCP_TIME_WAIT) { |
1743 | struct dst_entry *dst = sk->sk_rx_dst; | 1743 | struct dst_entry *dst = sk->sk_rx_dst; |
1744 | struct inet_sock *icsk = inet_sk(sk); | 1744 | |
1745 | if (dst) | 1745 | if (dst) |
1746 | dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie); | 1746 | dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie); |
1747 | if (dst && | 1747 | if (dst && |
1748 | icsk->rx_dst_ifindex == skb->skb_iif) | 1748 | inet_sk(sk)->rx_dst_ifindex == skb->skb_iif) |
1749 | skb_dst_set_noref(skb, dst); | 1749 | skb_dst_set_noref(skb, dst); |
1750 | } | 1750 | } |
1751 | } | 1751 | } |