diff -uNr linux-2.4.19-rc3.orig/Documentation/Configure.help linux-2.4.19-rc3/Documentation/Configure.help
--- linux-2.4.19-rc3.orig/Documentation/Configure.help	Sun Jul 21 15:17:54 2002
+++ linux-2.4.19-rc3/Documentation/Configure.help	Sun Jul 21 15:26:50 2002
@@ -9134,6 +9134,53 @@
   configure your card and that /etc/pcmcia/wireless.opts works:
   <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 
+Host AP support for Prism2/2.5/3 IEEE 802.11b
+CONFIG_HOSTAP
+  A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
+  chipset. This driver supports so called Host AP mode that allows
+  the card to act as an IEEE 802.11 access point.
+
+  See <http://hostap.epitest.fi/> for more information about the
+  Host AP driver configuration and tools.
+
+  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.
+
+  The driver can be compiled as modules and they will be called
+  "hostap.o", "hostap_crypt.o", and "hostap_crypt_wep.o".
+
+Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
+CONFIG_HOSTAP_PLX
+  Host AP driver's version for Prism2/2.5/3 PC Cards in PLX9052 based
+  PCI adaptors.
+
+  "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
+  driver and its help text includes more information about the Host AP
+  driver.
+
+  The driver can be compiled as a module and will be named "hostap_plx.o".
+
+Host AP driver for Prism2.5 PCI adaptors
+CONFIG_HOSTAP_PCI
+  Host AP driver's version for Prism2.5 PCI adaptors.
+
+  "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
+  driver and its help text includes more information about the Host AP
+  driver.
+
+  The driver can be compiled as a module and will be named "hostap_pci.o".
+
+Host AP driver for Prism2/2.5/3 PC Cards
+CONFIG_HOSTAP_CS
+  Host AP driver's version for Prism2/2.5/3 PC Cards.
+
+  "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
+  driver and its help text includes more information about the Host AP
+  driver.
+
+  The driver can be compiled as a module and will be named "hostap_cs.o".
+
 Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards
 CONFIG_AIRO
   This is the standard Linux driver to support Cisco/Aironet ISA and
diff -uNr linux-2.4.19-rc3.orig/MAINTAINERS linux-2.4.19-rc3/MAINTAINERS
--- linux-2.4.19-rc3.orig/MAINTAINERS	Sun Jul 21 15:17:55 2002
+++ linux-2.4.19-rc3/MAINTAINERS	Sun Jul 21 15:32:30 2002
@@ -651,6 +651,13 @@
 L:	linux-hippi@sunsite.dk
 S:	Maintained
 
+HOST AP DRIVER
+P:	Jouni Malinen
+M:	jkmaline@cc.hut.fi
+L:	hostap@lists.ssh.com
+W:	http://hostap.epitest.fi/
+S:	Maintained
+
 HP100:	Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 P:	Jaroslav Kysela
 M:	perex@suse.cz
diff -uNr linux-2.4.19-rc3.orig/drivers/net/wireless/Config.in linux-2.4.19-rc3/drivers/net/wireless/Config.in
--- linux-2.4.19-rc3.orig/drivers/net/wireless/Config.in	Sun Jul 21 15:18:31 2002
+++ linux-2.4.19-rc3/drivers/net/wireless/Config.in	Sun Jul 21 15:26:50 2002
@@ -7,6 +7,7 @@
 fi
 
 tristate '  Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)' CONFIG_HERMES
+tristate '  Host AP support for Prism2/2.5/3 IEEE 802.11b' CONFIG_HOSTAP
 
 if [ "$CONFIG_ALL_PPC" = "y" ]; then
    dep_tristate '    Apple Airport support (built-in)' CONFIG_APPLE_AIRPORT $CONFIG_HERMES
@@ -15,6 +16,8 @@
 if [ "$CONFIG_PCI" = "y" ]; then
    dep_tristate '    Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)' CONFIG_PLX_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
    dep_tristate '    Prism 2.5 PCI 802.11b adaptor support' CONFIG_PCI_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
+   dep_tristate '    Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors' CONFIG_HOSTAP_PLX $CONFIG_HOSTAP
+   dep_tristate '    Host AP driver for Prism2.5 PCI adaptors' CONFIG_HOSTAP_PCI $CONFIG_HOSTAP
 fi
 
 # If Pcmcia is compiled in, offer Pcmcia cards...
@@ -22,6 +25,7 @@
    comment 'Wireless Pcmcia cards support' 
 
    dep_tristate '  Hermes PCMCIA card support' CONFIG_PCMCIA_HERMES $CONFIG_HERMES
+   dep_tristate '  Host AP driver for Prism2/2.5/3 PC Cards' CONFIG_HOSTAP_CS $CONFIG_HOSTAP $CONFIG_PCMCIA
    tristate '  Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards' CONFIG_AIRO_CS
 fi
 
diff -uNr linux-2.4.19-rc3.orig/drivers/net/wireless/Makefile linux-2.4.19-rc3/drivers/net/wireless/Makefile
--- linux-2.4.19-rc3.orig/drivers/net/wireless/Makefile	Sun Jul 21 15:18:31 2002
+++ linux-2.4.19-rc3/drivers/net/wireless/Makefile	Sun Jul 21 15:26:51 2002
@@ -12,7 +12,7 @@
 obj-		:=
 
 # 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
 
 obj-$(CONFIG_HERMES)		+= orinoco.o hermes.o
 obj-$(CONFIG_PCMCIA_HERMES)	+= orinoco_cs.o
@@ -23,4 +23,9 @@
 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_CS)		+= hostap_cs.o
+obj-$(CONFIG_HOSTAP_PLX)	+= hostap_plx.o
+obj-$(CONFIG_HOSTAP_PCI)	+= hostap_pci.o
+
 include $(TOPDIR)/Rules.make
