2.6.0-test3 (and -test2)

Pavel Roskin proski at gnu.org
Mon Aug 18 15:10:26 EDT 2003 

On Sun, 17 Aug 2003, James Harper wrote:

> sorry, all i was asking for was a 'does it work?'... if there was a
> known problem then it's a bit of a waste of time me discovering it all
> over again.

Just in case, 2.6.0-test3 seems to have an interrupt problem with PCI
bridges by Texas Insriments.  2.6.0-test2 is OK.

> I tracked it down earlier this morning though, once I excluded
> hostap_crypt.c from the Makefile it all worked fine. I'm running with
> 2.6.0-test3 as I type this. I've always copied the files into the kernel
> tree and compiled from there with a 'make -j5 modules'. I believe the
> kernel patch for 2.6.0-test2 (and therefore also -test3) should have
> hostap_crypt.c removed from the makefile. It certainly works fine
> without it being there and doesn't work with it.

Yes, it's time to clean up references to hostap_crypt module and
hostap_crypt.c as the source for that module.  The patch is attached.

-- 
Regards,
Pavel Roskin
-------------- next part --------------
--- Makefile
+++ Makefile
@@ -105,22 +105,19 @@
 
 ifdef CONFIG_MODVERSIONS
 
-VERFILES=$(MSRC)/hostap.ver ## $(MSRC)/hostap_crypt.ver
+VERFILES=$(MSRC)/hostap.ver
 $(MSRC)/hostap_crypt_wep.o: $(VERFILES)
 $(MSRC)/hostap.o: $(VERFILES)
 $(MSRC)/hostap_cs.o: $(VERFILES)
 $(MSRC)/hostap_plx.o: $(VERFILES)
 $(MSRC)/hostap_pci.o: $(VERFILES)
-INCLUDES_MODVER=-include $(MSRC)/hostap.ver ##-include $(MSRC)/hostap_crypt.ver
+INCLUDES_MODVER=-include $(MSRC)/hostap.ver
 
 GENKSYMS=/sbin/genksyms
 ifdef CONFIG_SMP
         GENKSYMS += -p smp_
 endif
 
-##$(MSRC)/hostap_crypt.ver: $(MSRC)/hostap_crypt.c
-##	$(CC) $(INCLUDES) $(CFLAGS) -E -D__GENKSYMS__ $^ | \
-##		$(GENKSYMS) -k $(KERNELVER) > $@
 $(MSRC)/hostap.ver: $(MSRC)/hostap.c
 	$(CC) $(INCLUDES) $(CFLAGS) -E -D__GENKSYMS__ $^ | \
 		$(GENKSYMS) -k $(KERNELVER) > $@
@@ -155,7 +152,7 @@
 pccard:	$(MSRC)/$(MODULE_CS) hostap crypt install_info
 plx:	$(MSRC)/$(MODULE_PLX) hostap crypt install_info
 pci:	$(MSRC)/$(MODULE_PCI) hostap crypt install_info
-crypt:  $(MSRC)/hostap_crypt_wep.o ## $(MSRC)/hostap_crypt.o
+crypt:  $(MSRC)/hostap_crypt_wep.o
 hostap: $(MSRC)/hostap.o
 
 SRC=$(MSRC)/hostap_hw.c $(MSRC)/hostap_wlan.h $(MSRC)/hostap_config.h \
@@ -163,8 +160,6 @@
 	$(MSRC)/hostap_ap.h \
 	$(MSRC)/hostap_crypt.h $(MSRC)/hostap.h $(MSRC)/hostap_compat.h
 
-## $(MSRC)/hostap_crypt.o: $(MSRC)/hostap_crypt.c $(MSRC)/hostap_crypt.h
-
 $(MSRC)/hostap_crypt_wep.o: $(MSRC)/hostap_crypt_wep.c $(MSRC)/hostap_crypt.h
 
 $(MSRC)/hostap.o: $(MSRC)/hostap.c $(MSRC)/hostap.h \
@@ -229,7 +224,7 @@
 	mkdir -p $(MODPATH_PCI)
 	cp -f $(MSRC)/hostap.o $(MODPATH_PCI)
 
-install_crypt: $(MSRC)/hostap_crypt_wep.o ## $(MSRC)/hostap_crypt.o
+install_crypt: $(MSRC)/hostap_crypt_wep.o
 	@echo "Installing hostap_crypt_*.o to $(MODPATH_PCI)"
 	mkdir -p $(MODPATH_PCI)
 	cp -f $(MSRC)/hostap_crypt_*.o $(MODPATH_PCI)
