fix hostap menuconfig and build for linux 2.6

SVN-Revision: 4448

openwrt/package/hostap-utils/Makefile

@@ -23,8 +23,8 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/hostap-utils
   SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+kmod-hostap
+  CATEGORY:=Drivers
+  DEPENDS:=kmod-hostap
   TITLE:=Host AP driver utility programs
   DESCRIPTION:=Host AP driver utility programs
   URL:=http://hostap.epitest.fi/

openwrt/package/hostap/Makefile

@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/kmod-hostap
   SECTION:=drivers
   CATEGORY:=Drivers
-DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_4_X86
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT
   TITLE:=Host AP support for Prism2/2.5/3 IEEE 802.11b
   DESCRIPTION:=Host AP support for Prism2/2.5/3 IEEE 802.11b \\\
     A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3 \\\
@@ -37,7 +37,11 @@ This option includes the base Host AP driver code that is shared by \\\
     different hardware models. You will also need to enable support for \\\
     PLX/PCI/CS version of the driver to actually use the driver. \\\
   URL:=http://hostap.epitest.fi/
+  ifeq ($(KERNEL),2.6)
+    VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  else
     VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  endif
 endef
 
 define Package/kmod-hostap-pci
@@ -54,7 +58,7 @@ TITLE:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
 DESCRIPTION:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
 endef
 
-
+ifeq ($(KERNEL),2.4)
   define Build/Compile
 	$(MAKE) -C $(LINUX_DIR)/ \
 		ARCH="$(LINUX_KARCH)" \
@@ -86,6 +90,33 @@ define Package/kmod-hostap-plx/install
 		$(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
 		$(1)/lib/modules/$(LINUX_VERSION)/
   endef
+endif
+
+ifeq ($(KERNEL),2.6)
+  define Build/Compile
+  endef
+  
+  define Package/kmod-hostap/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) \
+		$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+  endef
+
+  define Package/kmod-hostap-pci/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) \
+		$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+  endef
+
+  define Package/kmod-hostap-plx/install
+	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) \
+		$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+  endef
+endif
 
 $(eval $(call BuildPackage,kmod-hostap))
 $(eval $(call BuildPackage,kmod-hostap-pci))