[netfilter-cvslog] r6374 - in trunk/nfsim/kernelenv: . include

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-01-08 19:31:09 +0100 (Sun, 08 Jan 2006)
New Revision: 6374

Modified:
   trunk/nfsim/kernelenv/include/kernelenv.h
   trunk/nfsim/kernelenv/kernelenv.c
Log:
add raw_smp_processor_id() and dst_metric()


Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2006-01-07 22:45:54 UTC (rev 6373)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2006-01-08 18:31:09 UTC (rev 6374)
@@ -204,6 +204,7 @@
 #define cpu_possible(cpu)	((cpu) == 0)
 #endif
 #define smp_processor_id()	0
+#define raw_smp_processor_id()	smp_processor_id()
 #define highest_possible_processor_id()	0
 #define PAGE_SHIFT      12
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
@@ -1115,6 +1116,7 @@
 };
 
 u32 dst_path_metric(struct dst_entry *dst, int metric);
+u32 dst_metric(struct dst_entry *dst, int metric);
 u32 dst_pmtu(struct dst_entry *dst);
 /* 2.6.12 changes dst_pmtu to dst_mtu... */
 #define dst_mtu dst_pmtu

Modified: trunk/nfsim/kernelenv/kernelenv.c
===================================================================
--- trunk/nfsim/kernelenv/kernelenv.c	2006-01-07 22:45:54 UTC (rev 6373)
+++ trunk/nfsim/kernelenv/kernelenv.c	2006-01-08 18:31:09 UTC (rev 6374)
@@ -637,6 +637,11 @@
 	return mtu;
 }
 
+u32 dst_metric(struct dst_entry *dst, int metric)
+{
+	return dst_path_metric(dst, metric);
+}
+
 int dst_output(struct sk_buff *skb)
 {
 	assert(skb);