From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 15 Jul 2017 03:22:11 +0000 (+0900)
Subject: - fix vserver patch
X-Git-Tag: auto/th/kernel-4.1-4.1.42-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6be935203ddb713cadde7a55c503eb67aa793da9;p=packages%2Fkernel.git

- fix vserver patch
---

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b28fac38..b695f56f 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -24679,11 +24679,13 @@ diff -NurpP --minimal linux-4.1.41/net/ipv6/tcp_ipv6.c linux-4.1.41-vs2.3.8.5.3/
  
  static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
  static void	tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -151,7 +152,10 @@ static int tcp_v6_connect(struct sock *s
+@@ -151,7 +152,12 @@ static int tcp_v6_connect(struct sock *s
  	 */
  
  	if (ipv6_addr_any(&usin->sin6_addr)) {
 -		if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
++		struct nx_info *nxi =  sk->sk_nx_info;
++
 +		if (nxi && nx_info_has_v6(nxi))
 +			/* FIXME: remap lback? */
 +			usin->sin6_addr = nxi->v6.ip;