--- linux-2.6.22.6-vs2.3.0.20.1/include/linux/vserver/base.h	2007-08-12 00:29:47 +0200
+++ linux-2.6.22.6-vs2.3.0.20.2.1/include/linux/vserver/base.h	2007-09-17 14:07:30 +0200
@@ -133,12 +133,12 @@ static inline int __vs_check(int cid, in
 
 /* network flags */
 
-#define __nx_flags(v)	((v) ? (v)->nx_flags : 0)
+#define __nx_flags(n)	((n) ? (n)->nx_flags : 0)
 
 #define nx_current_flags()	__nx_flags(current->nx_info)
 
-#define nx_info_flags(v, m, f) \
-	vs_check_flags(__nx_flags(v), m, f)
+#define nx_info_flags(n, m, f) \
+	vs_check_flags(__nx_flags(n), m, f)
 
 #define task_nx_flags(t, m, f) \
 	((t) && nx_info_flags((t)->nx_info, m, f))
@@ -148,11 +148,11 @@ static inline int __vs_check(int cid, in
 
 /* network caps */
 
-#define __nx_ncaps(v)	((v) ? (v)->nx_ncaps : 0)
+#define __nx_ncaps(n)	((n) ? (n)->nx_ncaps : 0)
 
 #define nx_current_ncaps()	__nx_ncaps(current->nx_info)
 
-#define nx_info_ncaps(v, c)	(__nx_ncaps(v) & (c))
+#define nx_info_ncaps(n, c)	(__nx_ncaps(n) & (c))
 
 #define nx_ncaps(c)	nx_info_ncaps(current->nx_info, c)
 
@@ -211,8 +211,8 @@ static inline int __vs_check(int cid, in
 #define vx_info_state(v, m)	(__vx_state(v) & (m))
 
 
-#define __nx_state(v)	((v) ? ((v)->nx_state) : 0)
+#define __nx_state(n)	((n) ? ((n)->nx_state) : 0)
 
-#define nx_info_state(v, m)	(__nx_state(v) & (m))
+#define nx_info_state(n, m)	(__nx_state(n) & (m))
 
 #endif