summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'vserver-sources/2.1.1_rc21-r3/4413_vs2.1.1-rc21-proc-clean01.patch')
-rw-r--r--vserver-sources/2.1.1_rc21-r3/4413_vs2.1.1-rc21-proc-clean01.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/vserver-sources/2.1.1_rc21-r3/4413_vs2.1.1-rc21-proc-clean01.patch b/vserver-sources/2.1.1_rc21-r3/4413_vs2.1.1-rc21-proc-clean01.patch
new file mode 100644
index 0000000..4eb8d46
--- /dev/null
+++ b/vserver-sources/2.1.1_rc21-r3/4413_vs2.1.1-rc21-proc-clean01.patch
@@ -0,0 +1,25 @@
+diff -NurpP --minimal linux-2.6.16.17-vs2.1.1-rc21/kernel/vserver/proc.c linux-2.6.16.17-vs2.1.1-rc21.1/kernel/vserver/proc.c
+--- linux-2.6.16.17-vs2.1.1-rc21/kernel/vserver/proc.c 2006-04-29 02:58:07 +0200
++++ linux-2.6.16.17-vs2.1.1-rc21.1/kernel/vserver/proc.c 2006-05-27 19:15:19 +0200
+@@ -203,9 +203,6 @@ static int proc_vnet_info(int vid, char
+ );
+ }
+
+-#define atoquad(a) \
+- (((a)>>0) & 0xff), (((a)>>8) & 0xff), \
+- (((a)>>16) & 0xff), (((a)>>24) & 0xff)
+
+ int proc_nid_info (int vid, char *buffer)
+ {
+@@ -223,9 +220,8 @@ int proc_nid_info (int vid, char *buffer
+ );
+ for (i=0; i<nxi->nbipv4; i++) {
+ length += sprintf(buffer + length,
+- "%d:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i,
+- atoquad(nxi->ipv4[i]),
+- atoquad(nxi->mask[i]));
++ "%d:\t" NIPQUAD_FMT "/" NIPQUAD_FMT "\n", i,
++ NIPQUAD(nxi->ipv4[i]), NIPQUAD(nxi->mask[i]));
+ }
+ put_nx_info(nxi);
+ return length;