[packages/kernel/LINUX_4_1] - fix vserver patch

baggins baggins at pld-linux.org
Sat Jul 15 05:22:36 CEST 2017


commit 6be935203ddb713cadde7a55c503eb67aa793da9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 15 12:22:11 2017 +0900

    - fix vserver patch

 kernel-vserver-2.3.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6be935203ddb713cadde7a55c503eb67aa793da9



More information about the pld-cvs-commit mailing list