X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=5fe6c0ea57a07dfc1a85202b7019a745eb84e53c;hb=4c6c987f09c6973bb49aa452aca8332f6e620d12;hp=f3ab2ff700fbe8ae8b142da052d9e06667193275;hpb=87e6a7e4f21ff57ba3ec947614f52967f57a9cbb;p=openwrt%2Fopenwrt.git diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index f3ab2ff700..5fe6c0ea57 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -14,11 +14,11 @@ 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) + $(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) + AUTOLOAD:=$(call AutoLoad,30,atm br2684) endef $(eval $(call KernelPackage,atm)) @@ -27,13 +27,24 @@ 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) + 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 @@ -45,14 +56,14 @@ 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 @@ -68,8 +79,8 @@ define KernelPackage/ipsec DEPENDS:=@LINUX_2_6 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)) @@ -86,7 +97,7 @@ define KernelPackage/ipsec4 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)) @@ -104,7 +115,7 @@ define KernelPackage/ipsec6 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) \ + $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \ ) endef $(eval $(call KernelPackage,ipsec6)) @@ -115,9 +126,16 @@ define KernelPackage/ipv6 DESCRIPTION:=\ Kernel modules for IPv6 support KCONFIG:=$(CONFIG_IPV6) - FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) 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)) @@ -126,7 +144,7 @@ define KernelPackage/gre DESCRIPTION:=\ Generic Routing Encapsulation support KCONFIG=$(CONFIG_NET_IPGRE) - FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) + FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) endef $(eval $(call KernelPackage,gre)) @@ -137,7 +155,7 @@ define KernelPackage/tun DESCRIPTION:=\ Kernel support for the TUN/TAP tunneling device KCONFIG:=$(CONFIG_TUN) - FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) AUTOLOAD:=$(call AutoLoad,30,tun) endef @@ -154,18 +172,19 @@ 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 - AUTOLOAD:=$(call AutoLoad,30,crc-ccitt) + $(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)) @@ -177,8 +196,8 @@ define KernelPackage/pppoe DEPENDS:=kmod-ppp 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,7 +209,8 @@ define KernelPackage/pppoa Kernel modules for PPPoA (PPP over ATM) support DEPENDS:=kmod-ppp KCONFIG:=$(CONFIG_PPPOATM) - FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,40,pppoatm) SUBMENU:=$(NSMENU) endef $(eval $(call KernelPackage,pppoa)) @@ -205,11 +225,11 @@ define KernelPackage/mppe 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) 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) endef $(eval $(call KernelPackage,mppe)) @@ -218,7 +238,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,8 +251,8 @@ define KernelPackage/ax25 SUBMENU:=$(NSMENU) 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)) @@ -247,10 +267,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) + 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 @@ -260,10 +279,11 @@ 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) + FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_SIS900) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) + AUTOLOAD:=$(call AutoLoad,50,sis900) endef $(eval $(call KernelPackage,sis900)) @@ -271,10 +291,11 @@ 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) + FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_VIA_RHINE) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) + AUTOLOAD:=$(call AutoLoad,50,via-rhine) endef $(eval $(call KernelPackage,via-rhine)) @@ -282,24 +303,77 @@ 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) + FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_8139TOO) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) + AUTOLOAD:=$(call AutoLoad,50,8139too) endef $(eval $(call KernelPackage,8139too)) +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:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_R8169) + 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:=$(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) +endef +$(eval $(call KernelPackage,ixp4xx-npe)) + 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) + FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_E100) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) + AUTOLOAD:=$(call AutoLoad,50,e100) endef $(eval $(call KernelPackage,e100)) +define KernelPackage/e1000 + TITLE:=Intel(R) PRO/1000 cards kernel support + DESCRIPTION:=\ + Kernel modules for Intel(R) PRO/1000 Ethernet adapters. + 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)) + define KernelPackage/3c59x TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang DESCRIPTION:=\ @@ -310,9 +384,10 @@ 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) + FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_3C59X) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) + AUTOLOAD:=$(call AutoLoad,50,3c59x) endef $(eval $(call KernelPackage,3c59x))