1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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;
|
GitWeb
