]> git.pld-linux.org Git - packages/kernel.git/commitdiff
- fix vserver patch auto/th/kernel-4.1-4.1.42-1
authorJan Rękorajski <baggins@pld-linux.org>
Sat, 15 Jul 2017 03:22:11 +0000 (12:22 +0900)
committerJan Rękorajski <baggins@pld-linux.org>
Sat, 15 Jul 2017 03:22:11 +0000 (12:22 +0900)
kernel-vserver-2.3.patch

index b28fac38b1c005dbdfcb869e9cbd11d54f8ca0b9..b695f56f7f7646c802c08ec93d2ba03d1f18f226 100644 (file)
@@ -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;
This page took 1.223369 seconds and 4 git commands to generate.