--- driver/hostap.mk
+++ driver/hostap.mk
@@ -1,11 +1,9 @@
 all:
 	$(MAKE) -C modules MODULES=hostap_cs.o
 	$(MAKE) -C modules MODULES=hostap.o
-	$(MAKE) -C modules MODULES=hostap_crypt.o
 	$(MAKE) -C modules MODULES=hostap_crypt_wep.o
 
 install:
 	$(MAKE) -C modules install-modules MODULES=hostap_cs.o
 	$(MAKE) -C modules install-modules MODULES=hostap.o
-	$(MAKE) -C modules install-modules MODULES=hostap_crypt.o
 	$(MAKE) -C modules install-modules MODULES=hostap_crypt_wep.o
--- driver/modules/Makefile
+++ driver/modules/Makefile
@@ -1,10 +1,9 @@
 # Makefile for Linux 2.6 kbuild / Linux 2.4
 
 # export-objs was removed in Linux 2.5.60
-# export-objs := hostap.o ## hostap_crypt.o
+# export-objs := hostap.o
 
 obj-m += hostap.o hostap_crypt_wep.o
-## obj-m += hostap_crypt.o
 obj-m += hostap_cs.o
 obj-m += hostap_plx.o
 obj-m += hostap_pci.o
@@ -15,22 +14,19 @@
 
 ifdef CONFIG_MODVERSIONS
 
-VERFILES=hostap.ver ## hostap_crypt.ver
+VERFILES=hostap.ver
 hostap_crypt_wep.o: $(VERFILES)
 hostap.o: $(VERFILES)
 hostap_cs.o: $(VERFILES)
 hostap_plx.o: $(VERFILES)
 hostap_pci.o: $(VERFILES)
-INCLUDES_MODVER=-include hostap.ver ## -include hostap_crypt.ver
+INCLUDES_MODVER=-include hostap.ver
 
 GENKSYMS=/sbin/genksyms
 ifdef CONFIG_SMP
         GENKSYMS += -p smp_
 endif
 
-## hostap_crypt.ver: hostap_crypt.c
-##	$(CC) $(INCLUDES) $(CFLAGS) -E -D__GENKSYMS__ $^ | \
-##		$(GENKSYMS) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@
 hostap.ver: hostap.c
 	$(CC) $(INCLUDES) $(CFLAGS) -E -D__GENKSYMS__ $^ | \
 		$(GENKSYMS) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@
--- driver_source.txt
+++ driver_source.txt
@@ -40,13 +40,13 @@
 hostap_plx.c
 	Hardware specific routines for PLX-based PC Card adapter version
 
-
-crypto modules:
-
 hostap_crypt.[ch]
 	Registration/unregistration code for modularized encryption
 	implementation
 
+
+crypto modules:
+
 hostap_crypt_wep.c
 	Host-based WEP (Wired Equivalent Privacy) implementation
 
--- kernel-patches/hostap-linux-2.4.20.patch
+++ kernel-patches/hostap-linux-2.4.20.patch
@@ -19,7 +19,7 @@
 +  PLX/PCI/CS version of the driver to actually use the driver.
 +
 +  The driver can be compiled as modules and they will be called
-+  "hostap.o", "hostap_crypt.o", and "hostap_crypt_wep.o".
++  "hostap.o" and "hostap_crypt_wep.o".
 +
 +Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
 +CONFIG_HOSTAP_PLX
@@ -108,7 +108,7 @@
  
  # Things that need to export symbols
 -export-objs	:= airo.o orinoco.o hermes.o
-+export-objs	:= airo.o orinoco.o hermes.o hostap.o hostap_crypt.o
++export-objs	:= airo.o orinoco.o hermes.o hostap.o
  
  obj-$(CONFIG_HERMES)		+= orinoco.o hermes.o
  obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o
@@ -116,7 +116,7 @@
  obj-$(CONFIG_AIRO)		+= airo.o
  obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o
  
-+obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt.o hostap_crypt_wep.o
++obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt_wep.o
 +obj-$(CONFIG_HOSTAP_CS)		+= hostap_cs.o
 +obj-$(CONFIG_HOSTAP_PLX)	+= hostap_plx.o
 +obj-$(CONFIG_HOSTAP_PCI)	+= hostap_pci.o
--- kernel-patches/hostap-linux-2.5.60.patch
+++ kernel-patches/hostap-linux-2.5.60.patch
@@ -38,7 +38,7 @@
 +	PLX/PCI/CS version of the driver to actually use the driver.
 +
 +	The driver can be compiled as modules and they will be called
