X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=9a3f03f69ab1827e431e6c1d5dd8b6d05c98bf5a;hp=d75a65bf6ddcfa16af72cc94d7b2b4161f4b62e2;hb=d3c228e4ed5faa860ae47f22892f829929141a82;hpb=9f1441d79bc165b646060676ccf680e82421aedd

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index d75a65bf6d..9a3f03f69a 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -14,9 +14,9 @@ define KernelPackage/atm
   DESCRIPTION:= \
     Kernel modules for ATM support
   FILES:= \
-    $(MODULES_DIR)/kernel/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
-    $(MODULES_DIR)/kernel/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_ATM)
+    $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_ATM
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,30,atm br2684)
 endef
@@ -27,32 +27,43 @@ define KernelPackage/atmtcp
   DESCRIPTION:= \
     Kernel module for ATM over TCP support
   DEPENDS:=@LINUX_2_6 kmod-atm
-  FILES:=$(MODULES_DIR)/kernel/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_ATM_TCP)
+  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_ATM_TCP
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef
 $(eval $(call KernelPackage,atmtcp))
 
+define KernelPackage/bonding
+  TITLE:=Ethernet bonding driver
+  DESCRIPTION:= \
+    Kernel module for NIC bonding.
+  DEPENDS:=@LINUX_2_6_X86
+  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_BONDING
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,40,bonding)
+endef
+$(eval $(call KernelPackage,bonding))
 
 define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
-  	Kernel modules for IP in IP encapsulation
-  KCONFIG:=$(CONFIG_NET_IPIP)
+	Kernel modules for IP in IP encapsulation
+  KCONFIG:=CONFIG_NET_IPIP
   SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,ipip))
 
 define KernelPackage/ipip/2.4
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip)
 endef
 
 define KernelPackage/ipip/2.6
   FILES:= \
-	$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
 endef
 
@@ -66,10 +77,10 @@ define KernelPackage/ipsec
 	- xfrm_user
   SUBMENU:=$(NSMENU)
   DEPENDS:=@LINUX_2_6
-  KCONFIG:=$(CONFIG_NET_KEY)
+  KCONFIG:=CONFIG_NET_KEY
   FILES:= \
-	$(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,ipsec))
 
@@ -83,10 +94,10 @@ define KernelPackage/ipsec4
 	- ipcomp\\\
 	- xfrm4_tunnel
   SUBMENU:=$(NSMENU)
-  KCONFIG:=$(CONFIG_INET_AH)
+  KCONFIG:=CONFIG_INET_AH
   DEPENDS:=kmod-ipsec
   FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
-	$(MODULES_DIR)/kernel/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
   )
 endef
 $(eval $(call KernelPackage,ipsec4))
@@ -99,12 +110,13 @@ define KernelPackage/ipsec6
 	- ah6\\\
 	- esp6\\\
 	- ipcomp6\\\
-	- xfrm6_tunnel
+	- xfrm6_tunnel\\\
+	- tunnel6
   SUBMENU:=$(NSMENU)
-  KCONFIG:=$(CONFIG_INET6_AH)
+  KCONFIG:=CONFIG_INET6_AH
   DEPENDS:=kmod-ipsec
-  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \
-	$(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) \
+  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel tunnel6, \
+	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
   )
 endef
 $(eval $(call KernelPackage,ipsec6))
@@ -114,9 +126,17 @@ define KernelPackage/ipv6
   TITLE:=IPv6 support
   DESCRIPTION:=\
 	Kernel modules for IPv6 support
-  KCONFIG:=$(CONFIG_IPV6)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_IPV6
   SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,20,ipv6)
+endef
+define KernelPackage/ipv6/2.4
+  FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+endef
+define KernelPackage/ipv6/2.6
+  FILES:= \
+	$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,ipv6))
 
@@ -125,8 +145,8 @@ define KernelPackage/gre
   TITLE:=GRE support
   DESCRIPTION:=\
 	Generic Routing Encapsulation support
