| Message ID | 1350978108.8609.1542.camel@edumazet-glaptop |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Oct 23, 2012 at 3:41 AM, Eric Dumazet <eric.dumazet@gmail.com> wrote: > From: Neal Cardwell <ncardwell@google.com> > > 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> > --- > net/ipv6/tcp_ipv6.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Thanks, Eric! neal -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Tue, 23 Oct 2012 09:41:48 +0200 > From: Neal Cardwell <ncardwell@google.com> > > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 26175bf..bb6782e 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) skb->destructor = sock_edemux; if (sk->sk_state != TCP_TIME_WAIT) { struct dst_entry *dst = sk->sk_rx_dst; - struct inet_sock *icsk = inet_sk(sk); + if (dst) dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie); if (dst && - icsk->rx_dst_ifindex == skb->skb_iif) + inet_sk(sk)->rx_dst_ifindex == skb->skb_iif) skb_dst_set_noref(skb, dst); } }