* [PATCH net-next] ipv6: tcp: clean up tcp_v6_early_demux() icsk variable
@ 2012-10-23 7:41 Eric Dumazet
2012-10-23 12:56 ` Neal Cardwell
2012-10-23 17:03 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2012-10-23 7:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Neal Cardwell
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(-)
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);
}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] ipv6: tcp: clean up tcp_v6_early_demux() icsk variable
2012-10-23 7:41 [PATCH net-next] ipv6: tcp: clean up tcp_v6_early_demux() icsk variable Eric Dumazet
@ 2012-10-23 12:56 ` Neal Cardwell
2012-10-23 17:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Neal Cardwell @ 2012-10-23 12:56 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, netdev
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ipv6: tcp: clean up tcp_v6_early_demux() icsk variable
2012-10-23 7:41 [PATCH net-next] ipv6: tcp: clean up tcp_v6_early_demux() icsk variable Eric Dumazet
2012-10-23 12:56 ` Neal Cardwell
@ 2012-10-23 17:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2012-10-23 17:03 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, ncardwell
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-23 17:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-23 7:41 [PATCH net-next] ipv6: tcp: clean up tcp_v6_early_demux() icsk variable Eric Dumazet
2012-10-23 12:56 ` Neal Cardwell
2012-10-23 17:03 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).