---

yaml --- r: 34405 b: refs/heads/master c: 446fda4 h: refs/heads/master i: 34403: ef73b0b v: v3
git-mirror · Sep 22, 2006 · 33937e8 · 33937e8
1 parent 7b8f23f
commit 33937e8
Show file tree

Hide file tree

Showing 5 changed files with 1,648 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11a03f78fbf15a866ba3bf6359a75cdfd1ced703
+refs/heads/master: 446fda4f26822b2d42ab3396aafcedf38a9ff2b6
diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h
@@ -411,6 +411,10 @@ enum
 	NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
 	NET_TCP_DMA_COPYBREAK=116,
 	NET_TCP_SLOW_START_AFTER_IDLE=117,
+	NET_CIPSOV4_CACHE_ENABLE=118,
+	NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
+	NET_CIPSOV4_RBM_OPTFMT=120,
+	NET_CIPSOV4_RBM_STRICTVALID=121,
 };
 
 enum {

diff --git a/trunk/net/ipv4/Makefile b/trunk/net/ipv4/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
 obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o
 obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
 obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
+obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
 
 obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
 		      xfrm4_output.o