-  KCONFIG=$(CONFIG_NET_IPGRE)
-  FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_NET_IPGRE
+  FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,gre))
@@ -136,8 +156,8 @@ define KernelPackage/tun
   TITLE:=Universal TUN/TAP driver
   DESCRIPTION:=\
 	Kernel support for the TUN/TAP tunneling device
-  KCONFIG:=$(CONFIG_TUN)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_TUN
+  FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,30,tun)
 endef
@@ -148,24 +168,24 @@ define KernelPackage/ppp
   TITLE:=PPP modules
   DESCRIPTION:=\
 	Kernel modules for PPP support
-  KCONFIG:=$(CONFIG_PPP)
+  KCONFIG:=CONFIG_PPP
   SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/ppp/2.6
   FILES:= \
-  	$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \
-	$(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
-	$(MODULES_DIR)/kernel/drivers/net/slhc.ko \
-	$(MODULES_DIR)/kernel/lib/crc-ccitt.ko
+	$(LINUX_DIR)/drivers/net/ppp_async.ko \
+	$(LINUX_DIR)/drivers/net/ppp_generic.ko \
+	$(LINUX_DIR)/drivers/net/slhc.ko \
+	$(LINUX_DIR)/lib/crc-ccitt.ko
   AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
 endef
 
 define KernelPackage/ppp/2.4
   FILES:= \
-  	$(MODULES_DIR)/kernel/drivers/net/ppp_async.o \
-	$(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
-	$(MODULES_DIR)/kernel/drivers/net/slhc.o
+	$(LINUX_DIR)/drivers/net/ppp_async.o \
+	$(LINUX_DIR)/drivers/net/ppp_generic.o \
+	$(LINUX_DIR)/drivers/net/slhc.o
   AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
 endef
 $(eval $(call KernelPackage,ppp))
@@ -176,10 +196,10 @@ define KernelPackage/pppoe
   DESCRIPTION:=\
 	Kernel modules for PPPoE (PPP over Ethernet) support
   DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPPOE)
+  KCONFIG:=CONFIG_PPPOE
   FILES:= \
-  	$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,pppoe))
@@ -190,8 +210,8 @@ define KernelPackage/pppoa
   DESCRIPTION:=\
 	Kernel modules for PPPoA (PPP over ATM) support
   DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPPOATM)
-  FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_PPPOATM
+  FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)
   SUBMENU:=$(NSMENU)
 endef
@@ -202,16 +222,18 @@ define KernelPackage/mppe
   TITLE:=Microsoft PPP compression/encryption
   DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
   DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPP_MPPE)
+  KCONFIG:=CONFIG_PPP_MPPE_MPPC CONFIG_PPP_MPPE
   SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/mppe/2.4
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
 endef
 
 define KernelPackage/mppe/2.6
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
 $(eval $(call KernelPackage,mppe))
 
@@ -220,7 +242,7 @@ define KernelPackage/sched
   TITLE:=Traffic schedulers
   DESCRIPTION:=\
 	Kernel schedulers for IP traffic
-  FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,sched))
@@ -231,15 +253,29 @@ define KernelPackage/ax25
   TITLE:=AX25 support
   DESCRIPTION:=Kernel modules for AX25 support
   SUBMENU:=$(NSMENU)
-  KCONFIG:=$(CONFIG_AX25)
+  KCONFIG:=CONFIG_AX25
   FILES:= \
-	$(MODULES_DIR)/kernel/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
 endef
 $(eval $(call KernelPackage,ax25))
 
 
