fix issues with multiple ppp links (noticed by Stefano Rivera)

[openwrt.git] / package / hostap / Makefile

diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index d3d5fb6..0b526b6 100644 (file)
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -43,6 +43,7 @@ define KernelPackage/hostap
   $(call KernelPackage/hostap/Default)
   DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-ieee80211 +kmod-crypto
   TITLE:=Host AP support for Prism2/2.5/3
+  KCONFIG:=CONFIG_HOSTAP
   DESCRIPTION+=\\\
        \\\
        This package contains the base Host AP driver code that is shared by \\\
@@ -59,9 +60,8 @@ define KernelPackage/hostap/2.4
   AUTOLOAD:=$(call AutoLoad,60,hostap hostap_crypt_wep hostap_crypt_tkip hostap_crypt_ccmp)
 endef
 define KernelPackage/hostap/2.6
-  KCONFIG:=$(CONFIG_HOSTAP)
   FILES:= \
-       $(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,hostap)
 endef
 
@@ -70,6 +70,7 @@ define KernelPackage/hostap-pci
   $(call KernelPackage/hostap/Default)
   DEPENDS:=kmod-hostap
   TITLE:=Host AP driver for PCI adaptors
+  KCONFIG:=CONFIG_HOSTAP_PCI
   DESCRIPTION+=\\\
        \\\
        This package contains the Host AP driver for Prism2.5 PCI adaptors.
@@ -80,15 +81,15 @@ define KernelPackage/hostap-pci/2.4
        $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX)
 endef
 define KernelPackage/hostap-pci/2.6
-  KCONFIG:=$(CONFIG_HOSTAP_PCI)
   FILES:= \
-       $(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
 endef
 
 
 define KernelPackage/hostap-plx
   $(call KernelPackage/hostap/Default)
   DEPENDS:=kmod-hostap
+  KCONFIG:=CONFIG_HOSTAP_PLX
   TITLE:=Host AP driver for PLX9052 based PCI adaptors
   DESCRIPTION+=\\\
        \\\
@@ -101,9 +102,8 @@ define KernelPackage/hostap-plx/2.4
        $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX)
 endef
 define KernelPackage/hostap-plx/2.6
-  KCONFIG:=$(CONFIG_HOSTAP_PLX)
   FILES:= \
-       $(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
 endef