-+	"hostap.o", "hostap_crypt.o", and "hostap_crypt_wep.o".
++	"hostap.o" and "hostap_crypt_wep.o".
 +
 +config HOSTAP_HOSTAPD
 +	bool "Use user space daemon (hostapd) with Host AP driver"
@@ -114,7 +114,7 @@
  obj-$(CONFIG_AIRO)		+= airo.o
  obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o
 +
-+obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt.o hostap_crypt_wep.o
++obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt_wep.o
 +obj-$(CONFIG_HOSTAP_CS)		+= hostap_cs.o
 +obj-$(CONFIG_HOSTAP_PLX)	+= hostap_plx.o
 +obj-$(CONFIG_HOSTAP_PCI)	+= hostap_pci.o
--- kernel-patches/hostap-linux-2.5.69.patch
+++ kernel-patches/hostap-linux-2.5.69.patch
@@ -36,7 +36,7 @@
 +	PLX/PCI/CS version of the driver to actually use the driver.
 +
 +	The driver can be compiled as modules and they will be called
-+	"hostap.o", "hostap_crypt.o", and "hostap_crypt_wep.o".
++	"hostap.o" and "hostap_crypt_wep.o".
 +
 +config HOSTAP_FIRMWARE
 +	bool "Support downloading firmware images with Host AP driver"
@@ -97,7 +97,7 @@
  obj-$(CONFIG_AIRO)		+= airo.o
  obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o
  
-+obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt.o hostap_crypt_wep.o
++obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt_wep.o
 +obj-$(CONFIG_HOSTAP_CS)		+= hostap_cs.o
 +obj-$(CONFIG_HOSTAP_PLX)	+= hostap_plx.o
 +obj-$(CONFIG_HOSTAP_PCI)	+= hostap_pci.o
--- kernel-patches/hostap-linux-2.6.0-test2.patch
+++ kernel-patches/hostap-linux-2.6.0-test2.patch
@@ -38,7 +38,7 @@
 +	PLX/PCI/CS version of the driver to actually use the driver.
 +
 +	The driver can be compiled as modules and they will be called
-+	"hostap.o", "hostap_crypt.o", and "hostap_crypt_wep.o".
++	"hostap.o" and "hostap_crypt_wep.o".
 +
 +config HOSTAP_FIRMWARE
 +	bool "Support downloading firmware images with Host AP driver"
@@ -100,7 +100,7 @@
  obj-$(CONFIG_AIRO)		+= airo.o
  obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o
  
-+obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt.o hostap_crypt_wep.o
++obj-$(CONFIG_HOSTAP)		+= hostap.o hostap_crypt_wep.o
 +obj-$(CONFIG_HOSTAP_CS)		+= hostap_cs.o
 +obj-$(CONFIG_HOSTAP_PLX)	+= hostap_plx.o
 +obj-$(CONFIG_HOSTAP_PCI)	+= hostap_pci.o
--- pcmcia-cs-patches/hostap-pcmcia-cs-3.1.34.patch
+++ pcmcia-cs-patches/hostap-pcmcia-cs-3.1.34.patch
@@ -6,13 +6,13 @@
  endif
  
 +# Host AP driver
-+MODULES	+= hostap.o hostap_crypt.o hostap_crypt_wep.o hostap_cs.o
-+SRCS	+= hostap.c hostap_crypt.c hostap_crypt_wep.c hostap_cs.c
++MODULES	+= hostap.o hostap_crypt_wep.o hostap_cs.o
++SRCS	+= hostap.c hostap_crypt_wep.c hostap_cs.c
 +
  all:	$(MODULES)
  
 -wvlan_hcf.o wvlan_hcfio.o hermes.o orinoco.o: %.o: %.c
-+wvlan_hcf.o wvlan_hcfio.o hermes.o orinoco.o hostap.o hostap_crypt.o: %.o: %.c
++wvlan_hcf.o wvlan_hcfio.o hermes.o orinoco.o hostap.o: %.o: %.c
  	$(CC) -MD -c $(XFLAGS) $<
  	@mkdir -p .depfiles ; mv $*.d .depfiles
  
--- todo.lst
+++ todo.lst
@@ -50,8 +50,6 @@
 - make sure that hostscan setting is re-set after card reset
 - reuse prism2_tx code with prism2_tx_80211
 - new module code should use try_module_get() for crypto modules
-- could actually integrate hostap_crypt.o module into hostap.o.. I don't think
-  it is that likely that only encryption stuff would be used in other drivers
 - ioctl's can be interrupted (EINTR, e.g., by killing iwconfig) which can
   result in leaving entries to pending CmdCompl list or command completion
   events to empty pending list; this should be cleaned up

More information about the HostAP mailing list