X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=9a3f03f69ab1827e431e6c1d5dd8b6d05c98bf5a;hb=cbd55fe6d7ed5390cde7f6125b34f1a71c9641ff;hp=675065cc0dd521a20dfa7e655d687fb8545a5cb4;hpb=3df709c5a2c21449f74c03fe55c5b55aad20da9f;p=15.05%2Fopenwrt.git

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 675065cc0d..9a3f03f69a 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -16,7 +16,7 @@ define KernelPackage/atm
   FILES:= \
     $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
     $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_ATM)
+  KCONFIG:=CONFIG_ATM
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,30,atm br2684)
 endef
@@ -28,7 +28,7 @@ define KernelPackage/atmtcp
     Kernel module for ATM over TCP support
   DEPENDS:=@LINUX_2_6 kmod-atm
   FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_ATM_TCP)
+  KCONFIG:=CONFIG_ATM_TCP
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef
@@ -40,7 +40,7 @@ define KernelPackage/bonding
     Kernel module for NIC bonding.
   DEPENDS:=@LINUX_2_6_X86
   FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_BONDING)
+  KCONFIG:=CONFIG_BONDING
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,40,bonding)
 endef
@@ -50,7 +50,7 @@ define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
 	Kernel modules for IP in IP encapsulation
-  KCONFIG:=$(CONFIG_NET_IPIP)
+  KCONFIG:=CONFIG_NET_IPIP
   SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,ipip))
@@ -77,7 +77,7 @@ define KernelPackage/ipsec
 	- xfrm_user
   SUBMENU:=$(NSMENU)
   DEPENDS:=@LINUX_2_6
-  KCONFIG:=$(CONFIG_NET_KEY)
+  KCONFIG:=CONFIG_NET_KEY
   FILES:= \
 	$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
@@ -94,7 +94,7 @@ 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, \
 	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
@@ -113,7 +113,7 @@ define KernelPackage/ipsec6
 	- xfrm6_tunnel\\\
 	- tunnel6
   SUBMENU:=$(NSMENU)
-  KCONFIG:=$(CONFIG_INET6_AH)
+  KCONFIG:=CONFIG_INET6_AH
   DEPENDS:=kmod-ipsec
   FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel tunnel6, \
 	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
@@ -126,7 +126,7 @@ define KernelPackage/ipv6
   TITLE:=IPv6 support
   DESCRIPTION:=\
 	Kernel modules for IPv6 support
-  KCONFIG:=$(CONFIG_IPV6)
+  KCONFIG:=CONFIG_IPV6
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)
 endef
@@ -145,7 +145,7 @@ define KernelPackage/gre
   TITLE:=GRE support
   DESCRIPTION:=\
 	Generic Routing Encapsulation support
-  KCONFIG=$(CONFIG_NET_IPGRE)
+  KCONFIG:=CONFIG_NET_IPGRE
   FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
 endef
@@ -156,7 +156,7 @@ define KernelPackage/tun
   TITLE:=Universal TUN/TAP driver
   DESCRIPTION:=\
 	Kernel support for the TUN/TAP tunneling device
-  KCONFIG:=$(CONFIG_TUN)
+  KCONFIG:=CONFIG_TUN
   FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,30,tun)
@@ -168,7 +168,7 @@ define KernelPackage/ppp
   TITLE:=PPP modules
   DESCRIPTION:=\
 	Kernel modules for PPP support
-  KCONFIG:=$(CONFIG_PPP)
+  KCONFIG:=CONFIG_PPP
   SUBMENU:=$(NSMENU)
 endef
 
@@ -196,7 +196,7 @@ define KernelPackage/pppoe
   DESCRIPTION:=\
 	Kernel modules for PPPoE (PPP over Ethernet) support
   DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPPOE)
+  KCONFIG:=CONFIG_PPPOE
   FILES:= \
 	$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
@@ -210,7 +210,7 @@ define KernelPackage/pppoa
   DESCRIPTION:=\
 	Kernel modules for PPPoA (PPP over ATM) support
   DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPPOATM)
