Resending missing patches

[Pavel Roskin]

Hello!

Sorry, some of my previous messages didn't have the attachments.  So I'm
resending all my patches together with one more patch - an entry for
Linksys CompactFlash cards.

The changes are:

1) Support for DESTDIR in Makefile
2) Using "cp -f" in Makefile
3) Listing all required modules in hostap_cs.conf
4) gcc 3.2 warning fix in hostap_hw.c

========================================
--- Makefile
+++ Makefile
@@ -11,6 +11,9 @@
 # Leave this blank for kernel-tree PCMCIA compilations (CONFIG_PCMCIA):
 PCMCIA_PATH=
 
+# This path will be prepended to every installed file
+DESTDIR=
+
 CC=gcc
 CFLAGS=-O2 -D__KERNEL__ -DMODULE -Wall -c $(EXTRA_CFLAGS)
 
@@ -20,7 +23,7 @@
 	else uname -r; fi)
 KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
 	sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
-MODPATH := /lib/modules/$(KERNELRELEASE)
+MODPATH := $(DESTDIR)/lib/modules/$(KERNELRELEASE)
 MODULE_CS := hostap_cs.o
 MODULE_PLX := hostap_plx.o
 MODULE_PCI := hostap_pci.o
@@ -145,36 +148,38 @@
 install_hostap: $(MSRC)/hostap.o
 	@echo "Installing hostap.o to $(MODPATH_PCI)"
 	mkdir -p $(MODPATH_PCI)
-	cp $(MSRC)/hostap.o $(MODPATH_PCI)
+	cp -f $(MSRC)/hostap.o $(MODPATH_PCI)
 
 install_crypt: $(MSRC)/hostap_crypt.o $(MSRC)/hostap_crypt_wep.o
 	@echo "Installing hostap_crypt*.o to $(MODPATH_PCI)"
 	mkdir -p $(MODPATH_PCI)
-	cp $(MSRC)/hostap_crypt*.o $(MODPATH_PCI)
+	cp -f $(MSRC)/hostap_crypt*.o $(MODPATH_PCI)
 
 install_pccard: install_check install_crypt install_hostap
 	@echo "Installing $(MODULE_CS) to $(MODPATH_CS)"
 	mkdir -p $(MODPATH_CS)
-	cp $(MSRC)/$(MODULE_CS) $(MODPATH_CS)
+	cp -f $(MSRC)/$(MODULE_CS) $(MODPATH_CS)
+ifndef DESTDIR
 	/sbin/depmod -a
-	@if [ ! -r /etc/pcmcia/hostap_cs.conf ]; then \
-		echo "Installing /etc/pcmcia/hostap_cs.conf"; \
-		cp driver/etc/hostap_cs.conf /etc/pcmcia/hostap_cs.conf; \
+endif
+	@if [ ! -r $(DESTDIR)/etc/pcmcia/hostap_cs.conf ]; then \
+		echo "Installing $(DESTDIR)/etc/pcmcia/hostap_cs.conf"; \
+		cp -f driver/etc/hostap_cs.conf $(DESTDIR)/etc/pcmcia/hostap_cs.conf; \
 	fi
-	@if [ -r /etc/pcmcia/prism2.conf ]; then \
-		echo "You may need to remove old /etc/pcmcia/prism2.conf"; \
+	@if [ -r $(DESTDIR)/etc/pcmcia/prism2.conf ]; then \
+		echo "You may need to remove old $(DESTDIR)/etc/pcmcia/prism2.conf"; \
 	fi
 
 install_plx: install_check install_crypt install_hostap
 	@echo "Installing $(MODULE_PLX) to $(MODPATH_PLX)"
 	mkdir -p $(MODPATH_PLX)
-	cp $(MSRC)/$(MODULE_PLX) $(MODPATH_PLX)
+	cp -f $(MSRC)/$(MODULE_PLX) $(MODPATH_PLX)
 	/sbin/depmod -a
 
 install_pci: install_check install_crypt install_hostap
 	@echo "Installing $(MODULE_PCI) to $(MODPATH_PCI)"
 	mkdir -p $(MODPATH_PCI)
-	cp $(MSRC)/$(MODULE_PCI) $(MODPATH_PCI)
+	cp -f $(MSRC)/$(MODULE_PCI) $(MODPATH_PCI)
 	/sbin/depmod -a
 
 
--- driver/etc/hostap_cs.conf
+++ driver/etc/hostap_cs.conf
@@ -1,5 +1,5 @@
 device "hostap_cs"
-   class "network" module "hostap_cs"
+   class "network" module "hostap_crypt", "hostap", "hostap_cs"
 
 card "Intersil PRISM2 Reference Design 11Mb/s WLAN Card"
    version "INTERSIL", "HFA384x/IEEE"
@@ -30,6 +30,10 @@
    manfid 0x0274, 0x1613
    bind "hostap_cs"
 
+card "Linksys WCF12 Wireless CompactFlash Card"
+   version "Linksys", "Wireless CompactFlash Card"
+   bind "hostap_cs"
+
 card "D-Link DWL-650 11Mbps WLAN Card"
    version "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02"
    bind "hostap_cs"
--- driver/modules/hostap_hw.c
+++ driver/modules/hostap_hw.c
@@ -3063,7 +3063,7 @@ static void prism2_alloc_ev(struct net_d
 			    netif_queue_stopped(dev))
 				hostap_netif_wake_queues(dev);
 
-			goto out;
+			return;
 		}
 
 		idx++;
@@ -3074,7 +3074,6 @@ static void prism2_alloc_ev(struct net_d
 	printk(KERN_WARNING "%s: could not find matching txfid (0x%04x) for "
 	       "alloc event\n", dev->name, HFA384X_INW(HFA384X_ALLOCFID_OFF));
 
- out:
 }
 
 
========================================

-- 
Regards,
Pavel Roskin