+define KernelPackage/mp-alg
+  TITLE:=ECMP caching algorithms
+  DESCRIPTION:= \
+	Kernel modules that provide several different algorithms for multipath \\\
+	route selection from the route cache. The iproute "mpath" argument allows \\\
+	specifying which algorithm to use for routes. \\\
+	quagga (at least <=0.99.6) requires a multipath patch to support this \\\
+	cached mp route feature.
+  SUBMENU:=$(NSMENU)
+  KCONFIG:=CONFIG_IP_ROUTE_MULTIPATH_RR CONFIG_IP_ROUTE_MULTIPATH_RANDOM CONFIG_IP_ROUTE_MULTIPATH_WRANDOM CONFIG_IP_ROUTE_MULTIPATH_DRR
+  FILES:=$(LINUX_DIR)/net/ipv4/multipath_*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
+endef
+$(eval $(call KernelPackage,mp-alg))
 
 
 NDMENU:=Network Devices
@@ -249,10 +285,9 @@ define KernelPackage/natsemi
   DESCRIPTION:=\
 	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
 	adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_NATSEMI)
+  FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_NATSEMI
   DEPENDS:=@LINUX_2_6_X86
-  DEFAULT:=y
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
@@ -262,8 +297,8 @@ define KernelPackage/sis900
   TITLE:=SiS 900 Ethernet support
   DESCRIPTION:=\
 	Kernel modules for Sis 900 Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_SIS900)
+  FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_SIS900
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,sis900)
@@ -274,20 +309,32 @@ define KernelPackage/via-rhine
   TITLE:=Via Rhine ethernet support
   DESCRIPTION:=\
 	Kernel modules for Via Rhine Ethernet chipsets.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_VIA_RHINE)
+  FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_VIA_RHINE
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
 $(eval $(call KernelPackage,via-rhine))
 
+define KernelPackage/via-velocity
+  TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
+  DESCRIPTION:=\
+	Kernel modules for VIA Velocity Gigabit Ethernet chipsets.
+  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_VIA_VELOCITY
+  DEPENDS:=@LINUX_2_6_IXP4XX
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,via-velocity)
+endef
+$(eval $(call KernelPackage,via-velocity))
+
 define KernelPackage/8139too
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DESCRIPTION:=\
 	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_8139TOO)
+  FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_8139TOO
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,8139too)
@@ -298,22 +345,35 @@ define KernelPackage/r8169
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
   DESCRIPTION:=\
 	Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_R8169)
+  FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
   DEPENDS:=@LINUX_2_6_X86 
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,r8169)
 endef
 $(eval $(call KernelPackage,r8169))
 
+define KernelPackage/ne2k-pci
+  TITLE:=ne2k-pci Ethernet Adapter kernel support
+  DESCRIPTION:=\
+	ne2k-pci Ethernet Adapter kernel support.
+  FILES:=$(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_NE2K_PCI
+  DEPENDS:=@LINUX_2_6_X86
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
+endef
+$(eval $(call KernelPackage,ne2k-pci))
+
 define KernelPackage/ixp4xx-npe
   TITLE:=Intel(R) IXP4xx ethernet support
   DESCRIPTION:=\
 	Kernel modules for Intel(R) IXP4xx onboard ethernet.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_qmgr.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_mac.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_IXP4XX_MAC)
+  FILES:=$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_qmgr.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_mac.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_IXP4XX_MAC
   DEPENDS:=@LINUX_2_6_IXP4XX
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,ixp4xx_npe ixp4xx_qmgr ixp4xx_mac)
@@ -324,8 +384,8 @@ define KernelPackage/e100
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DESCRIPTION:=\
 	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_E100)
+  FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_E100
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,e100)
@@ -336,10 +396,11 @@ define KernelPackage/e1000
   TITLE:=Intel(R) PRO/1000 cards kernel support
   DESCRIPTION:=\
 	Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_E1000)
+  FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_E1000
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,e1000)
 endef
 $(eval $(call KernelPackage,e1000))
 
@@ -353,8 +414,8 @@ define KernelPackage/3c59x
 	- "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \\\
 	- "Tornado"   (3c905)                                  PCI  \\\
 	- "Hurricane" (3c555/3cSOHO)                           PCI 
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_3C59X)
+  FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_3C59X
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,3c59x)