Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1520546

[PATCH 4.4 04/34] tcp: fix a compile error in DBGUNDO()

Show all headers | View raw

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Dumazet <edumazet@google.com>


[ Upstream commit 019b1c9fe32a2a32c1153e31375f87ec3e591273 ]

If DBGUNDO() is enabled (FASTRETRANS_DEBUG > 1), a compile
error will happen, since inet6_sk(sk)->daddr became sk->sk_v6_daddr

Fixes: efe4208f47f9 ("ipv6: make lookups simpler and faster")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/tcp_input.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2324,10 +2324,9 @@ static void DBGUNDO(struct sock *sk, con
 	}
 #if IS_ENABLED(CONFIG_IPV6)
 	else if (sk->sk_family == AF_INET6) {
-		struct ipv6_pinfo *np = inet6_sk(sk);
 		pr_debug("Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n",
 			 msg,
-			 &np->daddr, ntohs(inet->inet_dport),
+			 &sk->sk_v6_daddr, ntohs(inet->inet_dport),
 			 tp->snd_cwnd, tcp_left_out(tp),
 			 tp->snd_ssthresh, tp->prior_ssthresh,
 			 tp->packets_out);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 4.4 00/34] 4.4.32-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 15/34] ip6_tunnel: fix ip6_tnl_lookup Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 04/34] tcp: fix a compile error in DBGUNDO() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 07/34] tg3: Avoid NULL pointer dereference in tg3_io_error_detected() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 21/34] ipv4: disable BH in set_ping_group_range() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 32/34] drm/amdgpu: fix DP mode validation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 10/34] net/sched: act_vlan: Push skb->data to mac_header prior calling skb_vlan_*() functions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
    Re: [PATCH 4.4 10/34] net/sched: act_vlan: Push skb->data to  mac_header prior calling skb_vlan_*() functions Shmulik Ladkani <shmulik.ladkani@gmail.com> - 2016-11-14 08:10 +0100
  [PATCH 4.4 26/34] sctp: validate chunk len before actually using it Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 03/34] tcp: fix wrong checksum calculation on MTU probing Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:30 +0100
  [PATCH 4.4 12/34] packet: call fanout_release, while UNREGISTERING a netdev Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:40 +0100
  [PATCH 4.4 11/34] net: Add netdev all_adj_list refcnt propagation to fix panic Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:40 +0100
  [PATCH 4.4 17/34] net: pktgen: remove rcu locking in pktgen_change_name() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-13 12:40 +0100
  Re: [PATCH 4.4 00/34] 4.4.32-stable review Guenter Roeck <linux@roeck-us.net> - 2016-11-13 21:50 +0100
  Re: [PATCH 4.4 00/34] 4.4.32-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-14 09:00 +0100
  Re: [PATCH 4.4 00/34] 4.4.32-stable review Shuah Khan <shuah.kh@samsung.com> - 2016-11-14 17:50 +0100

csiph-web