Re: Linux 2.4.20-pre1

[J.A. Magallon]

On 2002.08.06 Marcelo Tosatti wrote:
>
>So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
>stuff.
>

Something is missing in the network merge:

werewolf:/usr/src/linux# grep -r netif_receive_skb *
drivers/net/tg3.c:                      netif_receive_skb(skb);
Binary file drivers/net/e1000/e1000_main.o matches
Binary file drivers/net/e1000/e1000.o matches
include/linux/if_vlan.h:        //return (polling ? netif_receive_skb(skb) : netif_rx(skb));

So I had to:

--- linux/include/linux/if_vlan.h.orig	2002-08-07 02:57:36.000000000 +0200
+++ linux/include/linux/if_vlan.h	2002-08-07 02:58:07.000000000 +0200
@@ -183,7 +183,8 @@
 		break;
 	};
 
-	return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+	//return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+	return netif_rx(skb);
 }
 
 static inline int vlan_hwaccel_rx(struct sk_buff *skb,

To make e1000 build. But tg3 uses n_r_skb directly, so it is not useful for
that.

-- 
J.A. Magallon             \   Software is like sex: It's better when it's free
mailto:[e-mail]  \                    -- Linus Torvalds, FSF T-shirt
Linux werewolf 2.4.19-jam0, Mandrake Linux 9.0 (Cooker) for i586
gcc (GCC) 3.2 (Mandrake Linux 9.0 3.2-0.2mdk)