commit a3ebd81f4d764d5a7673218e6b714e871fa6d904
Author: Jan Rękorajski <[email protected]>
Date: Sat Jan 25 19:17:12 2014 +0100
- updated to 3.4.77
kernel-vserver-2.3.patch | 28 ++++++++++++++--------------
kernel.spec | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c2f8f87..4e17627 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -91,7 +91,7 @@
%define rel 1
%define basever 3.4
-%define postver .76
+%define postver .77
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in
rpm.macros)
@@ -138,7 +138,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 967f72983655e2479f951195953e8480
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: b8281491b0c793bd1d49c555dc52397a
+# Patch0-md5: 4adc2247755eac17d8280950826c29f1
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 36b54a3..d687a87 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -24664,10 +24664,10 @@ diff -NurpP --minimal
linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n
#include <linux/inet_diag.h>
#include <linux/sock_diag.h>
-@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+@@ -112,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
- r->id.idiag_sport = inet->inet_sport;
- r->id.idiag_dport = inet->inet_dport;
- r->id.idiag_src[0] = inet->inet_rcv_saddr;
- r->id.idiag_dst[0] = inet->inet_daddr;
+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info,
@@ -24675,19 +24675,19 @@ diff -NurpP --minimal
linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n
+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
+ inet->inet_daddr);
- /* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
- * hence this needs to be included regardless of socket family.
-@@ -231,8 +235,8 @@ static int inet_twsk_diag_fill(struct in
- sock_diag_save_cookie(tw, r->id.idiag_cookie);
- r->id.idiag_sport = tw->tw_sport;
- r->id.idiag_dport = tw->tw_dport;
+ if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown))
+ goto errout;
+@@ -256,8 +258,8 @@ static int inet_twsk_diag_fill(struct in
+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
+
- r->id.idiag_src[0] = tw->tw_rcv_saddr;
- r->id.idiag_dst[0] = tw->tw_daddr;
+ r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info,
tw->tw_rcv_saddr);
+ r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
+
r->idiag_state = tw->tw_substate;
r->idiag_timer = 3;
- r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_
err = -EINVAL;
@@ -24719,17 +24719,17 @@ diff -NurpP --minimal
linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n
entry.saddr = &tw->tw_rcv_saddr;
entry.daddr = &tw->tw_daddr;
}
-@@ -714,8 +722,8 @@ static int inet_diag_fill_req(struct sk_
+@@ -753,8 +755,8 @@ static int inet_diag_fill_req(struct sk_
+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
- r->id.idiag_sport = inet->inet_sport;
- r->id.idiag_dport = ireq->rmt_port;
- r->id.idiag_src[0] = ireq->loc_addr;
- r->id.idiag_dst[0] = ireq->rmt_addr;
+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr);
+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr);
+
r->idiag_expires = jiffies_to_msecs(tmo);
r->idiag_rqueue = 0;
- r->idiag_wqueue = 0;
@@ -784,6 +792,7 @@ static int inet_diag_dump_reqs(struct sk
continue;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a3ebd81f4d764d5a7673218e6b714e871fa6d904
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
