* [PATCH] net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1
@ 2010-05-31 18:20 Joe Perches
2010-05-31 21:32 ` Eric Dumazet
2010-06-01 6:48 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Joe Perches @ 2010-05-31 18:20 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Eric Dumazet
Commit: c720c7e8383aff1cb219bddf474ed89d850336e3 missed these.
Signed-off-by: Joe Perches <joe@perches.com>
---
net/ipv4/tcp_input.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 3e6dafc..548d575 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2639,7 +2639,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)
if (sk->sk_family == AF_INET) {
printk(KERN_DEBUG "Undo %s %pI4/%u c%u l%u ss%u/%u p%u\n",
msg,
- &inet->daddr, ntohs(inet->dport),
+ &inet->inet_daddr, ntohs(inet->inet_dport),
tp->snd_cwnd, tcp_left_out(tp),
tp->snd_ssthresh, tp->prior_ssthresh,
tp->packets_out);
@@ -2649,7 +2649,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)
struct ipv6_pinfo *np = inet6_sk(sk);
printk(KERN_DEBUG "Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n",
msg,
- &np->daddr, ntohs(inet->dport),
+ &np->daddr, ntohs(inet->inet_dport),
tp->snd_cwnd, tcp_left_out(tp),
tp->snd_ssthresh, tp->prior_ssthresh,
tp->packets_out);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1
2010-05-31 18:20 [PATCH] net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 Joe Perches
@ 2010-05-31 21:32 ` Eric Dumazet
2010-06-01 6:48 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2010-05-31 21:32 UTC (permalink / raw)
To: Joe Perches; +Cc: David S. Miller, netdev
Le lundi 31 mai 2010 à 11:20 -0700, Joe Perches a écrit :
> Commit: c720c7e8383aff1cb219bddf474ed89d850336e3 missed these.
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
> net/ipv4/tcp_input.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index 3e6dafc..548d575 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -2639,7 +2639,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)
> if (sk->sk_family == AF_INET) {
> printk(KERN_DEBUG "Undo %s %pI4/%u c%u l%u ss%u/%u p%u\n",
> msg,
> - &inet->daddr, ntohs(inet->dport),
> + &inet->inet_daddr, ntohs(inet->inet_dport),
> tp->snd_cwnd, tcp_left_out(tp),
> tp->snd_ssthresh, tp->prior_ssthresh,
> tp->packets_out);
> @@ -2649,7 +2649,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)
> struct ipv6_pinfo *np = inet6_sk(sk);
> printk(KERN_DEBUG "Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n",
> msg,
> - &np->daddr, ntohs(inet->dport),
> + &np->daddr, ntohs(inet->inet_dport),
> tp->snd_cwnd, tcp_left_out(tp),
> tp->snd_ssthresh, tp->prior_ssthresh,
> tp->packets_out);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1
2010-05-31 18:20 [PATCH] net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 Joe Perches
2010-05-31 21:32 ` Eric Dumazet
@ 2010-06-01 6:48 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-06-01 6:48 UTC (permalink / raw)
To: joe; +Cc: netdev, eric.dumazet
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 11:20:55 -0700
> Commit: c720c7e8383aff1cb219bddf474ed89d850336e3 missed these.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Applied, thanks Joe.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-01 6:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-31 18:20 [PATCH] net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 Joe Perches
2010-05-31 21:32 ` Eric Dumazet
2010-06-01 6:48 ` 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).