[Netnice-commitlog] netnice : linux-netnice/net/core dev.c,1.1.1.1,1.1.1.1.2.1 skbuff.c,1.1.1.1,1.1.1.1.2.1

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

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

Modified Files:
      Tag: patch1
	dev.c skbuff.c 
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: skbuff.c
===================================================================
RCS file: /cvsroot/netnice/linux-netnice/net/core/skbuff.c,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.c	16 Feb 2006 11:06:54 -0000	1.1.1.1
+++ skbuff.c	16 Feb 2006 13:11:50 -0000	1.1.1.1.2.1
@@ -443,6 +443,9 @@
 #endif
 
 #endif
+#ifdef CONFIG_NETNICE
+	C(skb_pkt);
+#endif
 	C(truesize);
 	atomic_set(&n->users, 1);
 	C(head);
@@ -503,6 +506,9 @@
 #endif
 	new->tc_index	= old->tc_index;
 #endif
+#ifdef CONFIG_NETNICE
+	new->skb_pkt = old->skb_pkt;
+#endif
 	atomic_set(&new->users, 1);
 	skb_shinfo(new)->tso_size = skb_shinfo(old)->tso_size;
 	skb_shinfo(new)->tso_segs = skb_shinfo(old)->tso_segs;

Index: dev.c
===================================================================
RCS file: /cvsroot/netnice/linux-netnice/net/core/dev.c,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
--- dev.c	16 Feb 2006 11:06:53 -0000	1.1.1.1
+++ dev.c	16 Feb 2006 13:11:50 -0000	1.1.1.1.2.1
@@ -114,6 +114,9 @@
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
 #include <asm/current.h>
+#ifdef CONFIG_NETNICE
+#include <linux/vif.h>
+#endif
 
 /*
  *	The list of packet types we will receive (as opposed to discard)
@@ -2617,7 +2620,7 @@
  *	number.  The caller must hold the rtnl semaphore or the
  *	dev_base_lock to be sure it remains unique.
  */
-static int dev_new_index(void)
+int dev_new_index(void)
 {
 	static int ifindex;
 	for (;;) {
@@ -2759,6 +2762,10 @@
 	 */
 
 	set_bit(__LINK_STATE_PRESENT, &dev->state);
+	
+#ifdef CONFIG_NETNICE
+	register_vif(dev);
+#endif
 
 	dev->next = NULL;
 	dev_init_scheduler(dev);
@@ -3098,6 +3105,10 @@
 
 	dev->reg_state = NETREG_UNREGISTERING;
 
+#ifdef CONFIG_NETNICE
+	unregister_vif(dev);
+#endif
+	
 	synchronize_net();
 
 	/* Shutdown queueing discipline. */