| Message ID | 1275330055.14079.8.camel@Joe-Laptop.home |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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); > > -- 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: 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. -- 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/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);
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(-) -- 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