Re: [Netnice-kernels] Linux Kernel

[Scott B. <sco...@ve...>]

On Sat, 9 Oct 2004, kartikey bhatt wrote:

> Hi Scott,
> What do you think about the status?
> Would you send me the changes that
> you have made?
> 
> Regards,
> --kartikey
> 

Hi Kartikey,

The kernel is working ok after I disabled vif_fork and the ip_output
routines.  I simply changed CONFIG_NETNICE to CONFIG_NETNICE_X, there
is a diff appended to this note for your info.  I have submitted your
patch and the start of the NNFS api to the netnice267 branch.  You can
get it by doing:

 $ cvs co -r netnice267 Linux


Regards,

Scott B



diff --exclude=CVS -aur linux-org/kernel/fork.c Linux.latest/kernel/fork.c
--- linux-org/kernel/fork.c	2004-10-08 14:56:32.117452113 -0700
+++ Linux.latest/kernel/fork.c	2004-10-08 13:56:18.000000000 -0700
@@ -1232,7 +1232,7 @@
 
 			put_cpu();
 		}
-#ifdef CONFIG_NETNICE
+#ifdef CONFIG_NETNICE_X
 		//printk (KERN_CRIT "Calling vif_fork\n");
 		vif_fork (current, p);
 #endif
diff --exclude=CVS -aur linux-org/Makefile Linux.latest/Makefile
--- linux-org/Makefile	2004-06-15 22:19:37.000000000 -0700
+++ Linux.latest/Makefile	2004-10-08 13:56:18.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 7
-EXTRAVERSION =
+EXTRAVERSION = -nnice
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*
Only in linux-org/net/core: output
diff --exclude=CVS -aur linux-org/net/core/vif_subr.c Linux.latest/net/core/vif_subr.c
--- linux-org/net/core/vif_subr.c	2004-10-08 14:56:32.122450682 -0700
+++ Linux.latest/net/core/vif_subr.c	2004-10-08 14:35:20.000000000 -0700
@@ -84,6 +84,8 @@
 {
 	struct vifnet *vif;
 
+	printk("register_vif %s\n",dev->name);
+
 	/* range check */
 	if (!dev || dev->ifindex >= MAX_INTERFACE)
 		return;
@@ -660,6 +662,8 @@
 	printk (KERN_INFO "Netnice for linux initialized");
 }
 
+EXPORT_SYMBOL(vif_alloc);
+EXPORT_SYMBOL(vifnet);
 EXPORT_SYMBOL(vif_fork);
 EXPORT_SYMBOL(vif_exit);
 EXPORT_SYMBOL(vif_init);
diff --exclude=CVS -aur linux-org/net/ipv4/ip_output.c Linux.latest/net/ipv4/ip_output.c
--- linux-org/net/ipv4/ip_output.c	2004-10-08 14:56:32.124450110 -0700
+++ Linux.latest/net/ipv4/ip_output.c	2004-10-08 13:56:38.000000000 -0700
@@ -224,7 +224,7 @@
 
 	skb->dev = dev;
 
-#ifdef CONFIG_NETNICE
+#ifdef CONFIG_NETNICE_X
 	skb->skb_pvif = so->so_vifnet;
 	skb->protocol = htons(ETH_P_IP);
 	return NF_HOOK(PF_INET, NF_IP_POST_ROUTING, skb, NULL, dev,
@@ -1331,7 +1331,7 @@
 
 static struct packet_type ip_packet_type = {
 	.type = __constant_htons(ETH_P_IP),
-#ifdef CONFIG_NETNICE
+#ifdef CONFIG_NETNICE_X
 	.func = vif_rcv,
 #else
 	.func = ip_rcv,