+  KCONFIG:=CONFIG_PPPOATM
   FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)
   SUBMENU:=$(NSMENU)
@@ -222,17 +222,16 @@ define KernelPackage/mppe
   TITLE:=Microsoft PPP compression/encryption
   DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
   DEPENDS:=kmod-ppp
+  KCONFIG:=CONFIG_PPP_MPPE_MPPC CONFIG_PPP_MPPE
   SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/mppe/2.4
-  KCONFIG:=$(CONFIG_PPP_MPPE_MPPC)
   FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
 endef
 
 define KernelPackage/mppe/2.6
-  KCONFIG:=$(CONFIG_PPP_MPPE)
   FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
@@ -254,7 +253,7 @@ define KernelPackage/ax25
   TITLE:=AX25 support
   DESCRIPTION:=Kernel modules for AX25 support
   SUBMENU:=$(NSMENU)
-  KCONFIG:=$(CONFIG_AX25)
+  KCONFIG:=CONFIG_AX25
   FILES:= \
 	$(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
@@ -272,18 +271,13 @@ define KernelPackage/mp-alg
 	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)
+  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
 
 define KernelPackage/natsemi
@@ -292,7 +286,7 @@ define KernelPackage/natsemi
 	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
 	adapters.
   FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_NATSEMI)
+  KCONFIG:=CONFIG_NATSEMI
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
@@ -304,7 +298,7 @@ define KernelPackage/sis900
   DESCRIPTION:=\
 	Kernel modules for Sis 900 Ethernet adapters.
   FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_SIS900)
+  KCONFIG:=CONFIG_SIS900
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,sis900)
@@ -316,7 +310,7 @@ define KernelPackage/via-rhine
   DESCRIPTION:=\
 	Kernel modules for Via Rhine Ethernet chipsets.
   FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_VIA_RHINE)
+  KCONFIG:=CONFIG_VIA_RHINE
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
@@ -328,7 +322,7 @@ define KernelPackage/via-velocity
   DESCRIPTION:=\
 	Kernel modules for VIA Velocity Gigabit Ethernet chipsets.
   FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_VIA_VELOCITY)
+  KCONFIG:=CONFIG_VIA_VELOCITY
   DEPENDS:=@LINUX_2_6_IXP4XX
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,via-velocity)
@@ -340,7 +334,7 @@ define KernelPackage/8139too
   DESCRIPTION:=\
 	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
   FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_8139TOO)
+  KCONFIG:=CONFIG_8139TOO
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,8139too)
@@ -352,7 +346,7 @@ define KernelPackage/r8169
   DESCRIPTION:=\
 	Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters.
   FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_R8169)
+  KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
   DEPENDS:=@LINUX_2_6_X86 
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,r8169)
@@ -365,7 +359,7 @@ define KernelPackage/ne2k-pci
 	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)
+  KCONFIG:=CONFIG_NE2K_PCI
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
@@ -379,7 +373,7 @@ define KernelPackage/ixp4xx-npe
   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)
+  KCONFIG:=CONFIG_IXP4XX_MAC
   DEPENDS:=@LINUX_2_6_IXP4XX
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,ixp4xx_npe ixp4xx_qmgr ixp4xx_mac)
@@ -391,7 +385,7 @@ define KernelPackage/e100
   DESCRIPTION:=\
 	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
   FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_E100)
+  KCONFIG:=CONFIG_E100
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,e100)
@@ -403,7 +397,7 @@ define KernelPackage/e1000
   DESCRIPTION:=\
 	Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
   FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_E1000)
+  KCONFIG:=CONFIG_E1000
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,e1000)
@@ -421,7 +415,7 @@ define KernelPackage/3c59x
 	- "Tornado"   (3c905)                                  PCI  \\\
 	- "Hurricane" (3c555/3cSOHO)                           PCI 
   FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_3C59X)
+  KCONFIG:=CONFIG_3C59X
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,3c59x)