[Netnice-commitlog] netnice : linux-netnice/include/linux net.h,1.1.1.1,1.1.1.1.2.1 sched.h,1.1.1.1,1.1.1.1.2.1 skbuff.h,1.1.1.1,1.1.1.1.2.1 sysctl.h,1.1.1.1,1.1.1.1.2.1

[bhatt k. m. <rou...@us...>]

Update of /cvsroot/netnice/linux-netnice/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19888/include/linux

Modified Files:
      Tag: patch1
	net.h sched.h skbuff.h sysctl.h 
Log Message:
patch1

initial netnice patch applied to linux kernel version 2.6.15.
developers please do not commit to the main branch directly.
keep it clean.

create separate branches for experimental patches.

the procedure is

cvs co linux-netnice
[hack hack & hack till you are satisfied]
//create a tag
cvs tag -b "tag-name"
cvs update -r "tag-name"
cvs commit

this way you won't end up commiting to the main tree

thanks
--Kartikey BHATT


Index: sysctl.h
===================================================================
RCS file: /cvsroot/netnice/linux-netnice/include/linux/sysctl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- sysctl.h	16 Feb 2006 11:57:44 -0000	1.1.1.1
+++ sysctl.h	16 Feb 2006 13:11:50 -0000	1.1.1.1.2.1
@@ -205,6 +205,7 @@
 	NET_SCTP=17,
 	NET_LLC=18,
 	NET_NETFILTER=19,
+	NET_NETNICE=20,
 };
 
 /* /proc/sys/kernel/random */
@@ -306,6 +307,17 @@
 	NET_NF_CONNTRACK_FRAG6_HIGH_THRESH=31,
 };
 
+/* /proc/sys/net/netnice */
+enum
+{
+	NET_NETNICE_NN_DEBUG=1,
+	NET_NETNICE_BYPASS_IN=2,
+	NET_NETNICE_BYPASS_OUT=3,
+	NET_NETNICE_IF_PROTECT=4,
+	NET_NETNICE_WFQ_QUOTA=5,
+	NET_NETNICE_WFQ_NORMAL=6,
+};
+
 /* /proc/sys/net/ipv4 */
 enum
 {

Index: sched.h
===================================================================
RCS file: /cvsroot/netnice/linux-netnice/include/linux/sched.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- sched.h	16 Feb 2006 11:57:11 -0000	1.1.1.1
+++ sched.h	16 Feb 2006 13:11:50 -0000	1.1.1.1.2.1
@@ -857,6 +857,9 @@
 	int cpuset_mems_generation;
 #endif
 	atomic_t fs_excl;	/* holding fs exclusive resources */
+#ifdef CONFIG_NETNICE
+	caddr_t p_vifnet;
+#endif
 };
 
 static inline pid_t process_group(struct task_struct *tsk)

Index: net.h
===================================================================
RCS file: /cvsroot/netnice/linux-netnice/include/linux/net.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- net.h	16 Feb 2006 11:57:01 -0000	1.1.1.1
+++ net.h	16 Feb 2006 13:11:50 -0000	1.1.1.1.2.1
@@ -113,6 +113,9 @@
 	struct sock		*sk;
 	wait_queue_head_t	wait;
 	short			type;
+#ifdef CONFIG_NETNICE
+	caddr_t			so_vifnet;
+#endif
 };
 
 struct vm_area_struct;

Index: skbuff.h
===================================================================
RCS file: /cvsroot/netnice/linux-netnice/include/linux/skbuff.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- skbuff.h	16 Feb 2006 11:57:23 -0000	1.1.1.1
+++ skbuff.h	16 Feb 2006 13:11:50 -0000	1.1.1.1.2.1
@@ -29,6 +29,9 @@
 #include <linux/net.h>
 #include <linux/textsearch.h>
 #include <net/checksum.h>
+#ifdef CONFIG_NETNICE
+#include <linux/vif.h>
+#endif
 
 #define HAVE_ALLOC_SKB		/* For the drivers to know */
 #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
@@ -286,6 +289,9 @@
 	__u16			tc_verd;	/* traffic control verdict */
 #endif
 #endif
+#ifdef CONFIG_NETNICE
+	struct vif_pkt		skb_pkt;
+#endif
 
 
 	/* These elements must be at the end, see alloc_skb() for details.  */