fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / net / wireless / orinoco.c
index 8161a1c..936c888 100644 (file)
@@ -1,17 +1,23 @@
-/* orinoco.c 0.13e     - (formerly known as dldwd_cs.c and orinoco_cs.c)
+/* orinoco.c - (formerly known as dldwd_cs.c and orinoco_cs.c)
  *
  * A driver for Hermes or Prism 2 chipset based PCMCIA wireless
  * adaptors, with Lucent/Agere, Intersil or Symbol firmware.
  *
- * Copyright (C) 2000 David Gibson, Linuxcare Australia <hermes@gibson.dropbear.id.au>
+ * Current maintainers (as of 29 September 2003) are:
+ *     Pavel Roskin <proski AT gnu.org>
+ * and David Gibson <hermes AT gibson.dropbear.id.au>
+ *
+ * (C) Copyright David Gibson, IBM Corporation 2001-2003.
+ * Copyright (C) 2000 David Gibson, Linuxcare Australia.
  *     With some help from :
- * Copyright (C) 2001 Jean Tourrilhes, HP Labs <jt@hpl.hp.com>
- * Copyright (C) 2001 Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ * Copyright (C) 2001 Jean Tourrilhes, HP Labs
+ * Copyright (C) 2001 Benjamin Herrenschmidt
  *
  * Based on dummy_cs.c 1.27 2000/06/12 21:27:25
  *
- * Portions based on wvlan_cs.c 1.0.6, Copyright Andreas Neuhaus <andy@fasta.fh-dortmund.de>
- *      http://www.fasta.fh-dortmund.de/users/andy/wvlan/
+ * Portions based on wvlan_cs.c 1.0.6, Copyright Andreas Neuhaus <andy
+ * AT fasta.fh-dortmund.de>
+ *      http://www.stud.fh-dortmund.de/~andy/wvlan/
  *
  * The contents of this file are subject to the Mozilla Public License
  * Version 1.1 (the "License"); you may not use this file except in
@@ -24,7 +30,7 @@
  * limitations under the License.
  *
  * The initial developer of the original code is David A. Hinds
- * <dahinds@users.sourceforge.net>.  Portions created by David
+ * <dahinds AT users.sourceforge.net>.  Portions created by David
  * A. Hinds are Copyright (C) 1999 David A. Hinds.  All Rights
  * Reserved.
  *
  * under either the MPL or the GPL.  */
 
 /*
- * v0.01 -> v0.02 - 21/3/2001 - Jean II
- *     o Allow to use regular ethX device name instead of dldwdX
- *     o Warning on IBSS with ESSID=any for firmware 6.06
- *     o Put proper range.throughput values (optimistic)
- *     o IWSPY support (IOCTL and stat gather in Rx path)
- *     o Allow setting frequency in Ad-Hoc mode
- *     o Disable WEP setting if !has_wep to work on old firmware
- *     o Fix txpower range
- *     o Start adding support for Samsung/Compaq firmware
- *
- * v0.02 -> v0.03 - 23/3/2001 - Jean II
- *     o Start adding Symbol support - need to check all that
- *     o Fix Prism2/Symbol WEP to accept 128 bits keys
- *     o Add Symbol WEP (add authentication type)
- *     o Add Prism2/Symbol rate
- *     o Add PM timeout (holdover duration)
- *     o Enable "iwconfig eth0 key off" and friends (toggle flags)
- *     o Enable "iwconfig eth0 power unicast/all" (toggle flags)
- *     o Try with an intel card. It report firmware 1.01, behave like
- *       an antiquated firmware, however on windows it says 2.00. Yuck !
- *     o Workaround firmware bug in allocate buffer (Intel 1.01)
- *     o Finish external renaming to orinoco...
- *     o Testing with various Wavelan firmwares
- *
- * v0.03 -> v0.04 - 30/3/2001 - Jean II
- *     o Update to Wireless 11 -> add retry limit/lifetime support
- *     o Tested with a D-Link DWL 650 card, fill in firmware support
- *     o Warning on Vcc mismatch (D-Link 3.3v card in Lucent 5v only slot)
- *     o Fixed the Prims2 WEP bugs that I introduced in v0.03 :-(
- *       It work on D-Link *only* after a tcpdump. Weird...
- *       And still doesn't work on Intel card. Grrrr...
- *     o Update the mode after a setport3
- *     o Add preamble setting for Symbol cards (not yet enabled)
- *     o Don't complain as much about Symbol cards...
- *
- * v0.04 -> v0.04b - 22/4/2001 - David Gibson
- *      o Removed the 'eth' parameter - always use ethXX as the
- *        interface name instead of dldwdXX.  The other was racy
- *        anyway.
- *     o Clean up RID definitions in hermes.h, other cleanups
- *
- * v0.04b -> v0.04c - 24/4/2001 - Jean II
- *     o Tim Hurley <timster@seiki.bliztech.com> reported a D-Link card
- *       with vendor 02 and firmware 0.08. Added in the capabilities...
- *     o Tested Lucent firmware 7.28, everything works...
- *
- * v0.04c -> v0.05 - 3/5/2001 - Benjamin Herrenschmidt
- *     o Spin-off Pcmcia code. This file is renamed orinoco.c,
- *       and orinoco_cs.c now contains only the Pcmcia specific stuff
- *     o Add Airport driver support on top of orinoco.c (see airport.c)
- *
- * v0.05 -> v0.05a - 4/5/2001 - Jean II
- *     o Revert to old Pcmcia code to fix breakage of Ben's changes...
- *
- * v0.05a -> v0.05b - 4/5/2001 - Jean II
- *     o add module parameter 'ignore_cis_vcc' for D-Link @ 5V
- *     o D-Link firmware doesn't support multicast. We just print a few
- *       error messages, but otherwise everything works...
- *     o For David : set/getport3 works fine, just upgrade iwpriv...
- *
- * v0.05b -> v0.05c - 5/5/2001 - Benjamin Herrenschmidt
- *     o Adapt airport.c to latest changes in orinoco.c
- *     o Remove deferred power enabling code
- *
- * v0.05c -> v0.05d - 5/5/2001 - Jean II
- *     o Workaround to SNAP decapsulate frame from LinkSys AP
- *       original patch from : Dong Liu <dliu@research.bell-labs.com>
- *       (note : the memcmp bug was mine - fixed)
- *     o Remove set_retry stuff, no firmware support it (bloat--).
- *
- * v0.05d -> v0.06 - 25/5/2001 - Jean II
- *             Original patch from "Hong Lin" <alin@redhat.com>,
- *             "Ian Kinner" <ikinner@redhat.com>
- *             and "David Smith" <dsmith@redhat.com>
- *     o Init of priv->tx_rate_ctrl in firmware specific section.
- *     o Prism2/Symbol rate, upto should be 0xF and not 0x15. Doh !
- *     o Spectrum card always need cor_reset (for every reset)
- *     o Fix cor_reset to not lose bit 7 in the register
- *     o flush_stale_links to remove zombie Pcmcia instances
- *     o Ack previous hermes event before reset
- *             Me (with my little hands)
- *     o Allow orinoco.c to call cor_reset via priv->card_reset_handler
- *     o Add priv->need_card_reset to toggle this feature
- *     o Fix various buglets when setting WEP in Symbol firmware
- *       Now, encryption is fully functional on Symbol cards. Youpi !
- *
- * v0.06 -> v0.06b - 25/5/2001 - Jean II
- *     o IBSS on Symbol use port_mode = 4. Please don't ask...
- *
- * v0.06b -> v0.06c - 29/5/2001 - Jean II
- *     o Show first spy address in /proc/net/wireless for IBSS mode as well
- *
- * v0.06c -> v0.06d - 6/7/2001 - David Gibson
- *      o Change a bunch of KERN_INFO messages to KERN_DEBUG, as per Linus'
- *        wishes to reduce the number of unecessary messages.
- *     o Removed bogus message on CRC error.
- *     o Merged fixeds for v0.08 Prism 2 firmware from William Waghorn
- *       <willwaghorn@yahoo.co.uk>
- *     o Slight cleanup/re-arrangement of firmware detection code.
- *
- * v0.06d -> v0.06e - 1/8/2001 - David Gibson
- *     o Removed some redundant global initializers (orinoco_cs.c).
- *     o Added some module metadataa
- *
- * v0.06e -> v0.06f - 14/8/2001 - David Gibson
- *     o Wording fix to license
- *     o Added a 'use_alternate_encaps' module parameter for APs which need an
- *       oui of 00:00:00.  We really need a better way of handling this, but
- *       the module flag is better than nothing for now.
- *
- * v0.06f -> v0.07 - 20/8/2001 - David Gibson
- *     o Removed BAP error retries from hermes_bap_seek().  For Tx we now
- *       let the upper layers handle the retry, we retry explicitly in the
- *       Rx path, but don't make as much noise about it.
- *     o Firmware detection cleanups.
- *
- * v0.07 -> v0.07a - 1/10/3001 - Jean II
- *     o Add code to read Symbol firmware revision, inspired by latest code
- *       in Spectrum24 by Lee John Keyser-Allen - Thanks Lee !
- *     o Thanks to Jared Valentine <hidden@xmission.com> for "providing" me
- *       a 3Com card with a recent firmware, fill out Symbol firmware
- *       capabilities of latest rev (2.20), as well as older Symbol cards.
- *     o Disable Power Management in newer Symbol firmware, the API 
- *       has changed (documentation needed).
- *
- * v0.07a -> v0.08 - 3/10/2001 - David Gibson
- *     o Fixed a possible buffer overrun found by the Stanford checker (in
- *       dldwd_ioctl_setiwencode()).  Can only be called by root anyway, so not
- *       a big problem.
- *     o Turned has_big_wep on for Intersil cards.  That's not true for all of
- *       them but we should at least let the capable ones try.
- *     o Wait for BUSY to clear at the beginning of hermes_bap_seek().  I
- *       realised that my assumption that the driver's serialization
- *       would prevent the BAP being busy on entry was possibly false, because
- *       things other than seeks may make the BAP busy.
- *     o Use "alternate" (oui 00:00:00) encapsulation by default.
- *       Setting use_old_encaps will mimic the old behaviour, but I think we
- *       will be able to eliminate this.
- *     o Don't try to make __initdata const (the version string).  This can't
- *       work because of the way the __initdata sectioning works.
- *     o Added MODULE_LICENSE tags.
- *     o Support for PLX (transparent PCMCIA->PCI brdge) cards.
- *     o Changed to using the new type-facist min/max.
- *
- * v0.08 -> v0.08a - 9/10/2001 - David Gibson
- *     o Inserted some missing acknowledgements/info into the Changelog.
- *     o Fixed some bugs in the normalisation of signel level reporting.
- *     o Fixed bad bug in WEP key handling on Intersil and Symbol firmware,
- *       which led to an instant crash on big-endian machines.
- *
- * v0.08a -> v0.08b - 20/11/2001 - David Gibson
- *     o Lots of cleanup and bugfixes in orinoco_plx.c
- *     o Cleanup to handling of Tx rate setting.
- *     o Removed support for old encapsulation method.
- *     o Removed old "dldwd" names.
- *     o Split RID constants into a new file hermes_rid.h
- *     o Renamed RID constants to match linux-wlan-ng and prism2.o
- *     o Bugfixes in hermes.c
- *     o Poke the PLX's INTCSR register, so it actually starts
- *       generating interrupts.  These cards might actually work now.
- *     o Update to wireless extensions v12 (Jean II)
- *     o Support for tallies and inquire command (Jean II)
- *     o Airport updates for newer PPC kernels (BenH)
- *
- * v0.08b -> v0.09 - 21/12/2001 - David Gibson
- *     o Some new PCI IDs for PLX cards.
- *     o Removed broken attempt to do ALLMULTI reception.  Just use
- *       promiscuous mode instead
- *     o Preliminary work for list-AP (Jean II)
- *     o Airport updates from (BenH)
- *     o Eliminated racy hw_ready stuff
- *     o Fixed generation of fake events in irq handler.  This should
- *       finally kill the EIO problems (Jean II & dgibson)
- *     o Fixed breakage of bitrate set/get on Agere firmware (Jean II)
- *
- * v0.09 -> v0.09a - 2/1/2002 - David Gibson
- *     o Fixed stupid mistake in multicast list handling, triggering
- *       a BUG()
- *
- * v0.09a -> v0.09b - 16/1/2002 - David Gibson
- *     o Fixed even stupider mistake in new interrupt handling, which
- *       seriously broke things on big-endian machines.
- *     o Removed a bunch of redundant includes and exports.
- *     o Removed a redundant MOD_{INC,DEC}_USE_COUNT pair in airport.c
- *     o Don't attempt to do hardware level multicast reception on
- *       Intersil firmware, just go promisc instead.
- *     o Typo fixed in hermes_issue_cmd()
- *     o Eliminated WIRELESS_SPY #ifdefs
- *     o Status code reported on Tx exceptions
- *     o Moved netif_wake_queue() from ALLOC interrupts to TX and TXEXC
- *       interrupts, which should fix the timeouts we're seeing.
- *
- * v0.09b -> v0.10 - 25 Feb 2002 - David Gibson
- *     o Removed nested structures used for header parsing, so the
- *       driver should now work without hackery on ARM
- *     o Fix for WEP handling on Intersil (Hawk Newton)
- *     o Eliminated the /proc/hermes/ethXX/regs debugging file.  It
- *       was never very useful.
- *     o Make Rx errors less noisy.
- *
- * v0.10 -> v0.11 - 5 Apr 2002 - David Gibson
- *     o Laid the groundwork in hermes.[ch] for devices which map
- *       into PCI memory space rather than IO space.
- *     o Fixed bug in multicast handling (cleared multicast list when
- *       leaving promiscuous mode).
- *     o Relegated Tx error messages to debug.
- *     o Cleaned up / corrected handling of allocation lengths.
- *     o Set OWNSSID in IBSS mode for WinXP interoperability (jimc).
- *     o Change to using alloc_etherdev() for structure allocations. 
- *     o Check for and drop undersized packets.
- *     o Fixed a race in stopping/waking the queue.  This should fix
- *       the timeout problems (Pavel Roskin)
- *     o Reverted to netif_wake_queue() on the ALLOC event.
- *     o Fixes for recent Symbol firmwares which lack AP density
- *       (Pavel Roskin).
- *
- * v0.11 -> v0.11a - 29 Apr 2002 - David Gibson
- *     o Handle different register spacing, necessary for Prism 2.5
- *       PCI adaptors (Steve Hill).
- *     o Cleaned up initialization of card structures in orinoco_cs
- *       and airport.  Removed card->priv field.
- *     o Make response structure optional for hermes_docmd_wait()
- *       Pavel Roskin)
- *     o Added PCI id for Nortel emobility to orinoco_plx.c.
- *     o Cleanup to handling of Symbol's allocation bug. (Pavel Roskin)
- *     o Cleanups to firmware capability detection.
- *     o Arrange for orinoco_pci.c to override firmware detection.
- *       We should be able to support the PCI Intersil cards now.
- *     o Cleanup handling of reset_cor and hard_reset (Pavel Roskin).
- *     o Remove erroneous use of USER_BAP in the TxExc handler (Jouni
- *       Malinen).
- *     o Makefile changes for better integration into David Hinds
- *       pcmcia-cs package.
- *
- * v0.11a -> v0.11b - 1 May 2002 - David Gibson
- *     o Better error reporting in orinoco_plx_init_one()
- *     o Fixed multiple bad kfree() bugs introduced by the
- *       alloc_orinocodev() changes.
- *
- * v0.11b -> v0.12 - 19 Jun 2002 - David Gibson
- *     o Support changing the MAC address.
- *     o Correct display of Intersil firmware revision numbers.
- *     o Entirely revised locking scheme.  Should be both simpler and
- *        better.
- *     o Merged some common code in orinoco_plx, orinoco_pci and
- *       airport by creating orinoco_default_{open,stop,reset}()
- *       which are used as the dev->open, dev->stop, priv->reset
- *       callbacks if none are specified when alloc_orinocodev() is
- *       called.
- *     o Removed orinoco_plx_interrupt() and orinoco_pci_interrupt().
- *       They didn't do anything.
- *
- * v0.12 -> v0.12a - 4 Jul 2002 - David Gibson
- *     o Some rearrangement of code.
- *     o Numerous fixups to locking and rest handling, particularly
- *       for PCMCIA.
- *     o This allows open and stop net_device methods to be in
- *       orinoco.c now, rather than in the init modules.
- *     o In orinoco_cs.c link->priv now points to the struct
- *       net_device not to the struct orinoco_private.
- *     o Added a check for undersized SNAP frames, which could cause
- *       crashes.
- *
- * v0.12a -> v0.12b - 11 Jul 2002 - David Gibson
- *     o Fix hw->num_init testing code, so num_init is actually
- *       incremented.
- *     o Fix very stupid bug in orinoco_cs which broke compile with
- *       CONFIG_SMP.
- *     o Squashed a warning.
- *
- * v0.12b -> v0.12c - 26 Jul 2002 - David Gibson
- *     o Change to C9X style designated initializers.
- *     o Add support for 3Com AirConnect PCI.
- *     o No longer ignore the hard_reset argument to
- *       alloc_orinocodev().  Oops.
- *
- * v0.12c -> v0.13beta1 - 13 Sep 2002 - David Gibson
- *     o Revert the broken 0.12* locking scheme and go to a new yet
- *       simpler scheme.
- *     o Do firmware resets only in orinoco_init() and when waking
- *       the card from hard sleep.
- *
- * v0.13beta1 -> v0.13 - 27 Sep 2002 - David Gibson
- *     o Re-introduced full resets (via schedule_task()) on Tx
- *       timeout.
- *
- * v0.13 -> v0.13a - 30 Sep 2002 - David Gibson
- *     o Minor cleanups to info frame handling.  Add basic support
- *       for linkstatus info frames.
- *     o Include required kernel headers in orinoco.h, to avoid
- *       compile problems.
- *
- * v0.13a -> v0.13b - 10 Feb 2003 - David Gibson
- *     o Implemented hard reset for Airport cards
- *     o Experimental suspend/resume implementation for orinoco_pci
- *     o Abolished /proc debugging support, replaced with a debugging
- *       iwpriv.  Now it's ugly and simple instead of ugly and complex.
- *     o Bugfix in hermes.c if the firmware returned a record length
- *       of 0, we could go clobbering memory.
- *     o Bugfix in orinoco_stop() - it used to fail if hw_unavailable
- *       was set, which was usually true on PCMCIA hot removes.
- *     o Track LINKSTATUS messages, silently drop Tx packets before
- *       we are connected (avoids cofusing the firmware), and only
- *       give LINKSTATUS printk()s if the status has changed.
- *
- * v0.13b -> v0.13c - 11 Mar 2003 - David Gibson
- *     o Cleanup: use dev instead of priv in various places.
- *     o Bug fix: Don't ReleaseConfiguration on RESET_PHYSICAL event
- *       if we're in the middle of a (driver initiated) hard reset.
- *     o Bug fix: ETH_ZLEN is supposed to include the header
- *       (Dionysus Blazakis & Manish Karir)
- *     o Convert to using workqueues instead of taskqueues (and
- *       backwards compatibility macros for pre 2.5.41 kernels).
- *     o Drop redundant (I think...) MOD_{INC,DEC}_USE_COUNT in
- *       airport.c
- *     o New orinoco_tmd.c init module from Joerg Dorchain for
- *       TMD7160 based PCI to PCMCIA bridges (similar to
- *       orinoco_plx.c).
- *
- * v0.13c -> v0.13d - 22 Apr 2003 - David Gibson
- *     o Make hw_unavailable a counter, rather than just a flag, this
- *       is necessary to avoid some races (such as a card being
- *       removed in the middle of orinoco_reset().
- *     o Restore Release/RequestConfiguration in the PCMCIA event handler
- *       when dealing with a driver initiated hard reset.  This is
- *       necessary to prevent hangs due to a spurious interrupt while
- *       the reset is in progress.
- *     o Clear the 802.11 header when transmitting, even though we
- *       don't use it.  This fixes a long standing bug on some
- *       firmwares, which seem to get confused if that isn't done.
- *     o Be less eager to de-encapsulate SNAP frames, only do so if
- *       the OUI is 00:00:00 or 00:00:f8, leave others alone.  The old
- *       behaviour broke CDP (Cisco Discovery Protocol).
- *     o Use dev instead of priv for free_irq() as well as
- *       request_irq() (oops).
- *     o Attempt to reset rather than giving up if we get too many
- *       IRQs.
- *     o Changed semantics of __orinoco_down() so it can be called
- *       safely with hw_unavailable set.  It also now clears the
- *       linkstatus (since we're going to have to reassociate).
- *
- * v0.13d -> v0.13e - 12 May 2003 - David Gibson
- *     o Support for post-2.5.68 return values from irq handler.
- *     o Fixed bug where underlength packets would be double counted
- *       in the rx_dropped statistics.
- *     o Provided a module parameter to suppress linkstatus messages.
- *
  * TODO
- *     o New wireless extensions API (patch from Moustafa
- *       Youssef, updated by Jim Carter and Pavel Roskin).
  *     o Handle de-encapsulation within network layer, provide 802.11
  *       headers (patch from Thomas 'Dent' Mirlacher)
- *     o RF monitor mode support
  *     o Fix possible races in SPY handling.
  *     o Disconnect wireless extensions from fundamental configuration.
  *     o (maybe) Software WEP support (patch from Stano Meduna).
  *     o (maybe) Use multiple Tx buffers - driver handling queue
- *       rather than firmware. */
+ *       rather than firmware.
+ */
 
 /* Locking and synchronization:
  *
  * flag after taking the lock, and if it is set, give up on whatever
  * they are doing and drop the lock again.  The orinoco_lock()
  * function handles this (it unlocks and returns -EBUSY if
- * hw_unavailable is non-zero). */
+ * hw_unavailable is non-zero).
+ */
 
-#include <linux/config.h>
+#define DRIVER_NAME "orinoco"
 
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/ioport.h>
 #include <linux/netdevice.h>
-#include <linux/if_arp.h>
 #include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/if_arp.h>
 #include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <net/ieee80211.h>
 
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/system.h>
-
-#include "hermes.h"
 #include "hermes_rid.h"
 #include "orinoco.h"
-#include "ieee802_11.h"
 
 /********************************************************************/
 /* Module information                                               */
 /********************************************************************/
 
-MODULE_AUTHOR("David Gibson <hermes@gibson.dropbear.id.au>");
+MODULE_AUTHOR("Pavel Roskin <proski@gnu.org> & David Gibson <hermes@gibson.dropbear.id.au>");
 MODULE_DESCRIPTION("Driver for Lucent Orinoco, Prism II based and similar wireless cards");
-#ifdef MODULE_LICENSE
 MODULE_LICENSE("Dual MPL/GPL");
-#endif
 
 /* Level of debugging. Used in the macros in orinoco.h */
 #ifdef ORINOCO_DEBUG
 int orinoco_debug = ORINOCO_DEBUG;
-MODULE_PARM(orinoco_debug, "i");
+module_param(orinoco_debug, int, 0644);
+MODULE_PARM_DESC(orinoco_debug, "Debug level");
 EXPORT_SYMBOL(orinoco_debug);
 #endif
 
 static int suppress_linkstatus; /* = 0 */
-MODULE_PARM(suppress_linkstatus, "i");
+module_param(suppress_linkstatus, bool, 0644);
+MODULE_PARM_DESC(suppress_linkstatus, "Don't log link status changes");
+static int ignore_disconnect; /* = 0 */
+module_param(ignore_disconnect, int, 0644);
+MODULE_PARM_DESC(ignore_disconnect, "Don't report lost link to the network layer");
+
+static int force_monitor; /* = 0 */
+module_param(force_monitor, int, 0644);
+MODULE_PARM_DESC(force_monitor, "Allow monitor mode for all firmware versions");
 
 /********************************************************************/
 /* Compile time configuration and compatibility stuff               */
 /********************************************************************/
 
-/* Wireless extensions backwards compatibility */
-#ifndef SIOCIWFIRSTPRIV
-#define SIOCIWFIRSTPRIV                SIOCDEVPRIVATE
-#endif /* SIOCIWFIRSTPRIV */
-
 /* We do this this way to avoid ifdefs in the actual code */
 #ifdef WIRELESS_SPY
-#define SPY_NUMBER(priv)       (priv->spy_number)
+#define SPY_NUMBER(priv)       (priv->spy_data.spy_number)
 #else
 #define SPY_NUMBER(priv)       0
 #endif /* WIRELESS_SPY */
@@ -480,8 +132,12 @@ MODULE_PARM(suppress_linkstatus, "i");
 /* Internal constants                                               */
 /********************************************************************/
 
+/* 802.2 LLC/SNAP header used for Ethernet encapsulation over 802.11 */
+static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
+#define ENCAPS_OVERHEAD                (sizeof(encaps_hdr) + 2)
+
 #define ORINOCO_MIN_MTU                256
-#define ORINOCO_MAX_MTU                (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD)
+#define ORINOCO_MAX_MTU                (IEEE80211_DATA_LEN - ENCAPS_OVERHEAD)
 
 #define SYMBOL_MAX_VER_LEN     (14)
 #define USER_BAP               0
@@ -497,25 +153,34 @@ MODULE_PARM(suppress_linkstatus, "i");
 
 #define DUMMY_FID              0xFFFF
 
-#define RUP_EVEN(a) (((a) + 1) & (~1))
-
 /*#define MAX_MULTICAST(priv)  (priv->firmware_type == FIRMWARE_TYPE_AGERE ? \
   HERMES_MAX_MULTICAST : 0)*/
 #define MAX_MULTICAST(priv)    (HERMES_MAX_MULTICAST)
 
+#define ORINOCO_INTEN          (HERMES_EV_RX | HERMES_EV_ALLOC \
+                                | HERMES_EV_TX | HERMES_EV_TXEXC \
+                                | HERMES_EV_WTERR | HERMES_EV_INFO \
+                                | HERMES_EV_INFDROP )
+
+#define MAX_RID_LEN 1024
+
+static const struct iw_handler_def orinoco_handler_def;
+static const struct ethtool_ops orinoco_ethtool_ops;
+
 /********************************************************************/
 /* Data tables                                                      */
 /********************************************************************/
 
 /* The frequency of each channel in MHz */
-const long channel_frequency[] = {
+static const long channel_frequency[] = {
        2412, 2417, 2422, 2427, 2432, 2437, 2442,
        2447, 2452, 2457, 2462, 2467, 2472, 2484
 };
-#define NUM_CHANNELS ( sizeof(channel_frequency) / sizeof(channel_frequency[0]) )
+#define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
 
-/* This tables gives the actual meanings of the bitrate IDs returned by the firmware. */
-struct {
+/* This tables gives the actual meanings of the bitrate IDs returned
+ * by the firmware. */
+static struct {
        int bitrate; /* in 100s of kilobits */
        int automatic;
        u16 agere_txratectrl;
@@ -530,158 +195,84 @@ struct {
        {55,  1,  7,  7},
        {110, 0,  5,  8},
 };
-#define BITRATE_TABLE_SIZE (sizeof(bitrate_table) / sizeof(bitrate_table[0]))
+#define BITRATE_TABLE_SIZE ARRAY_SIZE(bitrate_table)
 
 /********************************************************************/
 /* Data types                                                       */
 /********************************************************************/
 
-struct header_struct {
-       /* 802.3 */
-       u8 dest[ETH_ALEN];
-       u8 src[ETH_ALEN];
-       u16 len;
-       /* 802.2 */
-       u8 dsap;
-       u8 ssap;
-       u8 ctrl;
-       /* SNAP */
-       u8 oui[3];
-       u16 ethertype;
+/* Beginning of the Tx descriptor, used in TxExc handling */
+struct hermes_txexc_data {
+       struct hermes_tx_descriptor desc;
+       __le16 frame_ctl;
+       __le16 duration_id;
+       u8 addr1[ETH_ALEN];
 } __attribute__ ((packed));
 
-/* 802.2 LLC/SNAP header used for Ethernet encapsulation over 802.11 */
-u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
-
-#define ENCAPS_OVERHEAD                (sizeof(encaps_hdr) + 2)
+/* Rx frame header except compatibility 802.3 header */
+struct hermes_rx_descriptor {
+       /* Control */
+       __le16 status;
+       __le32 time;
+       u8 silence;
+       u8 signal;
+       u8 rate;
+       u8 rxflow;
+       __le32 reserved;
+
+       /* 802.11 header */
+       __le16 frame_ctl;
+       __le16 duration_id;
+       u8 addr1[ETH_ALEN];
+       u8 addr2[ETH_ALEN];
+       u8 addr3[ETH_ALEN];
+       __le16 seq_ctl;
+       u8 addr4[ETH_ALEN];
+
+       /* Data length */
+       __le16 data_len;
+} __attribute__ ((packed));
 
 /********************************************************************/
 /* Function prototypes                                              */
 /********************************************************************/
 
-static void orinoco_stat_gather(struct net_device *dev,
-                               struct sk_buff *skb,
-                               struct hermes_rx_descriptor *desc);
-
-static struct net_device_stats *orinoco_get_stats(struct net_device *dev);
-static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev);
-
-/* Hardware control routines */
-
 static int __orinoco_program_rids(struct net_device *dev);
-
-static int __orinoco_hw_set_bitrate(struct orinoco_private *priv);
-static int __orinoco_hw_setup_wep(struct orinoco_private *priv);
-static int orinoco_hw_get_bssid(struct orinoco_private *priv, char buf[ETH_ALEN]);
-static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
-                               char buf[IW_ESSID_MAX_SIZE+1]);
-static long orinoco_hw_get_freq(struct orinoco_private *priv);
-static int orinoco_hw_get_bitratelist(struct orinoco_private *priv, int *numrates,
-                                     s32 *rates, int max);
 static void __orinoco_set_multicast_list(struct net_device *dev);
 
-/* Interrupt handling routines */
-static void __orinoco_ev_tick(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_wterr(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_infdrop(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_tx(struct net_device *dev, hermes_t *hw);
-static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw);
-
-/* ioctl() routines */
-static int orinoco_debug_dump_recs(struct net_device *dev);
-
 /********************************************************************/
-/* Function prototypes                                              */
+/* Internal helper functions                                        */
 /********************************************************************/
 
-int __orinoco_up(struct net_device *dev)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct hermes *hw = &priv->hw;
-       int err;
-
-       err = __orinoco_program_rids(dev);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d configuring card\n",
-                      dev->name, err);
-               return err;
-       }
-
-       /* Fire things up again */
-       hermes_set_irqmask(hw, ORINOCO_INTEN);
-       err = hermes_enable_port(hw, 0);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d enabling MAC port\n",
-                      dev->name, err);
-               return err;
-       }
-
-       netif_start_queue(dev);
-
-       return 0;
-}
-
-int __orinoco_down(struct net_device *dev)
+static inline void set_port_type(struct orinoco_private *priv)
 {
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct hermes *hw = &priv->hw;
-       int err;
-
-       netif_stop_queue(dev);
-
-       if (! priv->hw_unavailable) {
-               if (! priv->broken_disableport) {
-                       err = hermes_disable_port(hw, 0);
-                       if (err) {
-                               /* Some firmwares (e.g. Intersil 1.3.x) seem
-                                * to have problems disabling the port, oh
-                                * well, too bad. */
-                               printk(KERN_WARNING "%s: Error %d disabling MAC port\n",
-                                      dev->name, err);
-                               priv->broken_disableport = 1;
-                       }
+       switch (priv->iw_mode) {
+       case IW_MODE_INFRA:
+               priv->port_type = 1;
+               priv->createibss = 0;
+               break;
+       case IW_MODE_ADHOC:
+               if (priv->prefer_port3) {
+                       priv->port_type = 3;
+                       priv->createibss = 0;
+               } else {
+                       priv->port_type = priv->ibss_port;
+                       priv->createibss = 1;
                }
-               hermes_set_irqmask(hw, 0);
-               hermes_write_regn(hw, EVACK, 0xffff);
+               break;
+       case IW_MODE_MONITOR:
+               priv->port_type = 3;
+               priv->createibss = 0;
+               break;
+       default:
+               printk(KERN_ERR "%s: Invalid priv->iw_mode in set_port_type()\n",
+                      priv->ndev->name);
        }
-       
-       /* firmware will have to reassociate */
-       priv->last_linkstatus = 0xffff;
-       priv->connected = 0;
-
-       return 0;
 }
 
-int orinoco_reinit_firmware(struct net_device *dev)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct hermes *hw = &priv->hw;
-       int err;
-
-       err = hermes_init(hw);
-       if (err)
-               return err;
-
-       err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-       if (err == -EIO) {
-               /* Try workaround for old Symbol firmware bug */
-               printk(KERN_WARNING "%s: firmware ALLOC bug detected "
-                      "(old Symbol firmware?). Trying to work around... ",
-                      dev->name);
-               
-               priv->nicbuf_size = TX_NICBUF_SIZE_BUG;
-               err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-               if (err)
-                       printk("failed!\n");
-               else
-                       printk("ok.\n");
-       }
-
-       return err;
-}
+/********************************************************************/
+/* Device methods                                                   */
+/********************************************************************/
 
 static int orinoco_open(struct net_device *dev)
 {
@@ -689,9 +280,8 @@ static int orinoco_open(struct net_device *dev)
        unsigned long flags;
        int err;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        err = __orinoco_up(dev);
 
@@ -703,7 +293,7 @@ static int orinoco_open(struct net_device *dev)
        return err;
 }
 
-int orinoco_stop(struct net_device *dev)
+static int orinoco_stop(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int err = 0;
@@ -722,806 +312,635 @@ int orinoco_stop(struct net_device *dev)
        return err;
 }
 
-static int __orinoco_program_rids(struct net_device *dev)
+static struct net_device_stats *orinoco_get_stats(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       
+       return &priv->stats;
+}
+
+static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
+       struct iw_statistics *wstats = &priv->wstats;
        int err;
-       struct hermes_idstring idbuf;
+       unsigned long flags;
 
-       /* Set the MAC address */
-       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR,
-                              HERMES_BYTES_TO_RECLEN(ETH_ALEN), dev->dev_addr);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting MAC address\n", dev->name, err);
-               return err;
+       if (! netif_device_present(dev)) {
+               printk(KERN_WARNING "%s: get_wireless_stats() called while device not present\n",
+                      dev->name);
+               return NULL; /* FIXME: Can we do better than this? */
        }
 
-       /* Set up the link mode */
-       err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPORTTYPE, priv->port_type);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting port type\n", dev->name, err);
-               return err;
-       }
-       /* Set the channel/frequency */
-       if (priv->channel == 0) {
-               printk(KERN_DEBUG "%s: Channel is 0 in __orinoco_program_rids()\n", dev->name);
-               if (priv->createibss)
-                       priv->channel = 10;
-       }
-       err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFOWNCHANNEL, priv->channel);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting channel\n", dev->name, err);
-               return err;
-       }
+       /* If busy, return the old stats.  Returning NULL may cause
+        * the interface to disappear from /proc/net/wireless */
+       if (orinoco_lock(priv, &flags) != 0)
+               return wstats;
 
-       if (priv->has_ibss) {
-               err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFCREATEIBSS,
-                                          priv->createibss);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting CREATEIBSS\n", dev->name, err);
-                       return err;
+       /* We can't really wait for the tallies inquiry command to
+        * complete, so we just use the previous results and trigger
+        * a new tallies inquiry command for next time - Jean II */
+       /* FIXME: Really we should wait for the inquiry to come back -
+        * as it is the stats we give don't make a whole lot of sense.
+        * Unfortunately, it's not clear how to do that within the
+        * wireless extensions framework: I think we're in user
+        * context, but a lock seems to be held by the time we get in
+        * here so we're not safe to sleep here. */
+       hermes_inquire(hw, HERMES_INQ_TALLIES);
+
+       if (priv->iw_mode == IW_MODE_ADHOC) {
+               memset(&wstats->qual, 0, sizeof(wstats->qual));
+               /* If a spy address is defined, we report stats of the
+                * first spy address - Jean II */
+               if (SPY_NUMBER(priv)) {
+                       wstats->qual.qual = priv->spy_data.spy_stat[0].qual;
+                       wstats->qual.level = priv->spy_data.spy_stat[0].level;
+                       wstats->qual.noise = priv->spy_data.spy_stat[0].noise;
+                       wstats->qual.updated = priv->spy_data.spy_stat[0].updated;
                }
+       } else {
+               struct {
+                       __le16 qual, signal, noise, unused;
+               } __attribute__ ((packed)) cq;
 
-               if ((strlen(priv->desired_essid) == 0) && (priv->createibss)
-                  && (!priv->has_ibss_any)) {
-                       printk(KERN_WARNING "%s: This firmware requires an \
-ESSID in IBSS-Ad-Hoc mode.\n", dev->name);
-                       /* With wvlan_cs, in this case, we would crash.
-                        * hopefully, this driver will behave better...
-                        * Jean II */
+               err = HERMES_READ_RECORD(hw, USER_BAP,
+                                        HERMES_RID_COMMSQUALITY, &cq);
+
+               if (!err) {
+                       wstats->qual.qual = (int)le16_to_cpu(cq.qual);
+                       wstats->qual.level = (int)le16_to_cpu(cq.signal) - 0x95;
+                       wstats->qual.noise = (int)le16_to_cpu(cq.noise) - 0x95;
+                       wstats->qual.updated = 7;
                }
        }
 
-       /* Set the desired ESSID */
-       idbuf.len = cpu_to_le16(strlen(priv->desired_essid));
-       memcpy(&idbuf.val, priv->desired_essid, sizeof(idbuf.val));
-       /* WinXP wants partner to configure OWNSSID even in IBSS mode. (jimc) */
-       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNSSID,
-                              HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2),
-                              &idbuf);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting OWNSSID\n", dev->name, err);
-               return err;
-       }
-       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFDESIREDSSID,
-                              HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2),
-                              &idbuf);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting DESIREDSSID\n", dev->name, err);
-               return err;
-       }
+       orinoco_unlock(priv, &flags);
+       return wstats;
+}
 
-       /* Set the station name */
-       idbuf.len = cpu_to_le16(strlen(priv->nick));
-       memcpy(&idbuf.val, priv->nick, sizeof(idbuf.val));
-       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME,
-                              HERMES_BYTES_TO_RECLEN(strlen(priv->nick)+2),
-                              &idbuf);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting nickname\n", dev->name, err);
-               return err;
+static void orinoco_set_multicast_list(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       unsigned long flags;
+
+       if (orinoco_lock(priv, &flags) != 0) {
+               printk(KERN_DEBUG "%s: orinoco_set_multicast_list() "
+                      "called when hw_unavailable\n", dev->name);
+               return;
        }
 
-       /* Set AP density */
-       if (priv->has_sensitivity) {
-               err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE,
-                                          priv->ap_density);
-               if (err) {
-                       printk(KERN_WARNING "%s: Error %d setting SYSTEMSCALE.  "
-                              "Disabling sensitivity control\n", dev->name, err);
-
-                       priv->has_sensitivity = 0;
-               }
-       }
-
-       /* Set RTS threshold */
-       err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD, priv->rts_thresh);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting RTS threshold\n", dev->name, err);
-               return err;
-       }
-
-       /* Set fragmentation threshold or MWO robustness */
-       if (priv->has_mwo)
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFMWOROBUST_AGERE,
-                                          priv->mwo_robust);
-       else
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,
-                                          priv->frag_thresh);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting framentation\n", dev->name, err);
-               return err;
-       }
-
-       /* Set bitrate */
-       err = __orinoco_hw_set_bitrate(priv);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d setting bitrate\n", dev->name, err);
-               return err;
-       }
-
-       /* Set power management */
-       if (priv->has_pm) {
-               err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPMENABLED,
-                                          priv->pm_on);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting up PM\n",
-                              dev->name, err);
-                       return err;
-               }
+       __orinoco_set_multicast_list(dev);
+       orinoco_unlock(priv, &flags);
+}
 
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFMULTICASTRECEIVE,
-                                          priv->pm_mcast);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting up PM\n",
-                              dev->name, err);
-                       return err;
-               }
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFMAXSLEEPDURATION,
-                                          priv->pm_period);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting up PM\n",
-                              dev->name, err);
-                       return err;
-               }
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFPMHOLDOVERDURATION,
-                                          priv->pm_timeout);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting up PM\n",
-                              dev->name, err);
-                       return err;
-               }
-       }
+static int orinoco_change_mtu(struct net_device *dev, int new_mtu)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
 
-       /* Set preamble - only for Symbol so far... */
-       if (priv->has_preamble) {
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFPREAMBLE_SYMBOL,
-                                          priv->preamble);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting preamble\n",
-                              dev->name, err);
-                       return err;
-               }
-       }
+       if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
+               return -EINVAL;
 
-       /* Set up encryption */
-       if (priv->has_wep) {
-               err = __orinoco_hw_setup_wep(priv);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d activating WEP\n",
-                              dev->name, err);
-                       return err;
-               }
-       }
+       if ( (new_mtu + ENCAPS_OVERHEAD + IEEE80211_HLEN) >
+            (priv->nicbuf_size - ETH_HLEN) )
+               return -EINVAL;
 
-       /* Set promiscuity / multicast*/
-       priv->promiscuous = 0;
-       priv->mc_count = 0;
-       __orinoco_set_multicast_list(dev); /* FIXME: what about the xmit_lock */
+       dev->mtu = new_mtu;
 
        return 0;
 }
 
-/* xyzzy */
-static int orinoco_reconfigure(struct net_device *dev)
+/********************************************************************/
+/* Tx path                                                          */
+/********************************************************************/
+
+static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       struct hermes *hw = &priv->hw;
-       unsigned long flags;
+       struct net_device_stats *stats = &priv->stats;
+       hermes_t *hw = &priv->hw;
        int err = 0;
+       u16 txfid = priv->txfid;
+       struct ethhdr *eh;
+       int data_off;
+       struct hermes_tx_descriptor desc;
+       unsigned long flags;
 
-       if (priv->broken_disableport) {
-               schedule_work(&priv->reset_work);
-               return 0;
+       if (! netif_running(dev)) {
+               printk(KERN_ERR "%s: Tx on stopped device!\n",
+                      dev->name);
+               return NETDEV_TX_BUSY;
+       }
+       
+       if (netif_queue_stopped(dev)) {
+               printk(KERN_DEBUG "%s: Tx while transmitter busy!\n", 
+                      dev->name);
+               return NETDEV_TX_BUSY;
+       }
+       
+       if (orinoco_lock(priv, &flags) != 0) {
+               printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n",
+                      dev->name);
+               return NETDEV_TX_BUSY;
        }
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (! netif_carrier_ok(dev) || (priv->iw_mode == IW_MODE_MONITOR)) {
+               /* Oops, the firmware hasn't established a connection,
+                   silently drop the packet (this seems to be the
+                   safest approach). */
+               goto drop;
+       }
 
-               
-       err = hermes_disable_port(hw, 0);
+       /* Check packet length */
+       if (skb->len < ETH_HLEN)
+               goto drop;
+
+       eh = (struct ethhdr *)skb->data;
+
+       memset(&desc, 0, sizeof(desc));
+       desc.tx_control = cpu_to_le16(HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX);
+       err = hermes_bap_pwrite(hw, USER_BAP, &desc, sizeof(desc), txfid, 0);
        if (err) {
-               printk(KERN_WARNING "%s: Unable to disable port while reconfiguring card\n",
-                      dev->name);
-               priv->broken_disableport = 1;
-               goto out;
+               if (net_ratelimit())
+                       printk(KERN_ERR "%s: Error %d writing Tx descriptor "
+                              "to BAP\n", dev->name, err);
+               goto busy;
        }
 
-       err = __orinoco_program_rids(dev);
-       if (err) {
-               printk(KERN_WARNING "%s: Unable to reconfigure card\n",
-                      dev->name);
-               goto out;
+       /* Clear the 802.11 header and data length fields - some
+        * firmwares (e.g. Lucent/Agere 8.xx) appear to get confused
+        * if this isn't done. */
+       hermes_clear_words(hw, HERMES_DATA0,
+                          HERMES_802_3_OFFSET - HERMES_802_11_OFFSET);
+
+       /* Encapsulate Ethernet-II frames */
+       if (ntohs(eh->h_proto) > ETH_DATA_LEN) { /* Ethernet-II frame */
+               struct header_struct {
+                       struct ethhdr eth;      /* 802.3 header */
+                       u8 encap[6];            /* 802.2 header */
+               } __attribute__ ((packed)) hdr;
+
+               /* Strip destination and source from the data */
+               skb_pull(skb, 2 * ETH_ALEN);
+               data_off = HERMES_802_2_OFFSET + sizeof(encaps_hdr);
+
+               /* And move them to a separate header */
+               memcpy(&hdr.eth, eh, 2 * ETH_ALEN);
+               hdr.eth.h_proto = htons(sizeof(encaps_hdr) + skb->len);
+               memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));
+
+               err = hermes_bap_pwrite(hw, USER_BAP, &hdr, sizeof(hdr),
+                                       txfid, HERMES_802_3_OFFSET);
+               if (err) {
+                       if (net_ratelimit())
+                               printk(KERN_ERR "%s: Error %d writing packet "
+                                      "header to BAP\n", dev->name, err);
+                       goto busy;
+               }
+       } else { /* IEEE 802.3 frame */
+               data_off = HERMES_802_3_OFFSET;
        }
 
-       err = hermes_enable_port(hw, 0);
+       err = hermes_bap_pwrite(hw, USER_BAP, skb->data, skb->len,
+                               txfid, data_off);
        if (err) {
-               printk(KERN_WARNING "%s: Unable to enable port while reconfiguring card\n",
-                      dev->name);
-               goto out;
+               printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
+                      dev->name, err);
+               goto busy;
        }
 
- out:
+       /* Finally, we actually initiate the send */
+       netif_stop_queue(dev);
+
+       err = hermes_docmd_wait(hw, HERMES_CMD_TX | HERMES_CMD_RECL,
+                               txfid, NULL);
        if (err) {
-               printk(KERN_WARNING "%s: Resetting instead...\n", dev->name);
-               schedule_work(&priv->reset_work);
-               err = 0;
+               netif_start_queue(dev);
+               if (net_ratelimit())
+                       printk(KERN_ERR "%s: Error %d transmitting packet\n",
+                               dev->name, err);
+               goto busy;
        }
 
+       dev->trans_start = jiffies;
+       stats->tx_bytes += data_off + skb->len;
+       goto ok;
+
+ drop:
+       stats->tx_errors++;
+       stats->tx_dropped++;
+
+ ok:
        orinoco_unlock(priv, &flags);
-       return err;
+       dev_kfree_skb(skb);
+       return NETDEV_TX_OK;
 
+ busy:
+       if (err == -EIO)
+               schedule_work(&priv->reset_work);
+       orinoco_unlock(priv, &flags);
+       return NETDEV_TX_BUSY;
 }
 
-/* This must be called from user context, without locks held - use
- * schedule_work() */
-static void orinoco_reset(struct net_device *dev)
+static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       struct hermes *hw = &priv->hw;
-       int err;
-       unsigned long flags;
+       u16 fid = hermes_read_regn(hw, ALLOCFID);
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               /* When the hardware becomes available again, whatever
-                * detects that is responsible for re-initializing
-                * it. So no need for anything further*/
+       if (fid != priv->txfid) {
+               if (fid != DUMMY_FID)
+                       printk(KERN_WARNING "%s: Allocate event on unexpected fid (%04X)\n",
+                              dev->name, fid);
                return;
+       }
 
-       netif_stop_queue(dev);
+       hermes_write_regn(hw, ALLOCFID, DUMMY_FID);
+}
 
-       /* Shut off interrupts.  Depending on what state the hardware
-        * is in, this might not work, but we'll try anyway */
-       hermes_set_irqmask(hw, 0);
-       hermes_write_regn(hw, EVACK, 0xffff);
+static void __orinoco_ev_tx(struct net_device *dev, hermes_t *hw)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct net_device_stats *stats = &priv->stats;
 
-       priv->hw_unavailable++;
-       priv->last_linkstatus = 0xffff; /* firmware will have to reassociate */
-       priv->connected = 0;
+       stats->tx_packets++;
 
-       orinoco_unlock(priv, &flags);
+       netif_wake_queue(dev);
 
-       if (priv->hard_reset)
-               err = (*priv->hard_reset)(priv);
-       if (err) {
-               printk(KERN_ERR "%s: orinoco_reset: Error %d performing hard reset\n",
-                      dev->name, err);
-               /* FIXME: shutdown of some sort */
-               return;
-       }
+       hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);
+}
+
+static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct net_device_stats *stats = &priv->stats;
+       u16 fid = hermes_read_regn(hw, TXCOMPLFID);
+       u16 status;
+       struct hermes_txexc_data hdr;
+       int err = 0;
+
+       if (fid == DUMMY_FID)
+               return; /* Nothing's really happened */
+
+       /* Read part of the frame header - we need status and addr1 */
+       err = hermes_bap_pread(hw, IRQ_BAP, &hdr,
+                              sizeof(struct hermes_txexc_data),
+                              fid, 0);
+
+       hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);
+       stats->tx_errors++;
 
-       err = orinoco_reinit_firmware(dev);
        if (err) {
-               printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",
-                      dev->name, err);
+               printk(KERN_WARNING "%s: Unable to read descriptor on Tx error "
+                      "(FID=%04X error %d)\n",
+                      dev->name, fid, err);
                return;
        }
+       
+       DEBUG(1, "%s: Tx error, err %d (FID=%04X)\n", dev->name,
+             err, fid);
+    
+       /* We produce a TXDROP event only for retry or lifetime
+        * exceeded, because that's the only status that really mean
+        * that this particular node went away.
+        * Other errors means that *we* screwed up. - Jean II */
+       status = le16_to_cpu(hdr.desc.status);
+       if (status & (HERMES_TXSTAT_RETRYERR | HERMES_TXSTAT_AGEDERR)) {
+               union iwreq_data        wrqu;
+
+               /* Copy 802.11 dest address.
+                * We use the 802.11 header because the frame may
+                * not be 802.3 or may be mangled...
+                * In Ad-Hoc mode, it will be the node address.
+                * In managed mode, it will be most likely the AP addr
+                * User space will figure out how to convert it to
+                * whatever it needs (IP address or else).
+                * - Jean II */
+               memcpy(wrqu.addr.sa_data, hdr.addr1, ETH_ALEN);
+               wrqu.addr.sa_family = ARPHRD_ETHER;
+
+               /* Send event to user space */
+               wireless_send_event(dev, IWEVTXDROP, &wrqu, NULL);
+       }
 
-       spin_lock_irq(&priv->lock); /* This has to be called from user context */
+       netif_wake_queue(dev);
+}
 
-       priv->hw_unavailable--;
+static void orinoco_tx_timeout(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct net_device_stats *stats = &priv->stats;
+       struct hermes *hw = &priv->hw;
 
-       /* priv->open or priv->hw_unavailable might have changed while
-        * we dropped the lock */
-       if (priv->open && (! priv->hw_unavailable)) {
-               err = __orinoco_up(dev);
-               if (err) {
-                       printk(KERN_ERR "%s: orinoco_reset: Error %d reenabling card\n",
-                              dev->name, err);
-               } else
-                       dev->trans_start = jiffies;
-       }
+       printk(KERN_WARNING "%s: Tx timeout! "
+              "ALLOCFID=%04x, TXCOMPLFID=%04x, EVSTAT=%04x\n",
+              dev->name, hermes_read_regn(hw, ALLOCFID),
+              hermes_read_regn(hw, TXCOMPLFID), hermes_read_regn(hw, EVSTAT));
 
-       spin_unlock_irq(&priv->lock);
+       stats->tx_errors++;
 
-       return;
+       schedule_work(&priv->reset_work);
 }
 
 /********************************************************************/
-/* Internal helper functions                                        */
+/* Rx path (data frames)                                            */
 /********************************************************************/
 
-static inline void
-set_port_type(struct orinoco_private *priv)
-{
-       switch (priv->iw_mode) {
-       case IW_MODE_INFRA:
-               priv->port_type = 1;
-               priv->createibss = 0;
-               break;
-       case IW_MODE_ADHOC:
-               if (priv->prefer_port3) {
-                       priv->port_type = 3;
-                       priv->createibss = 0;
-               } else {
-                       priv->port_type = priv->ibss_port;
-                       priv->createibss = 1;
-               }
-               break;
-       default:
-               printk(KERN_ERR "%s: Invalid priv->iw_mode in set_port_type()\n",
-                      priv->ndev->name);
-       }
-}
-
 /* Does the frame have a SNAP header indicating it should be
  * de-encapsulated to Ethernet-II? */
-static inline int
-is_ethersnap(struct header_struct *hdr)
+static inline int is_ethersnap(void *_hdr)
 {
+       u8 *hdr = _hdr;
+
        /* We de-encapsulate all packets which, a) have SNAP headers
         * (i.e. SSAP=DSAP=0xaa and CTRL=0x3 in the 802.2 LLC header
         * and where b) the OUI of the SNAP header is 00:00:00 or
         * 00:00:f8 - we need both because different APs appear to use
         * different OUIs for some reason */
-       return (memcmp(&hdr->dsap, &encaps_hdr, 5) == 0)
-               && ( (hdr->oui[2] == 0x00) || (hdr->oui[2] == 0xf8) );
+       return (memcmp(hdr, &encaps_hdr, 5) == 0)
+               && ( (hdr[5] == 0x00) || (hdr[5] == 0xf8) );
 }
 
-static void
-orinoco_set_multicast_list(struct net_device *dev)
+static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac,
+                                     int level, int noise)
+{
+       struct iw_quality wstats;
+       wstats.level = level - 0x95;
+       wstats.noise = noise - 0x95;
+       wstats.qual = (level > noise) ? (level - noise) : 0;
+       wstats.updated = 7;
+       /* Update spy records */
+       wireless_spy_update(dev, mac, &wstats);
+}
+
+static void orinoco_stat_gather(struct net_device *dev,
+                               struct sk_buff *skb,
+                               struct hermes_rx_descriptor *desc)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       unsigned long flags;
 
-       if (orinoco_lock(priv, &flags) != 0) {
-               printk(KERN_DEBUG "%s: orinoco_set_multicast_list() "
-                      "called when hw_unavailable\n", dev->name);
-               return;
+       /* Using spy support with lots of Rx packets, like in an
+        * infrastructure (AP), will really slow down everything, because
+        * the MAC address must be compared to each entry of the spy list.
+        * If the user really asks for it (set some address in the
+        * spy list), we do it, but he will pay the price.
+        * Note that to get here, you need both WIRELESS_SPY
+        * compiled in AND some addresses in the list !!!
+        */
+       /* Note : gcc will optimise the whole section away if
+        * WIRELESS_SPY is not defined... - Jean II */
+       if (SPY_NUMBER(priv)) {
+               orinoco_spy_gather(dev, skb->mac.raw + ETH_ALEN,
+                                  desc->signal, desc->silence);
        }
-
-       __orinoco_set_multicast_list(dev);
-       orinoco_unlock(priv, &flags);
 }
 
-/********************************************************************/
-/* Hardware control functions                                       */
-/********************************************************************/
-
-
-static int __orinoco_hw_set_bitrate(struct orinoco_private *priv)
+/*
+ * orinoco_rx_monitor - handle received monitor frames.
+ *
+ * Arguments:
+ *     dev             network device
+ *     rxfid           received FID
+ *     desc            rx descriptor of the frame
+ *
+ * Call context: interrupt
+ */
+static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid,
+                              struct hermes_rx_descriptor *desc)
 {
+       u32 hdrlen = 30;        /* return full header by default */
+       u32 datalen = 0;
+       u16 fc;
+       int err;
+       int len;
+       struct sk_buff *skb;
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct net_device_stats *stats = &priv->stats;
        hermes_t *hw = &priv->hw;
-       int err = 0;
 
-       if (priv->bitratemode >= BITRATE_TABLE_SIZE) {
-               printk(KERN_ERR "%s: BUG: Invalid bitrate mode %d\n",
-                      priv->ndev->name, priv->bitratemode);
-               return -EINVAL;
-       }
+       len = le16_to_cpu(desc->data_len);
 
-       switch (priv->firmware_type) {
-       case FIRMWARE_TYPE_AGERE:
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFTXRATECONTROL,
-                                          bitrate_table[priv->bitratemode].agere_txratectrl);
+       /* Determine the size of the header and the data */
+       fc = le16_to_cpu(desc->frame_ctl);
+       switch (fc & IEEE80211_FCTL_FTYPE) {
+       case IEEE80211_FTYPE_DATA:
+               if ((fc & IEEE80211_FCTL_TODS)
+                   && (fc & IEEE80211_FCTL_FROMDS))
+                       hdrlen = 30;
+               else
+                       hdrlen = 24;
+               datalen = len;
                break;
-       case FIRMWARE_TYPE_INTERSIL:
-       case FIRMWARE_TYPE_SYMBOL:
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFTXRATECONTROL,
-                                          bitrate_table[priv->bitratemode].intersil_txratectrl);
+       case IEEE80211_FTYPE_MGMT:
+               hdrlen = 24;
+               datalen = len;
+               break;
+       case IEEE80211_FTYPE_CTL:
+               switch (fc & IEEE80211_FCTL_STYPE) {
+               case IEEE80211_STYPE_PSPOLL:
+               case IEEE80211_STYPE_RTS:
+               case IEEE80211_STYPE_CFEND:
+               case IEEE80211_STYPE_CFENDACK:
+                       hdrlen = 16;
+                       break;
+               case IEEE80211_STYPE_CTS:
+               case IEEE80211_STYPE_ACK:
+                       hdrlen = 10;
+                       break;
+               }
                break;
        default:
-               BUG();
+               /* Unknown frame type */
+               break;
        }
 
-       return err;
-}
+       /* sanity check the length */
+       if (datalen > IEEE80211_DATA_LEN + 12) {
+               printk(KERN_DEBUG "%s: oversized monitor frame, "
+                      "data length = %d\n", dev->name, datalen);
+               stats->rx_length_errors++;
+               goto update_stats;
+       }
 
+       skb = dev_alloc_skb(hdrlen + datalen);
+       if (!skb) {
+               printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n",
+                      dev->name);
+               goto update_stats;
+       }
 
-static int __orinoco_hw_setup_wep(struct orinoco_private *priv)
-{
-       hermes_t *hw = &priv->hw;
-       int err = 0;
-       int     master_wep_flag;
-       int     auth_flag;
+       /* Copy the 802.11 header to the skb */
+       memcpy(skb_put(skb, hdrlen), &(desc->frame_ctl), hdrlen);
+       skb->mac.raw = skb->data;
 
-       switch (priv->firmware_type) {
-       case FIRMWARE_TYPE_AGERE: /* Agere style WEP */
-               if (priv->wep_on) {
-                       err = hermes_write_wordrec(hw, USER_BAP,
-                                                  HERMES_RID_CNFTXKEY_AGERE,
-                                                  priv->tx_key);
-                       if (err)
-                               return err;
-                       
-                       err = HERMES_WRITE_RECORD(hw, USER_BAP,
-                                                 HERMES_RID_CNFWEPKEYS_AGERE,
-                                                 &priv->keys);
-                       if (err)
-                               return err;
+       /* If any, copy the data from the card to the skb */
+       if (datalen > 0) {
+               err = hermes_bap_pread(hw, IRQ_BAP, skb_put(skb, datalen),
+                                      ALIGN(datalen, 2), rxfid,
+                                      HERMES_802_2_OFFSET);
+               if (err) {
+                       printk(KERN_ERR "%s: error %d reading monitor frame\n",
+                              dev->name, err);
+                       goto drop;
                }
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFWEPENABLED_AGERE,
-                                          priv->wep_on);
-               if (err)
-                       return err;
-               break;
+       }
 
-       case FIRMWARE_TYPE_INTERSIL: /* Intersil style WEP */
-       case FIRMWARE_TYPE_SYMBOL: /* Symbol style WEP */
-               master_wep_flag = 0;            /* Off */
-               if (priv->wep_on) {
-                       int keylen;
-                       int i;
+       skb->dev = dev;
+       skb->ip_summed = CHECKSUM_NONE;
+       skb->pkt_type = PACKET_OTHERHOST;
+       skb->protocol = __constant_htons(ETH_P_802_2);
+       
+       dev->last_rx = jiffies;
+       stats->rx_packets++;
+       stats->rx_bytes += skb->len;
 
-                       /* Fudge around firmware weirdness */
-                       keylen = le16_to_cpu(priv->keys[priv->tx_key].len);
-                       
-                       /* Write all 4 keys */
-                       for(i = 0; i < ORINOCO_MAX_KEYS; i++) {
-/*                             int keylen = le16_to_cpu(priv->keys[i].len); */
-                               
-                               if (keylen > LARGE_KEY_SIZE) {
-                                       printk(KERN_ERR "%s: BUG: Key %d has oversize length %d.\n",
-                                              priv->ndev->name, i, keylen);
-                                       return -E2BIG;
-                               }
+       netif_rx(skb);
+       return;
 
-                               err = hermes_write_ltv(hw, USER_BAP,
-                                                      HERMES_RID_CNFDEFAULTKEY0 + i,
-                                                      HERMES_BYTES_TO_RECLEN(keylen),
-                                                      priv->keys[i].data);
-                               if (err)
-                                       return err;
-                       }
+ drop:
+       dev_kfree_skb_irq(skb);
+ update_stats:
+       stats->rx_errors++;
+       stats->rx_dropped++;
+}
 
-                       /* Write the index of the key used in transmission */
-                       err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFWEPDEFAULTKEYID,
-                                                  priv->tx_key);
-                       if (err)
-                               return err;
-                       
-                       if (priv->wep_restrict) {
-                               auth_flag = 2;
-                               master_wep_flag = 3;
-                       } else {
-                               /* Authentication is where Intersil and Symbol
-                                * firmware differ... */
-                               auth_flag = 1;
-                               if (priv->firmware_type == FIRMWARE_TYPE_SYMBOL)
-                                       master_wep_flag = 3; /* Symbol */ 
-                               else 
-                                       master_wep_flag = 1; /* Intersil */
-                       }
+static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct net_device_stats *stats = &priv->stats;
+       struct iw_statistics *wstats = &priv->wstats;
+       struct sk_buff *skb = NULL;
+       u16 rxfid, status, fc;
+       int length;
+       struct hermes_rx_descriptor desc;
+       struct ethhdr *hdr;
+       int err;
 
+       rxfid = hermes_read_regn(hw, RXFID);
 
-                       err = hermes_write_wordrec(hw, USER_BAP,
-                                                  HERMES_RID_CNFAUTHENTICATION, auth_flag);
-                       if (err)
-                               return err;
-               }
-               
-               /* Master WEP setting : on/off */
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFWEPFLAGS_INTERSIL,
-                                          master_wep_flag);
-               if (err)
-                       return err;     
+       err = hermes_bap_pread(hw, IRQ_BAP, &desc, sizeof(desc),
+                              rxfid, 0);
+       if (err) {
+               printk(KERN_ERR "%s: error %d reading Rx descriptor. "
+                      "Frame dropped.\n", dev->name, err);
+               goto update_stats;
+       }
 
-               break;
+       status = le16_to_cpu(desc.status);
 
-       default:
-               if (priv->wep_on) {
-                       printk(KERN_ERR "%s: WEP enabled, although not supported!\n",
-                              priv->ndev->name);
-                       return -EINVAL;
-               }
+       if (status & HERMES_RXSTAT_BADCRC) {
+               DEBUG(1, "%s: Bad CRC on Rx. Frame dropped.\n",
+                     dev->name);
+               stats->rx_crc_errors++;
+               goto update_stats;
        }
 
-       return 0;
-}
-
-static int orinoco_hw_get_bssid(struct orinoco_private *priv,
-                               char buf[ETH_ALEN])
-{
-       hermes_t *hw = &priv->hw;
-       int err = 0;
-       unsigned long flags;
+       /* Handle frames in monitor mode */
+       if (priv->iw_mode == IW_MODE_MONITOR) {
+               orinoco_rx_monitor(dev, rxfid, &desc);
+               return;
+       }
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (status & HERMES_RXSTAT_UNDECRYPTABLE) {
+               DEBUG(1, "%s: Undecryptable frame on Rx. Frame dropped.\n",
+                     dev->name);
+               wstats->discard.code++;
+               goto update_stats;
+       }
 
-       err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID,
-                             ETH_ALEN, NULL, buf);
+       length = le16_to_cpu(desc.data_len);
+       fc = le16_to_cpu(desc.frame_ctl);
 
-       orinoco_unlock(priv, &flags);
+       /* Sanity checks */
+       if (length < 3) { /* No for even an 802.2 LLC header */
+               /* At least on Symbol firmware with PCF we get quite a
+                   lot of these legitimately - Poll frames with no
+                   data. */
+               return;
+       }
+       if (length > IEEE80211_DATA_LEN) {
+               printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
+                      dev->name, length);
+               stats->rx_length_errors++;
+               goto update_stats;
+       }
 
-       return err;
-}
+       /* We need space for the packet data itself, plus an ethernet
+          header, plus 2 bytes so we can align the IP header on a
+          32bit boundary, plus 1 byte so we can read in odd length
+          packets from the card, which has an IO granularity of 16
+          bits */  
+       skb = dev_alloc_skb(length+ETH_HLEN+2+1);
+       if (!skb) {
+               printk(KERN_WARNING "%s: Can't allocate skb for Rx\n",
+                      dev->name);
+               goto update_stats;
+       }
 
-static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
-                               char buf[IW_ESSID_MAX_SIZE+1])
-{
-       hermes_t *hw = &priv->hw;
-       int err = 0;
-       struct hermes_idstring essidbuf;
-       char *p = (char *)(&essidbuf.val);
-       int len;
-       unsigned long flags;
+       /* We'll prepend the header, so reserve space for it.  The worst
+          case is no decapsulation, when 802.3 header is prepended and
+          nothing is removed.  2 is for aligning the IP header.  */
+       skb_reserve(skb, ETH_HLEN + 2);
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       err = hermes_bap_pread(hw, IRQ_BAP, skb_put(skb, length),
+                              ALIGN(length, 2), rxfid,
+                              HERMES_802_2_OFFSET);
+       if (err) {
+               printk(KERN_ERR "%s: error %d reading frame. "
+                      "Frame dropped.\n", dev->name, err);
+               goto drop;
+       }
 
-       if (strlen(priv->desired_essid) > 0) {
-               /* We read the desired SSID from the hardware rather
-                  than from priv->desired_essid, just in case the
-                  firmware is allowed to change it on us. I'm not
-                  sure about this */
-               /* My guess is that the OWNSSID should always be whatever
-                * we set to the card, whereas CURRENT_SSID is the one that
-                * may change... - Jean II */
-               u16 rid;
-
-               *active = 1;
-
-               rid = (priv->port_type == 3) ? HERMES_RID_CNFOWNSSID :
-                       HERMES_RID_CNFDESIREDSSID;
-               
-               err = hermes_read_ltv(hw, USER_BAP, rid, sizeof(essidbuf),
-                                     NULL, &essidbuf);
-               if (err)
-                       goto fail_unlock;
+       /* Handle decapsulation
+        * In most cases, the firmware tell us about SNAP frames.
+        * For some reason, the SNAP frames sent by LinkSys APs
+        * are not properly recognised by most firmwares.
+        * So, check ourselves */
+       if (length >= ENCAPS_OVERHEAD &&
+           (((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) ||
+            ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) ||
+            is_ethersnap(skb->data))) {
+               /* These indicate a SNAP within 802.2 LLC within
+                  802.11 frame which we'll need to de-encapsulate to
+                  the original EthernetII frame. */
+               hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN - ENCAPS_OVERHEAD);
        } else {
-               *active = 0;
-
-               err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTSSID,
-                                     sizeof(essidbuf), NULL, &essidbuf);
-               if (err)
-                       goto fail_unlock;
-       }
-
-       len = le16_to_cpu(essidbuf.len);
-
-       memset(buf, 0, IW_ESSID_MAX_SIZE+1);
-       memcpy(buf, p, len);
-       buf[len] = '\0';
-
- fail_unlock:
-       orinoco_unlock(priv, &flags);
-
-       return err;       
-}
-
-static long orinoco_hw_get_freq(struct orinoco_private *priv)
-{
-       
-       hermes_t *hw = &priv->hw;
-       int err = 0;
-       u16 channel;
-       long freq = 0;
-       unsigned long flags;
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-       
-       err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CURRENTCHANNEL, &channel);
-       if (err)
-               goto out;
-
-       /* Intersil firmware 1.3.5 returns 0 when the interface is down */
-       if (channel == 0) {
-               err = -EBUSY;
-               goto out;
-       }
-
-       if ( (channel < 1) || (channel > NUM_CHANNELS) ) {
-               printk(KERN_WARNING "%s: Channel out of range (%d)!\n",
-                      priv->ndev->name, channel);
-               err = -EBUSY;
-               goto out;
-
-       }
-       freq = channel_frequency[channel-1] * 100000;
-
- out:
-       orinoco_unlock(priv, &flags);
-
-       if (err > 0)
-               err = -EBUSY;
-       return err ? err : freq;
-}
-
-static int orinoco_hw_get_bitratelist(struct orinoco_private *priv,
-                                     int *numrates, s32 *rates, int max)
-{
-       hermes_t *hw = &priv->hw;
-       struct hermes_idstring list;
-       unsigned char *p = (unsigned char *)&list.val;
-       int err = 0;
-       int num;
-       int i;
-       unsigned long flags;
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-
-       err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_SUPPORTEDDATARATES,
-                             sizeof(list), NULL, &list);
-       orinoco_unlock(priv, &flags);
-
-       if (err)
-               return err;
-       
-       num = le16_to_cpu(list.len);
-       *numrates = num;
-       num = min(num, max);
-
-       for (i = 0; i < num; i++) {
-               rates[i] = (p[i] & 0x7f) * 500000; /* convert to bps */
-       }
-
-       return 0;
-}
-
-#if 0
-static void show_rx_frame(struct orinoco_rxframe_hdr *frame)
-{
-       printk(KERN_DEBUG "RX descriptor:\n");
-       printk(KERN_DEBUG "  status      = 0x%04x\n", frame->desc.status);
-       printk(KERN_DEBUG "  time        = 0x%08x\n", frame->desc.time);
-       printk(KERN_DEBUG "  silence     = 0x%02x\n", frame->desc.silence);
-       printk(KERN_DEBUG "  signal      = 0x%02x\n", frame->desc.signal);
-       printk(KERN_DEBUG "  rate        = 0x%02x\n", frame->desc.rate);
-       printk(KERN_DEBUG "  rxflow      = 0x%02x\n", frame->desc.rxflow);
-       printk(KERN_DEBUG "  reserved    = 0x%08x\n", frame->desc.reserved);
-
-       printk(KERN_DEBUG "IEEE 802.11 header:\n");
-       printk(KERN_DEBUG "  frame_ctl   = 0x%04x\n",
-              frame->p80211.frame_ctl);
-       printk(KERN_DEBUG "  duration_id = 0x%04x\n",
-              frame->p80211.duration_id);
-       printk(KERN_DEBUG "  addr1       = %02x:%02x:%02x:%02x:%02x:%02x\n",
-              frame->p80211.addr1[0], frame->p80211.addr1[1],
-              frame->p80211.addr1[2], frame->p80211.addr1[3],
-              frame->p80211.addr1[4], frame->p80211.addr1[5]);
-       printk(KERN_DEBUG "  addr2       = %02x:%02x:%02x:%02x:%02x:%02x\n",
-              frame->p80211.addr2[0], frame->p80211.addr2[1],
-              frame->p80211.addr2[2], frame->p80211.addr2[3],
-              frame->p80211.addr2[4], frame->p80211.addr2[5]);
-       printk(KERN_DEBUG "  addr3       = %02x:%02x:%02x:%02x:%02x:%02x\n",
-              frame->p80211.addr3[0], frame->p80211.addr3[1],
-              frame->p80211.addr3[2], frame->p80211.addr3[3],
-              frame->p80211.addr3[4], frame->p80211.addr3[5]);
-       printk(KERN_DEBUG "  seq_ctl     = 0x%04x\n",
-              frame->p80211.seq_ctl);
-       printk(KERN_DEBUG "  addr4       = %02x:%02x:%02x:%02x:%02x:%02x\n",
-              frame->p80211.addr4[0], frame->p80211.addr4[1],
-              frame->p80211.addr4[2], frame->p80211.addr4[3],
-              frame->p80211.addr4[4], frame->p80211.addr4[5]);
-       printk(KERN_DEBUG "  data_len    = 0x%04x\n",
-              frame->p80211.data_len);
-
-       printk(KERN_DEBUG "IEEE 802.3 header:\n");
-       printk(KERN_DEBUG "  dest        = %02x:%02x:%02x:%02x:%02x:%02x\n",
-              frame->p8023.h_dest[0], frame->p8023.h_dest[1],
-              frame->p8023.h_dest[2], frame->p8023.h_dest[3],
-              frame->p8023.h_dest[4], frame->p8023.h_dest[5]);
-       printk(KERN_DEBUG "  src         = %02x:%02x:%02x:%02x:%02x:%02x\n",
-              frame->p8023.h_source[0], frame->p8023.h_source[1],
-              frame->p8023.h_source[2], frame->p8023.h_source[3],
-              frame->p8023.h_source[4], frame->p8023.h_source[5]);
-       printk(KERN_DEBUG "  len         = 0x%04x\n", frame->p8023.h_proto);
-
-       printk(KERN_DEBUG "IEEE 802.2 LLC/SNAP header:\n");
-       printk(KERN_DEBUG "  DSAP        = 0x%02x\n", frame->p8022.dsap);
-       printk(KERN_DEBUG "  SSAP        = 0x%02x\n", frame->p8022.ssap);
-       printk(KERN_DEBUG "  ctrl        = 0x%02x\n", frame->p8022.ctrl);
-       printk(KERN_DEBUG "  OUI         = %02x:%02x:%02x\n",
-              frame->p8022.oui[0], frame->p8022.oui[1], frame->p8022.oui[2]);
-       printk(KERN_DEBUG "  ethertype  = 0x%04x\n", frame->ethertype);
-}
-#endif /* 0 */
-
-/*
- * Interrupt handler
- */
-irqreturn_t orinoco_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       struct net_device *dev = (struct net_device *)dev_id;
-       struct orinoco_private *priv = netdev_priv(dev);
-       hermes_t *hw = &priv->hw;
-       int count = MAX_IRQLOOPS_PER_IRQ;
-       u16 evstat, events;
-       /* These are used to detect a runaway interrupt situation */
-       /* If we get more than MAX_IRQLOOPS_PER_JIFFY iterations in a jiffy,
-        * we panic and shut down the hardware */
-       static int last_irq_jiffy = 0; /* jiffies value the last time we were called */
-       static int loops_this_jiffy = 0;
-       unsigned long flags;
-
-       if (orinoco_lock(priv, &flags) != 0) {
-               /* If hw is unavailable - we don't know if the irq was
-                * for us or not */
-               return IRQ_HANDLED;
+               /* 802.3 frame - prepend 802.3 header as is */
+               hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN);
+               hdr->h_proto = htons(length);
        }
+       memcpy(hdr->h_dest, desc.addr1, ETH_ALEN);
+       if (fc & IEEE80211_FCTL_FROMDS)
+               memcpy(hdr->h_source, desc.addr3, ETH_ALEN);
+       else
+               memcpy(hdr->h_source, desc.addr2, ETH_ALEN);
 
-       evstat = hermes_read_regn(hw, EVSTAT);
-       events = evstat & hw->inten;
-       if (! events) {
-               orinoco_unlock(priv, &flags);
-               return IRQ_NONE;
-       }
+       dev->last_rx = jiffies;
+       skb->dev = dev;
+       skb->protocol = eth_type_trans(skb, dev);
+       skb->ip_summed = CHECKSUM_NONE;
+       if (fc & IEEE80211_FCTL_TODS)
+               skb->pkt_type = PACKET_OTHERHOST;
        
-       if (jiffies != last_irq_jiffy)
-               loops_this_jiffy = 0;
-       last_irq_jiffy = jiffies;
-
-       while (events && count--) {
-               if (++loops_this_jiffy > MAX_IRQLOOPS_PER_JIFFY) {
-                       printk(KERN_WARNING "%s: IRQ handler is looping too "
-                              "much! Resetting.\n", dev->name);
-                       /* Disable interrupts for now */
-                       hermes_set_irqmask(hw, 0);
-                       schedule_work(&priv->reset_work);
-                       break;
-               }
-
-               /* Check the card hasn't been removed */
-               if (! hermes_present(hw)) {
-                       DEBUG(0, "orinoco_interrupt(): card removed\n");
-                       break;
-               }
-
-               if (events & HERMES_EV_TICK)
-                       __orinoco_ev_tick(dev, hw);
-               if (events & HERMES_EV_WTERR)
-                       __orinoco_ev_wterr(dev, hw);
-               if (events & HERMES_EV_INFDROP)
-                       __orinoco_ev_infdrop(dev, hw);
-               if (events & HERMES_EV_INFO)
-                       __orinoco_ev_info(dev, hw);
-               if (events & HERMES_EV_RX)
-                       __orinoco_ev_rx(dev, hw);
-               if (events & HERMES_EV_TXEXC)
-                       __orinoco_ev_txexc(dev, hw);
-               if (events & HERMES_EV_TX)
-                       __orinoco_ev_tx(dev, hw);
-               if (events & HERMES_EV_ALLOC)
-                       __orinoco_ev_alloc(dev, hw);
-               
-               hermes_write_regn(hw, EVACK, events);
-
-               evstat = hermes_read_regn(hw, EVSTAT);
-               events = evstat & hw->inten;
-       };
+       /* Process the wireless stats if needed */
+       orinoco_stat_gather(dev, skb, &desc);
 
-       orinoco_unlock(priv, &flags);
-       return IRQ_HANDLED;
-}
+       /* Pass the packet to the networking stack */
+       netif_rx(skb);
+       stats->rx_packets++;
+       stats->rx_bytes += length;
 
-static void __orinoco_ev_tick(struct net_device *dev, hermes_t *hw)
-{
-       printk(KERN_DEBUG "%s: TICK\n", dev->name);
-}
+       return;
 
-static void __orinoco_ev_wterr(struct net_device *dev, hermes_t *hw)
-{
-       /* This seems to happen a fair bit under load, but ignoring it
-          seems to work fine...*/
-       printk(KERN_DEBUG "%s: MAC controller error (WTERR). Ignoring.\n",
-              dev->name);
+ drop: 
+       dev_kfree_skb_irq(skb);
+ update_stats:
+       stats->rx_errors++;
+       stats->rx_dropped++;
 }
 
-static void __orinoco_ev_infdrop(struct net_device *dev, hermes_t *hw)
-{
-       if (net_ratelimit())
-               printk(KERN_WARNING "%s: Information frame lost.\n", dev->name);
-}
+/********************************************************************/
+/* Rx path (info frames)                                            */
+/********************************************************************/
 
 static void print_linkstatus(struct net_device *dev, u16 status)
 {
@@ -1560,13 +979,118 @@ static void print_linkstatus(struct net_device *dev, u16 status)
               dev->name, s, status);
 }
 
+/* Search scan results for requested BSSID, join it if found */
+static void orinoco_join_ap(struct work_struct *work)
+{
+       struct orinoco_private *priv =
+               container_of(work, struct orinoco_private, join_work);
+       struct net_device *dev = priv->ndev;
+       struct hermes *hw = &priv->hw;
+       int err;
+       unsigned long flags;
+       struct join_req {
+               u8 bssid[ETH_ALEN];
+               __le16 channel;
+       } __attribute__ ((packed)) req;
+       const int atom_len = offsetof(struct prism2_scan_apinfo, atim);
+       struct prism2_scan_apinfo *atom = NULL;
+       int offset = 4;
+       int found = 0;
+       u8 *buf;
+       u16 len;
+
+       /* Allocate buffer for scan results */
+       buf = kmalloc(MAX_SCAN_LEN, GFP_KERNEL);
+       if (! buf)
+               return;
+
+       if (orinoco_lock(priv, &flags) != 0)
+               goto fail_lock;
+
+       /* Sanity checks in case user changed something in the meantime */
+       if (! priv->bssid_fixed)
+               goto out;
+
+       if (strlen(priv->desired_essid) == 0)
+               goto out;
+
+       /* Read scan results from the firmware */
+       err = hermes_read_ltv(hw, USER_BAP,
+                             HERMES_RID_SCANRESULTSTABLE,
+                             MAX_SCAN_LEN, &len, buf);
+       if (err) {
+               printk(KERN_ERR "%s: Cannot read scan results\n",
+                      dev->name);
+               goto out;
+       }
+
+       len = HERMES_RECLEN_TO_BYTES(len);
+
+       /* Go through the scan results looking for the channel of the AP
+        * we were requested to join */
+       for (; offset + atom_len <= len; offset += atom_len) {
+               atom = (struct prism2_scan_apinfo *) (buf + offset);
+               if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0) {
+                       found = 1;
+                       break;
+               }
+       }
+
+       if (! found) {
+               DEBUG(1, "%s: Requested AP not found in scan results\n",
+                     dev->name);
+               goto out;
+       }
+
+       memcpy(req.bssid, priv->desired_bssid, ETH_ALEN);
+       req.channel = atom->channel;    /* both are little-endian */
+       err = HERMES_WRITE_RECORD(hw, USER_BAP, HERMES_RID_CNFJOINREQUEST,
+                                 &req);
+       if (err)
+               printk(KERN_ERR "%s: Error issuing join request\n", dev->name);
+
+ out:
+       orinoco_unlock(priv, &flags);
+
+ fail_lock:
+       kfree(buf);
+}
+
+/* Send new BSSID to userspace */
+static void orinoco_send_wevents(struct work_struct *work)
+{
+       struct orinoco_private *priv =
+               container_of(work, struct orinoco_private, wevent_work);
+       struct net_device *dev = priv->ndev;
+       struct hermes *hw = &priv->hw;
+       union iwreq_data wrqu;
+       int err;
+       unsigned long flags;
+
+       if (orinoco_lock(priv, &flags) != 0)
+               return;
+
+       err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENTBSSID,
+                             ETH_ALEN, NULL, wrqu.ap_addr.sa_data);
+       if (err != 0)
+               goto out;
+
+       wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+
+       /* Send event to user space */
+       wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+
+ out:
+       orinoco_unlock(priv, &flags);
+}
+
 static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        u16 infofid;
        struct {
-               u16 len;
-               u16 type;
+               __le16 len;
+               __le16 type;
        } __attribute__ ((packed)) info;
        int len, type;
        int err;
@@ -1600,9 +1124,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
                        len = sizeof(tallies);
                }
                
-               /* Read directly the data (no seek) */
-               hermes_read_words(hw, HERMES_DATA1, (void *) &tallies,
-                                 len / 2); /* FIXME: blech! */
+               err = hermes_bap_pread(hw, IRQ_BAP, &tallies, len,
+                                      infofid, sizeof(info));
+               if (err)
+                       break;
                
                /* Increment our various counters */
                /* wstats->discard.nwid - no wrong BSSID stuff */
@@ -1614,304 +1139,979 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
                                le16_to_cpu(tallies.RxDiscards_WEPExcluded);
                wstats->discard.misc +=
                        le16_to_cpu(tallies.TxDiscardsWrongSA);
-#if WIRELESS_EXT > 11
                wstats->discard.fragment +=
                        le16_to_cpu(tallies.RxMsgInBadMsgFragments);
                wstats->discard.retries +=
                        le16_to_cpu(tallies.TxRetryLimitExceeded);
                /* wstats->miss.beacon - no match */
-#endif /* WIRELESS_EXT > 11 */
        }
        break;
        case HERMES_INQ_LINKSTATUS: {
                struct hermes_linkstatus linkstatus;
                u16 newstatus;
-               
+               int connected;
+
+               if (priv->iw_mode == IW_MODE_MONITOR)
+                       break;
+
                if (len != sizeof(linkstatus)) {
                        printk(KERN_WARNING "%s: Unexpected size for linkstatus frame (%d bytes)\n",
                               dev->name, len);
                        break;
                }
 
-               hermes_read_words(hw, HERMES_DATA1, (void *) &linkstatus,
-                                 len / 2);
+               err = hermes_bap_pread(hw, IRQ_BAP, &linkstatus, len,
+                                      infofid, sizeof(info));
+               if (err)
+                       break;
                newstatus = le16_to_cpu(linkstatus.linkstatus);
 
-               if ( (newstatus == HERMES_LINKSTATUS_CONNECTED)
-                    || (newstatus == HERMES_LINKSTATUS_AP_CHANGE)
-                    || (newstatus == HERMES_LINKSTATUS_AP_IN_RANGE) )
-                       priv->connected = 1;
-               else if ( (newstatus == HERMES_LINKSTATUS_NOT_CONNECTED)
-                         || (newstatus == HERMES_LINKSTATUS_DISCONNECTED)
-                         || (newstatus == HERMES_LINKSTATUS_AP_OUT_OF_RANGE)
-                         || (newstatus == HERMES_LINKSTATUS_ASSOC_FAILED) )
-                       priv->connected = 0;
-
-               if (newstatus != priv->last_linkstatus)
+               /* Symbol firmware uses "out of range" to signal that
+                * the hostscan frame can be requested.  */
+               if (newstatus == HERMES_LINKSTATUS_AP_OUT_OF_RANGE &&
+                   priv->firmware_type == FIRMWARE_TYPE_SYMBOL &&
+                   priv->has_hostscan && priv->scan_inprogress) {
+                       hermes_inquire(hw, HERMES_INQ_HOSTSCAN_SYMBOL);
+                       break;
+               }
+
+               connected = (newstatus == HERMES_LINKSTATUS_CONNECTED)
+                       || (newstatus == HERMES_LINKSTATUS_AP_CHANGE)
+                       || (newstatus == HERMES_LINKSTATUS_AP_IN_RANGE);
+
+               if (connected)
+                       netif_carrier_on(dev);
+               else if (!ignore_disconnect)
+                       netif_carrier_off(dev);
+
+               if (newstatus != priv->last_linkstatus) {
+                       priv->last_linkstatus = newstatus;
                        print_linkstatus(dev, newstatus);
+                       /* The info frame contains only one word which is the
+                        * status (see hermes.h). The status is pretty boring
+                        * in itself, that's why we export the new BSSID...
+                        * Jean II */
+                       schedule_work(&priv->wevent_work);
+               }
+       }
+       break;
+       case HERMES_INQ_SCAN:
+               if (!priv->scan_inprogress && priv->bssid_fixed &&
+                   priv->firmware_type == FIRMWARE_TYPE_INTERSIL) {
+                       schedule_work(&priv->join_work);
+                       break;
+               }
+               /* fall through */
+       case HERMES_INQ_HOSTSCAN:
+       case HERMES_INQ_HOSTSCAN_SYMBOL: {
+               /* Result of a scanning. Contains information about
+                * cells in the vicinity - Jean II */
+               union iwreq_data        wrqu;
+               unsigned char *buf;
+
+               /* Sanity check */
+               if (len > 4096) {
+                       printk(KERN_WARNING "%s: Scan results too large (%d bytes)\n",
+                              dev->name, len);
+                       break;
+               }
+
+               /* We are a strict producer. If the previous scan results
+                * have not been consumed, we just have to drop this
+                * frame. We can't remove the previous results ourselves,
+                * that would be *very* racy... Jean II */
+               if (priv->scan_result != NULL) {
+                       printk(KERN_WARNING "%s: Previous scan results not consumed, dropping info frame.\n", dev->name);
+                       break;
+               }
+
+               /* Allocate buffer for results */
+               buf = kmalloc(len, GFP_ATOMIC);
+               if (buf == NULL)
+                       /* No memory, so can't printk()... */
+                       break;
+
+               /* Read scan data */
+               err = hermes_bap_pread(hw, IRQ_BAP, (void *) buf, len,
+                                      infofid, sizeof(info));
+               if (err) {
+                       kfree(buf);
+                       break;
+               }
 
-               priv->last_linkstatus = newstatus;
+#ifdef ORINOCO_DEBUG
+               {
+                       int     i;
+                       printk(KERN_DEBUG "Scan result [%02X", buf[0]);
+                       for(i = 1; i < (len * 2); i++)
+                               printk(":%02X", buf[i]);
+                       printk("]\n");
+               }
+#endif /* ORINOCO_DEBUG */
+
+               /* Allow the clients to access the results */
+               priv->scan_len = len;
+               priv->scan_result = buf;
+
+               /* Send an empty event to user space.
+                * We don't send the received data on the event because
+                * it would require us to do complex transcoding, and
+                * we want to minimise the work done in the irq handler
+                * Use a request to extract the data - Jean II */
+               wrqu.data.length = 0;
+               wrqu.data.flags = 0;
+               wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL);
        }
        break;
+       case HERMES_INQ_SEC_STAT_AGERE:
+               /* Security status (Agere specific) */
+               /* Ignore this frame for now */
+               if (priv->firmware_type == FIRMWARE_TYPE_AGERE)
+                       break;
+               /* fall through */
        default:
-               printk(KERN_DEBUG "%s: Unknown information frame received (type %04x).\n",
-                     dev->name, type);
+               printk(KERN_DEBUG "%s: Unknown information frame received: "
+                      "type 0x%04x, length %d\n", dev->name, type, len);
                /* We don't actually do anything about it */
                break;
        }
 }
 
-static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)
+static void __orinoco_ev_infdrop(struct net_device *dev, hermes_t *hw)
+{
+       if (net_ratelimit())
+               printk(KERN_DEBUG "%s: Information frame lost.\n", dev->name);
+}
+
+/********************************************************************/
+/* Internal hardware control routines                               */
+/********************************************************************/
+
+int __orinoco_up(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       struct net_device_stats *stats = &priv->stats;
-       struct iw_statistics *wstats = &priv->wstats;
-       struct sk_buff *skb = NULL;
-       u16 rxfid, status;
-       int length, data_len, data_off;
-       char *p;
-       struct hermes_rx_descriptor desc;
-       struct header_struct hdr;
-       struct ethhdr *eh;
+       struct hermes *hw = &priv->hw;
        int err;
 
-       rxfid = hermes_read_regn(hw, RXFID);
+       netif_carrier_off(dev); /* just to make sure */
 
-       err = hermes_bap_pread(hw, IRQ_BAP, &desc, sizeof(desc),
-                              rxfid, 0);
+       err = __orinoco_program_rids(dev);
        if (err) {
-               printk(KERN_ERR "%s: error %d reading Rx descriptor. "
-                      "Frame dropped.\n", dev->name, err);
-               stats->rx_errors++;
-               goto drop;
-       }
-
-       status = le16_to_cpu(desc.status);
-       
-       if (status & HERMES_RXSTAT_ERR) {
-               if (status & HERMES_RXSTAT_UNDECRYPTABLE) {
-                       wstats->discard.code++;
-                       DEBUG(1, "%s: Undecryptable frame on Rx. Frame dropped.\n",
-                              dev->name);
-               } else {
-                       stats->rx_crc_errors++;
-                       DEBUG(1, "%s: Bad CRC on Rx. Frame dropped.\n", dev->name);
-               }
-               stats->rx_errors++;
-               goto drop;
+               printk(KERN_ERR "%s: Error %d configuring card\n",
+                      dev->name, err);
+               return err;
        }
 
-       /* For now we ignore the 802.11 header completely, assuming
-           that the card's firmware has handled anything vital */
-
-       err = hermes_bap_pread(hw, IRQ_BAP, &hdr, sizeof(hdr),
-                              rxfid, HERMES_802_3_OFFSET);
+       /* Fire things up again */
+       hermes_set_irqmask(hw, ORINOCO_INTEN);
+       err = hermes_enable_port(hw, 0);
        if (err) {
-               printk(KERN_ERR "%s: error %d reading frame header. "
-                      "Frame dropped.\n", dev->name, err);
-               stats->rx_errors++;
-               goto drop;
+               printk(KERN_ERR "%s: Error %d enabling MAC port\n",
+                      dev->name, err);
+               return err;
        }
 
-       length = ntohs(hdr.len);
-       
-       /* Sanity checks */
-       if (length < 3) { /* No for even an 802.2 LLC header */
-               /* At least on Symbol firmware with PCF we get quite a
-                   lot of these legitimately - Poll frames with no
-                   data. */
-               stats->rx_dropped++;
-               goto drop;
-       }
-       if (length > IEEE802_11_DATA_LEN) {
-               printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
-                      dev->name, length);
-               stats->rx_length_errors++;
-               stats->rx_errors++;
-               goto drop;
-       }
+       netif_start_queue(dev);
 
-       /* We need space for the packet data itself, plus an ethernet
-          header, plus 2 bytes so we can align the IP header on a
-          32bit boundary, plus 1 byte so we can read in odd length
-          packets from the card, which has an IO granularity of 16
-          bits */  
-       skb = dev_alloc_skb(length+ETH_HLEN+2+1);
-       if (!skb) {
-               printk(KERN_WARNING "%s: Can't allocate skb for Rx\n",
-                      dev->name);
-               goto drop;
-       }
+       return 0;
+}
 
-       skb_reserve(skb, 2); /* This way the IP header is aligned */
+int __orinoco_down(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct hermes *hw = &priv->hw;
+       int err;
 
-       /* Handle decapsulation
-        * In most cases, the firmware tell us about SNAP frames.
-        * For some reason, the SNAP frames sent by LinkSys APs
-        * are not properly recognised by most firmwares.
-        * So, check ourselves */
-       if(((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) ||
-          ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) ||
-          is_ethersnap(&hdr)) {
-               /* These indicate a SNAP within 802.2 LLC within
-                  802.11 frame which we'll need to de-encapsulate to
-                  the original EthernetII frame. */
+       netif_stop_queue(dev);
 
-               if (length < ENCAPS_OVERHEAD) { /* No room for full LLC+SNAP */
-                       stats->rx_length_errors++;
-                       goto drop;
+       if (! priv->hw_unavailable) {
+               if (! priv->broken_disableport) {
+                       err = hermes_disable_port(hw, 0);
+                       if (err) {
+                               /* Some firmwares (e.g. Intersil 1.3.x) seem
+                                * to have problems disabling the port, oh
+                                * well, too bad. */
+                               printk(KERN_WARNING "%s: Error %d disabling MAC port\n",
+                                      dev->name, err);
+                               priv->broken_disableport = 1;
+                       }
                }
+               hermes_set_irqmask(hw, 0);
+               hermes_write_regn(hw, EVACK, 0xffff);
+       }
+       
+       /* firmware will have to reassociate */
+       netif_carrier_off(dev);
+       priv->last_linkstatus = 0xffff;
 
-               /* Remove SNAP header, reconstruct EthernetII frame */
-               data_len = length - ENCAPS_OVERHEAD;
-               data_off = HERMES_802_3_OFFSET + sizeof(hdr);
+       return 0;
+}
 
-               eh = (struct ethhdr *)skb_put(skb, ETH_HLEN);
+static int orinoco_allocate_fid(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct hermes *hw = &priv->hw;
+       int err;
 
-               memcpy(eh, &hdr, 2 * ETH_ALEN);
-               eh->h_proto = hdr.ethertype;
-       } else {
-               /* All other cases indicate a genuine 802.3 frame.  No
-                  decapsulation needed.  We just throw the whole
-                  thing in, and hope the protocol layer can deal with
-                  it as 802.3 */
-               data_len = length;
-               data_off = HERMES_802_3_OFFSET;
-               /* FIXME: we re-read from the card data we already read here */
+       err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
+       if (err == -EIO && priv->nicbuf_size > TX_NICBUF_SIZE_BUG) {
+               /* Try workaround for old Symbol firmware bug */
+               printk(KERN_WARNING "%s: firmware ALLOC bug detected "
+                      "(old Symbol firmware?). Trying to work around... ",
+                      dev->name);
+               
+               priv->nicbuf_size = TX_NICBUF_SIZE_BUG;
+               err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
+               if (err)
+                       printk("failed!\n");
+               else
+                       printk("ok.\n");
        }
 
-       p = skb_put(skb, data_len);
-       err = hermes_bap_pread(hw, IRQ_BAP, p, RUP_EVEN(data_len),
-                              rxfid, data_off);
-       if (err) {
-               printk(KERN_ERR "%s: error %d reading frame. "
-                      "Frame dropped.\n", dev->name, err);
-               stats->rx_errors++;
-               goto drop;
-       }
+       return err;
+}
 
-       dev->last_rx = jiffies;
-       skb->dev = dev;
-       skb->protocol = eth_type_trans(skb, dev);
-       skb->ip_summed = CHECKSUM_NONE;
-       
-       /* Process the wireless stats if needed */
-       orinoco_stat_gather(dev, skb, &desc);
+int orinoco_reinit_firmware(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       struct hermes *hw = &priv->hw;
+       int err;
 
-       /* Pass the packet to the networking stack */
-       netif_rx(skb);
-       stats->rx_packets++;
-       stats->rx_bytes += length;
+       err = hermes_init(hw);
+       if (!err)
+               err = orinoco_allocate_fid(dev);
 
-       return;
+       return err;
+}
 
- drop: 
-       stats->rx_dropped++;
+static int __orinoco_hw_set_bitrate(struct orinoco_private *priv)
+{
+       hermes_t *hw = &priv->hw;
+       int err = 0;
 
-       if (skb)
-               dev_kfree_skb_irq(skb);
-       return;
+       if (priv->bitratemode >= BITRATE_TABLE_SIZE) {
+               printk(KERN_ERR "%s: BUG: Invalid bitrate mode %d\n",
+                      priv->ndev->name, priv->bitratemode);
+               return -EINVAL;
+       }
+
+       switch (priv->firmware_type) {
+       case FIRMWARE_TYPE_AGERE:
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFTXRATECONTROL,
+                                          bitrate_table[priv->bitratemode].agere_txratectrl);
+               break;
+       case FIRMWARE_TYPE_INTERSIL:
+       case FIRMWARE_TYPE_SYMBOL:
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFTXRATECONTROL,
+                                          bitrate_table[priv->bitratemode].intersil_txratectrl);
+               break;
+       default:
+               BUG();
+       }
+
+       return err;
 }
 
-static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw)
+/* Set fixed AP address */
+static int __orinoco_hw_set_wap(struct orinoco_private *priv)
 {
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct net_device_stats *stats = &priv->stats;
-       u16 fid = hermes_read_regn(hw, TXCOMPLFID);
-       struct hermes_tx_descriptor desc;
+       int roaming_flag;
        int err = 0;
+       hermes_t *hw = &priv->hw;
 
-       if (fid == DUMMY_FID)
-               return; /* Nothing's really happened */
+       switch (priv->firmware_type) {
+       case FIRMWARE_TYPE_AGERE:
+               /* not supported */
+               break;
+       case FIRMWARE_TYPE_INTERSIL:
+               if (priv->bssid_fixed)
+                       roaming_flag = 2;
+               else
+                       roaming_flag = 1;
 
-       err = hermes_bap_pread(hw, IRQ_BAP, &desc, sizeof(desc), fid, 0);
-       if (err) {
-               printk(KERN_WARNING "%s: Unable to read descriptor on Tx error "
-                      "(FID=%04X error %d)\n",
-                      dev->name, fid, err);
-       } else {
-               DEBUG(1, "%s: Tx error, status %d\n",
-                     dev->name, le16_to_cpu(desc.status));
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFROAMINGMODE,
+                                          roaming_flag);
+               break;
+       case FIRMWARE_TYPE_SYMBOL:
+               err = HERMES_WRITE_RECORD(hw, USER_BAP,
+                                         HERMES_RID_CNFMANDATORYBSSID_SYMBOL,
+                                         &priv->desired_bssid);
+               break;
        }
-       
-       stats->tx_errors++;
-
-       hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);
+       return err;
 }
 
-static void __orinoco_ev_tx(struct net_device *dev, hermes_t *hw)
+/* Change the WEP keys and/or the current keys.  Can be called
+ * either from __orinoco_hw_setup_wep() or directly from
+ * orinoco_ioctl_setiwencode().  In the later case the association
+ * with the AP is not broken (if the firmware can handle it),
+ * which is needed for 802.1x implementations. */
+static int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv)
 {
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct net_device_stats *stats = &priv->stats;
+       hermes_t *hw = &priv->hw;
+       int err = 0;
+
+       switch (priv->firmware_type) {
+       case FIRMWARE_TYPE_AGERE:
+               err = HERMES_WRITE_RECORD(hw, USER_BAP,
+                                         HERMES_RID_CNFWEPKEYS_AGERE,
+                                         &priv->keys);
+               if (err)
+                       return err;
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFTXKEY_AGERE,
+                                          priv->tx_key);
+               if (err)
+                       return err;
+               break;
+       case FIRMWARE_TYPE_INTERSIL:
+       case FIRMWARE_TYPE_SYMBOL:
+               {
+                       int keylen;
+                       int i;
+
+                       /* Force uniform key length to work around firmware bugs */
+                       keylen = le16_to_cpu(priv->keys[priv->tx_key].len);
+                       
+                       if (keylen > LARGE_KEY_SIZE) {
+                               printk(KERN_ERR "%s: BUG: Key %d has oversize length %d.\n",
+                                      priv->ndev->name, priv->tx_key, keylen);
+                               return -E2BIG;
+                       }
+
+                       /* Write all 4 keys */
+                       for(i = 0; i < ORINOCO_MAX_KEYS; i++) {
+                               err = hermes_write_ltv(hw, USER_BAP,
+                                                      HERMES_RID_CNFDEFAULTKEY0 + i,
+                                                      HERMES_BYTES_TO_RECLEN(keylen),
+                                                      priv->keys[i].data);
+                               if (err)
+                                       return err;
+                       }
+
+                       /* Write the index of the key used in transmission */
+                       err = hermes_write_wordrec(hw, USER_BAP,
+                                                  HERMES_RID_CNFWEPDEFAULTKEYID,
+                                                  priv->tx_key);
+                       if (err)
+                               return err;
+               }
+               break;
+       }
+
+       return 0;
+}
+
+static int __orinoco_hw_setup_wep(struct orinoco_private *priv)
+{
+       hermes_t *hw = &priv->hw;
+       int err = 0;
+       int master_wep_flag;
+       int auth_flag;
+
+       if (priv->wep_on)
+               __orinoco_hw_setup_wepkeys(priv);
+
+       if (priv->wep_restrict)
+               auth_flag = HERMES_AUTH_SHARED_KEY;
+       else
+               auth_flag = HERMES_AUTH_OPEN;
+
+       switch (priv->firmware_type) {
+       case FIRMWARE_TYPE_AGERE: /* Agere style WEP */
+               if (priv->wep_on) {
+                       /* Enable the shared-key authentication. */
+                       err = hermes_write_wordrec(hw, USER_BAP,
+                                                  HERMES_RID_CNFAUTHENTICATION_AGERE,
+                                                  auth_flag);
+               }
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFWEPENABLED_AGERE,
+                                          priv->wep_on);
+               if (err)
+                       return err;
+               break;
+
+       case FIRMWARE_TYPE_INTERSIL: /* Intersil style WEP */
+       case FIRMWARE_TYPE_SYMBOL: /* Symbol style WEP */
+               if (priv->wep_on) {
+                       if (priv->wep_restrict ||
+                           (priv->firmware_type == FIRMWARE_TYPE_SYMBOL))
+                               master_wep_flag = HERMES_WEP_PRIVACY_INVOKED |
+                                                 HERMES_WEP_EXCL_UNENCRYPTED;
+                       else
+                               master_wep_flag = HERMES_WEP_PRIVACY_INVOKED;
+
+                       err = hermes_write_wordrec(hw, USER_BAP,
+                                                  HERMES_RID_CNFAUTHENTICATION,
+                                                  auth_flag);
+                       if (err)
+                               return err;
+               } else
+                       master_wep_flag = 0;
+
+               if (priv->iw_mode == IW_MODE_MONITOR)
+                       master_wep_flag |= HERMES_WEP_HOST_DECRYPT;
+
+               /* Master WEP setting : on/off */
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFWEPFLAGS_INTERSIL,
+                                          master_wep_flag);
+               if (err)
+                       return err;     
+
+               break;
+       }
+
+       return 0;
+}
+
+static int __orinoco_program_rids(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       hermes_t *hw = &priv->hw;
+       int err;
+       struct hermes_idstring idbuf;
+
+       /* Set the MAC address */
+       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR,
+                              HERMES_BYTES_TO_RECLEN(ETH_ALEN), dev->dev_addr);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting MAC address\n",
+                      dev->name, err);
+               return err;
+       }
+
+       /* Set up the link mode */
+       err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPORTTYPE,
+                                  priv->port_type);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting port type\n",
+                      dev->name, err);
+               return err;
+       }
+       /* Set the channel/frequency */
+       if (priv->channel != 0 && priv->iw_mode != IW_MODE_INFRA) {
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFOWNCHANNEL,
+                                          priv->channel);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting channel %d\n",
+                              dev->name, err, priv->channel);
+                       return err;
+               }
+       }
+
+       if (priv->has_ibss) {
+               u16 createibss;
+
+               if ((strlen(priv->desired_essid) == 0) && (priv->createibss)) {
+                       printk(KERN_WARNING "%s: This firmware requires an "
+                              "ESSID in IBSS-Ad-Hoc mode.\n", dev->name);
+                       /* With wvlan_cs, in this case, we would crash.
+                        * hopefully, this driver will behave better...
+                        * Jean II */
+                       createibss = 0;
+               } else {
+                       createibss = priv->createibss;
+               }
+               
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFCREATEIBSS,
+                                          createibss);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting CREATEIBSS\n",
+                              dev->name, err);
+                       return err;
+               }
+       }
+
+       /* Set the desired BSSID */
+       err = __orinoco_hw_set_wap(priv);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting AP address\n",
+                      dev->name, err);
+               return err;
+       }
+       /* Set the desired ESSID */
+       idbuf.len = cpu_to_le16(strlen(priv->desired_essid));
+       memcpy(&idbuf.val, priv->desired_essid, sizeof(idbuf.val));
+       /* WinXP wants partner to configure OWNSSID even in IBSS mode. (jimc) */
+       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNSSID,
+                              HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2),
+                              &idbuf);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting OWNSSID\n",
+                      dev->name, err);
+               return err;
+       }
+       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFDESIREDSSID,
+                              HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2),
+                              &idbuf);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting DESIREDSSID\n",
+                      dev->name, err);
+               return err;
+       }
+
+       /* Set the station name */
+       idbuf.len = cpu_to_le16(strlen(priv->nick));
+       memcpy(&idbuf.val, priv->nick, sizeof(idbuf.val));
+       err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME,
+                              HERMES_BYTES_TO_RECLEN(strlen(priv->nick)+2),
+                              &idbuf);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting nickname\n",
+                      dev->name, err);
+               return err;
+       }
+
+       /* Set AP density */
+       if (priv->has_sensitivity) {
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFSYSTEMSCALE,
+                                          priv->ap_density);
+               if (err) {
+                       printk(KERN_WARNING "%s: Error %d setting SYSTEMSCALE.  "
+                              "Disabling sensitivity control\n",
+                              dev->name, err);
+
+                       priv->has_sensitivity = 0;
+               }
+       }
+
+       /* Set RTS threshold */
+       err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,
+                                  priv->rts_thresh);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting RTS threshold\n",
+                      dev->name, err);
+               return err;
+       }
+
+       /* Set fragmentation threshold or MWO robustness */
+       if (priv->has_mwo)
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFMWOROBUST_AGERE,
+                                          priv->mwo_robust);
+       else
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,
+                                          priv->frag_thresh);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting fragmentation\n",
+                      dev->name, err);
+               return err;
+       }
+
+       /* Set bitrate */
+       err = __orinoco_hw_set_bitrate(priv);
+       if (err) {
+               printk(KERN_ERR "%s: Error %d setting bitrate\n",
+                      dev->name, err);
+               return err;
+       }
+
+       /* Set power management */
+       if (priv->has_pm) {
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFPMENABLED,
+                                          priv->pm_on);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting up PM\n",
+                              dev->name, err);
+                       return err;
+               }
+
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFMULTICASTRECEIVE,
+                                          priv->pm_mcast);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting up PM\n",
+                              dev->name, err);
+                       return err;
+               }
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFMAXSLEEPDURATION,
+                                          priv->pm_period);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting up PM\n",
+                              dev->name, err);
+                       return err;
+               }
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFPMHOLDOVERDURATION,
+                                          priv->pm_timeout);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting up PM\n",
+                              dev->name, err);
+                       return err;
+               }
+       }
+
+       /* Set preamble - only for Symbol so far... */
+       if (priv->has_preamble) {
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFPREAMBLE_SYMBOL,
+                                          priv->preamble);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting preamble\n",
+                              dev->name, err);
+                       return err;
+               }
+       }
+
+       /* Set up encryption */
+       if (priv->has_wep) {
+               err = __orinoco_hw_setup_wep(priv);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d activating WEP\n",
+                              dev->name, err);
+                       return err;
+               }
+       }
+
+       if (priv->iw_mode == IW_MODE_MONITOR) {
+               /* Enable monitor mode */
+               dev->type = ARPHRD_IEEE80211;
+               err = hermes_docmd_wait(hw, HERMES_CMD_TEST | 
+                                           HERMES_TEST_MONITOR, 0, NULL);
+       } else {
+               /* Disable monitor mode */
+               dev->type = ARPHRD_ETHER;
+               err = hermes_docmd_wait(hw, HERMES_CMD_TEST |
+                                           HERMES_TEST_STOP, 0, NULL);
+       }
+       if (err)
+               return err;
+
+       /* Set promiscuity / multicast*/
+       priv->promiscuous = 0;
+       priv->mc_count = 0;
+
+       /* FIXME: what about netif_tx_lock */
+       __orinoco_set_multicast_list(dev);
+
+       return 0;
+}
+
+/* FIXME: return int? */
+static void
+__orinoco_set_multicast_list(struct net_device *dev)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       hermes_t *hw = &priv->hw;
+       int err = 0;
+       int promisc, mc_count;
+
+       /* The Hermes doesn't seem to have an allmulti mode, so we go
+        * into promiscuous mode and let the upper levels deal. */
+       if ( (dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) ||
+            (dev->mc_count > MAX_MULTICAST(priv)) ) {
+               promisc = 1;
+               mc_count = 0;
+       } else {
+               promisc = 0;
+               mc_count = dev->mc_count;
+       }
+
+       if (promisc != priv->promiscuous) {
+               err = hermes_write_wordrec(hw, USER_BAP,
+                                          HERMES_RID_CNFPROMISCUOUSMODE,
+                                          promisc);
+               if (err) {
+                       printk(KERN_ERR "%s: Error %d setting PROMISCUOUSMODE to 1.\n",
+                              dev->name, err);
+               } else 
+                       priv->promiscuous = promisc;
+       }
+
+       if (! promisc && (mc_count || priv->mc_count) ) {
+               struct dev_mc_list *p = dev->mc_list;
+               struct hermes_multicast mclist;
+               int i;
+
+               for (i = 0; i < mc_count; i++) {
+                       /* paranoia: is list shorter than mc_count? */
+                       BUG_ON(! p);
+                       /* paranoia: bad address size in list? */
+                       BUG_ON(p->dmi_addrlen != ETH_ALEN);
+                       
+                       memcpy(mclist.addr[i], p->dmi_addr, ETH_ALEN);
+                       p = p->next;
+               }
+               
+               if (p)
+                       printk(KERN_WARNING "%s: Multicast list is "
+                              "longer than mc_count\n", dev->name);
+
+               err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFGROUPADDRESSES,
+                                      HERMES_BYTES_TO_RECLEN(priv->mc_count * ETH_ALEN),
+                                      &mclist);
+               if (err)
+                       printk(KERN_ERR "%s: Error %d setting multicast list.\n",
+                              dev->name, err);
+               else
+                       priv->mc_count = mc_count;
+       }
+
+       /* Since we can set the promiscuous flag when it wasn't asked
+          for, make sure the net_device knows about it. */
+       if (priv->promiscuous)
+               dev->flags |= IFF_PROMISC;
+       else
+               dev->flags &= ~IFF_PROMISC;
+}
+
+/* This must be called from user context, without locks held - use
+ * schedule_work() */
+static void orinoco_reset(struct work_struct *work)
+{
+       struct orinoco_private *priv =
+               container_of(work, struct orinoco_private, reset_work);
+       struct net_device *dev = priv->ndev;
+       struct hermes *hw = &priv->hw;
+       int err;
+       unsigned long flags;
+
+       if (orinoco_lock(priv, &flags) != 0)
+               /* When the hardware becomes available again, whatever
+                * detects that is responsible for re-initializing
+                * it. So no need for anything further */
+               return;
+
+       netif_stop_queue(dev);
+
+       /* Shut off interrupts.  Depending on what state the hardware
+        * is in, this might not work, but we'll try anyway */
+       hermes_set_irqmask(hw, 0);
+       hermes_write_regn(hw, EVACK, 0xffff);
+
+       priv->hw_unavailable++;
+       priv->last_linkstatus = 0xffff; /* firmware will have to reassociate */
+       netif_carrier_off(dev);
+
+       orinoco_unlock(priv, &flags);
+
+       /* Scanning support: Cleanup of driver struct */
+       kfree(priv->scan_result);
+       priv->scan_result = NULL;
+       priv->scan_inprogress = 0;
+
+       if (priv->hard_reset) {
+               err = (*priv->hard_reset)(priv);
+               if (err) {
+                       printk(KERN_ERR "%s: orinoco_reset: Error %d "
+                              "performing hard reset\n", dev->name, err);
+                       goto disable;
+               }
+       }
+
+       err = orinoco_reinit_firmware(dev);
+       if (err) {
+               printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",
+                      dev->name, err);
+               goto disable;
+       }
+
+       spin_lock_irq(&priv->lock); /* This has to be called from user context */
+
+       priv->hw_unavailable--;
+
+       /* priv->open or priv->hw_unavailable might have changed while
+        * we dropped the lock */
+       if (priv->open && (! priv->hw_unavailable)) {
+               err = __orinoco_up(dev);
+               if (err) {
+                       printk(KERN_ERR "%s: orinoco_reset: Error %d reenabling card\n",
+                              dev->name, err);
+               } else
+                       dev->trans_start = jiffies;
+       }
+
+       spin_unlock_irq(&priv->lock);
+
+       return;
+ disable:
+       hermes_set_irqmask(hw, 0);
+       netif_device_detach(dev);
+       printk(KERN_ERR "%s: Device has been disabled!\n", dev->name);
+}
+
+/********************************************************************/
+/* Interrupt handler                                                */
+/********************************************************************/
+
+static void __orinoco_ev_tick(struct net_device *dev, hermes_t *hw)
+{
+       printk(KERN_DEBUG "%s: TICK\n", dev->name);
+}
+
+static void __orinoco_ev_wterr(struct net_device *dev, hermes_t *hw)
+{
+       /* This seems to happen a fair bit under load, but ignoring it
+          seems to work fine...*/
+       printk(KERN_DEBUG "%s: MAC controller error (WTERR). Ignoring.\n",
+              dev->name);
+}
+
+irqreturn_t orinoco_interrupt(int irq, void *dev_id)
+{
+       struct net_device *dev = dev_id;
+       struct orinoco_private *priv = netdev_priv(dev);
+       hermes_t *hw = &priv->hw;
+       int count = MAX_IRQLOOPS_PER_IRQ;
+       u16 evstat, events;
+       /* These are used to detect a runaway interrupt situation */
+       /* If we get more than MAX_IRQLOOPS_PER_JIFFY iterations in a jiffy,
+        * we panic and shut down the hardware */
+       static int last_irq_jiffy = 0; /* jiffies value the last time
+                                       * we were called */
+       static int loops_this_jiffy = 0;
+       unsigned long flags;
+
+       if (orinoco_lock(priv, &flags) != 0) {
+               /* If hw is unavailable - we don't know if the irq was
+                * for us or not */
+               return IRQ_HANDLED;
+       }
 
-       stats->tx_packets++;
+       evstat = hermes_read_regn(hw, EVSTAT);
+       events = evstat & hw->inten;
+       if (! events) {
+               orinoco_unlock(priv, &flags);
+               return IRQ_NONE;
+       }
+       
+       if (jiffies != last_irq_jiffy)
+               loops_this_jiffy = 0;
+       last_irq_jiffy = jiffies;
 
-       hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);
-}
+       while (events && count--) {
+               if (++loops_this_jiffy > MAX_IRQLOOPS_PER_JIFFY) {
+                       printk(KERN_WARNING "%s: IRQ handler is looping too "
+                              "much! Resetting.\n", dev->name);
+                       /* Disable interrupts for now */
+                       hermes_set_irqmask(hw, 0);
+                       schedule_work(&priv->reset_work);
+                       break;
+               }
 
-static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
+               /* Check the card hasn't been removed */
+               if (! hermes_present(hw)) {
+                       DEBUG(0, "orinoco_interrupt(): card removed\n");
+                       break;
+               }
 
-       u16 fid = hermes_read_regn(hw, ALLOCFID);
+               if (events & HERMES_EV_TICK)
+                       __orinoco_ev_tick(dev, hw);
+               if (events & HERMES_EV_WTERR)
+                       __orinoco_ev_wterr(dev, hw);
+               if (events & HERMES_EV_INFDROP)
+                       __orinoco_ev_infdrop(dev, hw);
+               if (events & HERMES_EV_INFO)
+                       __orinoco_ev_info(dev, hw);
+               if (events & HERMES_EV_RX)
+                       __orinoco_ev_rx(dev, hw);
+               if (events & HERMES_EV_TXEXC)
+                       __orinoco_ev_txexc(dev, hw);
+               if (events & HERMES_EV_TX)
+                       __orinoco_ev_tx(dev, hw);
+               if (events & HERMES_EV_ALLOC)
+                       __orinoco_ev_alloc(dev, hw);
+               
+               hermes_write_regn(hw, EVACK, evstat);
 
-       if (fid != priv->txfid) {
-               if (fid != DUMMY_FID)
-                       printk(KERN_WARNING "%s: Allocate event on unexpected fid (%04X)\n",
-                              dev->name, fid);
-               return;
-       } else {
-               netif_wake_queue(dev);
-       }
+               evstat = hermes_read_regn(hw, EVSTAT);
+               events = evstat & hw->inten;
+       };
 
-       hermes_write_regn(hw, ALLOCFID, DUMMY_FID);
+       orinoco_unlock(priv, &flags);
+       return IRQ_HANDLED;
 }
 
-struct sta_id {
+/********************************************************************/
+/* Initialization                                                   */
+/********************************************************************/
+
+struct comp_id {
        u16 id, variant, major, minor;
 } __attribute__ ((packed));
 
-static int determine_firmware_type(struct net_device *dev, struct sta_id *sta_id)
+static inline fwtype_t determine_firmware_type(struct comp_id *nic_id)
 {
-       /* FIXME: this is fundamentally broken */
-       unsigned int firmver = ((u32)sta_id->major << 16) | sta_id->minor;
-       
-       if (sta_id->variant == 1)
+       if (nic_id->id < 0x8000)
                return FIRMWARE_TYPE_AGERE;
-       else if ((sta_id->variant == 2) &&
-                  ((firmver == 0x10001) || (firmver == 0x20001)))
+       else if (nic_id->id == 0x8000 && nic_id->major == 0)
                return FIRMWARE_TYPE_SYMBOL;
        else
                return FIRMWARE_TYPE_INTERSIL;
 }
 
-static void determine_firmware(struct net_device *dev)
+/* Set priv->firmware type, determine firmware properties */
+static int determine_firmware(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
        int err;
-       struct sta_id sta_id;
+       struct comp_id nic_id, sta_id;
        unsigned int firmver;
        char tmp[SYMBOL_MAX_VER_LEN+1];
 
+       /* Get the hardware version */
+       err = HERMES_READ_RECORD(hw, USER_BAP, HERMES_RID_NICID, &nic_id);
+       if (err) {
+               printk(KERN_ERR "%s: Cannot read hardware identity: error %d\n",
+                      dev->name, err);
+               return err;
+       }
+
+       le16_to_cpus(&nic_id.id);
+       le16_to_cpus(&nic_id.variant);
+       le16_to_cpus(&nic_id.major);
+       le16_to_cpus(&nic_id.minor);
+       printk(KERN_DEBUG "%s: Hardware identity %04x:%04x:%04x:%04x\n",
+              dev->name, nic_id.id, nic_id.variant,
+              nic_id.major, nic_id.minor);
+
+       priv->firmware_type = determine_firmware_type(&nic_id);
+
        /* Get the firmware version */
        err = HERMES_READ_RECORD(hw, USER_BAP, HERMES_RID_STAID, &sta_id);
        if (err) {
-               printk(KERN_WARNING "%s: Error %d reading firmware info. Wildly guessing capabilities...\n",
+               printk(KERN_ERR "%s: Cannot read station identity: error %d\n",
                       dev->name, err);
-               memset(&sta_id, 0, sizeof(sta_id));
+               return err;
        }
+
        le16_to_cpus(&sta_id.id);
        le16_to_cpus(&sta_id.variant);
        le16_to_cpus(&sta_id.major);
        le16_to_cpus(&sta_id.minor);
-
-       printk(KERN_DEBUG "%s: Station identity %04x:%04x:%04x:%04x\n",
+       printk(KERN_DEBUG "%s: Station identity  %04x:%04x:%04x:%04x\n",
               dev->name, sta_id.id, sta_id.variant,
               sta_id.major, sta_id.minor);
 
-       if (! priv->firmware_type)
-               priv->firmware_type = determine_firmware_type(dev, &sta_id);
+       switch (sta_id.id) {
+       case 0x15:
+               printk(KERN_ERR "%s: Primary firmware is active\n",
+                      dev->name);
+               return -ENODEV;
+       case 0x14b:
+               printk(KERN_ERR "%s: Tertiary firmware is active\n",
+                      dev->name);
+               return -ENODEV;
+       case 0x1f:      /* Intersil, Agere, Symbol Spectrum24 */
+       case 0x21:      /* Symbol Spectrum24 Trilogy */
+               break;
+       default:
+               printk(KERN_NOTICE "%s: Unknown station ID, please report\n",
+                      dev->name);
+               break;
+       }
 
        /* Default capabilities */
        priv->has_sensitivity = 1;
@@ -1919,7 +2119,6 @@ static void determine_firmware(struct net_device *dev)
        priv->has_preamble = 0;
        priv->has_port3 = 1;
        priv->has_ibss = 1;
-       priv->has_ibss_any = 0;
        priv->has_wep = 0;
        priv->has_big_wep = 0;
 
@@ -1928,20 +2127,20 @@ static void determine_firmware(struct net_device *dev)
        case FIRMWARE_TYPE_AGERE:
                /* Lucent Wavelan IEEE, Lucent Orinoco, Cabletron RoamAbout,
                   ELSA, Melco, HP, IBM, Dell 1150, Compaq 110/210 */
-               printk(KERN_DEBUG "%s: Looks like a Lucent/Agere firmware "
-                      "version %d.%02d\n", dev->name,
-                      sta_id.major, sta_id.minor);
+               snprintf(priv->fw_name, sizeof(priv->fw_name) - 1,
+                        "Lucent/Agere %d.%02d", sta_id.major, sta_id.minor);
 
                firmver = ((unsigned long)sta_id.major << 16) | sta_id.minor;
 
                priv->has_ibss = (firmver >= 0x60006);
-               priv->has_ibss_any = (firmver >= 0x60010);
                priv->has_wep = (firmver >= 0x40020);
                priv->has_big_wep = 1; /* FIXME: this is wrong - how do we tell
                                          Gold cards from the others? */
                priv->has_mwo = (firmver >= 0x60000);
                priv->has_pm = (firmver >= 0x40020); /* Don't work in 7.52 ? */
                priv->ibss_port = 1;
+               priv->has_hostscan = (firmver >= 0x8000a);
+               priv->broken_monitor = (firmver >= 0x80000);
 
                /* Tested with Agere firmware :
                 *      1.16 ; 4.08 ; 4.52 ; 6.04 ; 6.16 ; 7.28 => Jean II
@@ -1974,16 +2173,21 @@ static void determine_firmware(struct net_device *dev)
                        tmp[SYMBOL_MAX_VER_LEN] = '\0';
                }
 
-               printk(KERN_DEBUG "%s: Looks like a Symbol firmware "
-                      "version [%s] (parsing to %X)\n", dev->name,
-                      tmp, firmver);
+               snprintf(priv->fw_name, sizeof(priv->fw_name) - 1,
+                        "Symbol %s", tmp);
 
                priv->has_ibss = (firmver >= 0x20000);
                priv->has_wep = (firmver >= 0x15012);
                priv->has_big_wep = (firmver >= 0x20000);
-               priv->has_pm = (firmver >= 0x20000) && (firmver < 0x22000);
+               priv->has_pm = (firmver >= 0x20000 && firmver < 0x22000) || 
+                              (firmver >= 0x29000 && firmver < 0x30000) ||
+                              firmver >= 0x31000;
                priv->has_preamble = (firmver >= 0x20000);
                priv->ibss_port = 4;
+               priv->broken_disableport = (firmver == 0x25013) ||
+                                          (firmver >= 0x30000 && firmver <= 0x31000);
+               priv->has_hostscan = (firmver >= 0x31001) ||
+                                    (firmver >= 0x29057 && firmver < 0x30000);
                /* Tested with Intel firmware : 0x20015 => Jean II */
                /* Tested with 3Com firmware : 0x15012 & 0x22001 => Jean II */
                break;
@@ -1993,9 +2197,9 @@ static void determine_firmware(struct net_device *dev)
                 * different and less well tested */
                /* D-Link MAC : 00:40:05:* */
                /* Addtron MAC : 00:90:D1:* */
-               printk(KERN_DEBUG "%s: Looks like an Intersil firmware "
-                      "version %d.%d.%d\n", dev->name,
-                      sta_id.major, sta_id.minor, sta_id.variant);
+               snprintf(priv->fw_name, sizeof(priv->fw_name) - 1,
+                        "Intersil %d.%d.%d", sta_id.major, sta_id.minor,
+                        sta_id.variant);
 
                firmver = ((unsigned long)sta_id.major << 16) |
                        ((unsigned long)sta_id.minor << 8) | sta_id.variant;
@@ -2003,6 +2207,7 @@ static void determine_firmware(struct net_device *dev)
                priv->has_ibss = (firmver >= 0x000700); /* FIXME */
                priv->has_big_wep = priv->has_wep = (firmver >= 0x000800);
                priv->has_pm = (firmver >= 0x000700);
+               priv->has_hostscan = (firmver >= 0x010301);
 
                if (firmver >= 0x000800)
                        priv->ibss_port = 0;
@@ -2013,17 +2218,14 @@ static void determine_firmware(struct net_device *dev)
                        priv->ibss_port = 1;
                }
                break;
-       default:
-               break;
        }
-}
+       printk(KERN_DEBUG "%s: Firmware determined as %s\n", dev->name,
+              priv->fw_name);
 
-/*
- * struct net_device methods
- */
+       return 0;
+}
 
-static int
-orinoco_init(struct net_device *dev)
+static int orinoco_init(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
@@ -2032,11 +2234,9 @@ orinoco_init(struct net_device *dev)
        u16 reclen;
        int len;
 
-       TRACE_ENTER(dev->name);
-
        /* No need to lock, the hw_unavailable flag is already set in
         * alloc_orinocodev() */
-       priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
+       priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;
 
        /* Initialize the firmware */
        err = hermes_init(hw);
@@ -2046,7 +2246,12 @@ orinoco_init(struct net_device *dev)
                goto out;
        }
 
-       determine_firmware(dev);
+       err = determine_firmware(dev);
+       if (err != 0) {
+               printk(KERN_ERR "%s: Incompatible firmware, aborting\n",
+                      dev->name);
+               goto out;
+       }
 
        if (priv->has_port3)
                printk(KERN_DEBUG "%s: Ad-hoc demo mode supported\n", dev->name);
@@ -2092,6 +2297,13 @@ orinoco_init(struct net_device *dev)
 
        printk(KERN_DEBUG "%s: Station name \"%s\"\n", dev->name, priv->nick);
 
+       err = orinoco_allocate_fid(dev);
+       if (err) {
+               printk(KERN_ERR "%s: failed to allocate NIC buffer!\n",
+                      dev->name);
+               goto out;
+       }
+
        /* Get allowed channels */
        err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CHANNELLIST,
                                  &priv->channel_mask);
@@ -2112,7 +2324,8 @@ orinoco_init(struct net_device *dev)
        err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,
                                  &priv->rts_thresh);
        if (err) {
-               printk(KERN_ERR "%s: failed to read RTS threshold!\n", dev->name);
+               printk(KERN_ERR "%s: failed to read RTS threshold!\n",
+                      dev->name);
                goto out;
        }
 
@@ -2125,7 +2338,8 @@ orinoco_init(struct net_device *dev)
                err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,
                                          &priv->frag_thresh);
        if (err) {
-               printk(KERN_ERR "%s: failed to read fragmentation settings!\n", dev->name);
+               printk(KERN_ERR "%s: failed to read fragmentation settings!\n",
+                      dev->name);
                goto out;
        }
 
@@ -2153,7 +2367,8 @@ orinoco_init(struct net_device *dev)
 
        /* Preamble setup */
        if (priv->has_preamble) {
-               err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFPREAMBLE_SYMBOL,
+               err = hermes_read_wordrec(hw, USER_BAP,
+                                         HERMES_RID_CNFPREAMBLE_SYMBOL,
                                          &priv->preamble);
                if (err)
                        goto out;
@@ -2164,31 +2379,12 @@ orinoco_init(struct net_device *dev)
        /* By default use IEEE/IBSS ad-hoc mode if we have it */
        priv->prefer_port3 = priv->has_port3 && (! priv->has_ibss);
        set_port_type(priv);
-       priv->channel = 10; /* default channel, more-or-less arbitrary */
+       priv->channel = 0; /* use firmware default */
 
        priv->promiscuous = 0;
        priv->wep_on = 0;
        priv->tx_key = 0;
 
-       err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-       if (err == -EIO) {
-               /* Try workaround for old Symbol firmware bug */
-               printk(KERN_WARNING "%s: firmware ALLOC bug detected "
-                      "(old Symbol firmware?). Trying to work around... ",
-                      dev->name);
-               
-               priv->nicbuf_size = TX_NICBUF_SIZE_BUG;
-               err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-               if (err)
-                       printk("failed!\n");
-               else
-                       printk("ok.\n");
-       }
-       if (err) {
-               printk("%s: Error %d allocating Tx buffer\n", dev->name, err);
-               goto out;
-       }
-
        /* Make the hardware available, as long as it hasn't been
         * removed elsewhere (e.g. by PCMCIA hot unplug) */
        spin_lock_irq(&priv->lock);
@@ -2198,507 +2394,470 @@ orinoco_init(struct net_device *dev)
        printk(KERN_DEBUG "%s: ready\n", dev->name);
 
  out:
-       TRACE_EXIT(dev->name);
        return err;
 }
 
-struct net_device_stats *
-orinoco_get_stats(struct net_device *dev)
+struct net_device *alloc_orinocodev(int sizeof_card,
+                                   int (*hard_reset)(struct orinoco_private *))
 {
-       struct orinoco_private *priv = netdev_priv(dev);
-       
-       return &priv->stats;
+       struct net_device *dev;
+       struct orinoco_private *priv;
+
+       dev = alloc_etherdev(sizeof(struct orinoco_private) + sizeof_card);
+       if (! dev)
+               return NULL;
+       priv = netdev_priv(dev);
+       priv->ndev = dev;
+       if (sizeof_card)
+               priv->card = (void *)((unsigned long)priv
+                                     + sizeof(struct orinoco_private));
+       else
+               priv->card = NULL;
+
+       /* Setup / override net_device fields */
+       dev->init = orinoco_init;
+       dev->hard_start_xmit = orinoco_xmit;
+       dev->tx_timeout = orinoco_tx_timeout;
+       dev->watchdog_timeo = HZ; /* 1 second timeout */
+       dev->get_stats = orinoco_get_stats;
+       dev->ethtool_ops = &orinoco_ethtool_ops;
+       dev->wireless_handlers = (struct iw_handler_def *)&orinoco_handler_def;
+#ifdef WIRELESS_SPY
+       priv->wireless_data.spy_data = &priv->spy_data;
+       dev->wireless_data = &priv->wireless_data;
+#endif
+       dev->change_mtu = orinoco_change_mtu;
+       dev->set_multicast_list = orinoco_set_multicast_list;
+       /* we use the default eth_mac_addr for setting the MAC addr */
+
+       /* Set up default callbacks */
+       dev->open = orinoco_open;
+       dev->stop = orinoco_stop;
+       priv->hard_reset = hard_reset;
+
+       spin_lock_init(&priv->lock);
+       priv->open = 0;
+       priv->hw_unavailable = 1; /* orinoco_init() must clear this
+                                  * before anything else touches the
+                                  * hardware */
+       INIT_WORK(&priv->reset_work, orinoco_reset);
+       INIT_WORK(&priv->join_work, orinoco_join_ap);
+       INIT_WORK(&priv->wevent_work, orinoco_send_wevents);
+
+       netif_carrier_off(dev);
+       priv->last_linkstatus = 0xffff;
+
+       return dev;
+
 }
 
-struct iw_statistics *
-orinoco_get_wireless_stats(struct net_device *dev)
+void free_orinocodev(struct net_device *dev)
 {
        struct orinoco_private *priv = netdev_priv(dev);
+
+       kfree(priv->scan_result);
+       free_netdev(dev);
+}
+
+/********************************************************************/
+/* Wireless extensions                                              */
+/********************************************************************/
+
+/* Return : < 0 -> error code ; >= 0 -> length */
+static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
+                               char buf[IW_ESSID_MAX_SIZE+1])
+{
        hermes_t *hw = &priv->hw;
-       struct iw_statistics *wstats = &priv->wstats;
        int err = 0;
+       struct hermes_idstring essidbuf;
+       char *p = (char *)(&essidbuf.val);
+       int len;
        unsigned long flags;
 
-       if (! netif_device_present(dev)) {
-               printk(KERN_WARNING "%s: get_wireless_stats() called while device not present\n",
-                      dev->name);
-               return NULL; /* FIXME: Can we do better than this? */
-       }
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return NULL; /* FIXME: Erg, we've been signalled, how
-                             * do we propagate this back up? */
+       if (strlen(priv->desired_essid) > 0) {
+               /* We read the desired SSID from the hardware rather
+                  than from priv->desired_essid, just in case the
+                  firmware is allowed to change it on us. I'm not
+                  sure about this */
+               /* My guess is that the OWNSSID should always be whatever
+                * we set to the card, whereas CURRENT_SSID is the one that
+                * may change... - Jean II */
+               u16 rid;
 
-       if (priv->iw_mode == IW_MODE_ADHOC) {
-               memset(&wstats->qual, 0, sizeof(wstats->qual));
-               /* If a spy address is defined, we report stats of the
-                * first spy address - Jean II */
-               if (SPY_NUMBER(priv)) {
-                       wstats->qual.qual = priv->spy_stat[0].qual;
-                       wstats->qual.level = priv->spy_stat[0].level;
-                       wstats->qual.noise = priv->spy_stat[0].noise;
-                       wstats->qual.updated = priv->spy_stat[0].updated;
-               }
-       } else {
-               struct {
-                       u16 qual, signal, noise;
-               } __attribute__ ((packed)) cq;
+               *active = 1;
 
-               err = HERMES_READ_RECORD(hw, USER_BAP,
-                                        HERMES_RID_COMMSQUALITY, &cq);
+               rid = (priv->port_type == 3) ? HERMES_RID_CNFOWNSSID :
+                       HERMES_RID_CNFDESIREDSSID;
                
-               wstats->qual.qual = (int)le16_to_cpu(cq.qual);
-               wstats->qual.level = (int)le16_to_cpu(cq.signal) - 0x95;
-               wstats->qual.noise = (int)le16_to_cpu(cq.noise) - 0x95;
-               wstats->qual.updated = 7;
+               err = hermes_read_ltv(hw, USER_BAP, rid, sizeof(essidbuf),
+                                     NULL, &essidbuf);
+               if (err)
+                       goto fail_unlock;
+       } else {
+               *active = 0;
+
+               err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTSSID,
+                                     sizeof(essidbuf), NULL, &essidbuf);
+               if (err)
+                       goto fail_unlock;
        }
 
-       /* We can't really wait for the tallies inquiry command to
-        * complete, so we just use the previous results and trigger
-        * a new tallies inquiry command for next time - Jean II */
-       /* FIXME: We're in user context (I think?), so we should just
-           wait for the tallies to come through */
-       err = hermes_inquire(hw, HERMES_INQ_TALLIES);
-               
+       len = le16_to_cpu(essidbuf.len);
+       BUG_ON(len > IW_ESSID_MAX_SIZE);
+
+       memset(buf, 0, IW_ESSID_MAX_SIZE);
+       memcpy(buf, p, len);
+       err = len;
+
+ fail_unlock:
        orinoco_unlock(priv, &flags);
 
-       if (err)
-               return NULL;
-               
-       return wstats;
+       return err;       
 }
 
-static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac,
-                                   int level, int noise)
+static long orinoco_hw_get_freq(struct orinoco_private *priv)
 {
-       struct orinoco_private *priv = netdev_priv(dev);
-       int i;
+       
+       hermes_t *hw = &priv->hw;
+       int err = 0;
+       u16 channel;
+       long freq = 0;
+       unsigned long flags;
+
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+       
+       err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CURRENTCHANNEL, &channel);
+       if (err)
+               goto out;
+
+       /* Intersil firmware 1.3.5 returns 0 when the interface is down */
+       if (channel == 0) {
+               err = -EBUSY;
+               goto out;
+       }
+
+       if ( (channel < 1) || (channel > NUM_CHANNELS) ) {
+               printk(KERN_WARNING "%s: Channel out of range (%d)!\n",
+                      priv->ndev->name, channel);
+               err = -EBUSY;
+               goto out;
 
-       /* Gather wireless spy statistics: for each packet, compare the
-        * source address with out list, and if match, get the stats... */
-       for (i = 0; i < priv->spy_number; i++)
-               if (!memcmp(mac, priv->spy_address[i], ETH_ALEN)) {
-                       priv->spy_stat[i].level = level - 0x95;
-                       priv->spy_stat[i].noise = noise - 0x95;
-                       priv->spy_stat[i].qual = (level > noise) ? (level - noise) : 0;
-                       priv->spy_stat[i].updated = 7;
-               }
-}
+       }
+       freq = channel_frequency[channel-1] * 100000;
 
-void
-orinoco_stat_gather(struct net_device *dev,
-                   struct sk_buff *skb,
-                   struct hermes_rx_descriptor *desc)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
+ out:
+       orinoco_unlock(priv, &flags);
 
-       /* Using spy support with lots of Rx packets, like in an
-        * infrastructure (AP), will really slow down everything, because
-        * the MAC address must be compared to each entry of the spy list.
-        * If the user really asks for it (set some address in the
-        * spy list), we do it, but he will pay the price.
-        * Note that to get here, you need both WIRELESS_SPY
-        * compiled in AND some addresses in the list !!!
-        */
-       /* Note : gcc will optimise the whole section away if
-        * WIRELESS_SPY is not defined... - Jean II */
-       if (SPY_NUMBER(priv)) {
-               orinoco_spy_gather(dev, skb->mac.raw + ETH_ALEN,
-                                  desc->signal, desc->silence);
-       }
+       if (err > 0)
+               err = -EBUSY;
+       return err ? err : freq;
 }
 
-static int
-orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
+static int orinoco_hw_get_bitratelist(struct orinoco_private *priv,
+                                     int *numrates, s32 *rates, int max)
 {
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct net_device_stats *stats = &priv->stats;
        hermes_t *hw = &priv->hw;
+       struct hermes_idstring list;
+       unsigned char *p = (unsigned char *)&list.val;
        int err = 0;
-       u16 txfid = priv->txfid;
-       char *p;
-       struct ethhdr *eh;
-       int len, data_len, data_off;
-       struct hermes_tx_descriptor desc;
+       int num;
+       int i;
        unsigned long flags;
 
-       TRACE_ENTER(dev->name);
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       if (! netif_running(dev)) {
-               printk(KERN_ERR "%s: Tx on stopped device!\n",
-                      dev->name);
-               TRACE_EXIT(dev->name);
-               return 1;
-       }
-       
-       if (netif_queue_stopped(dev)) {
-               printk(KERN_DEBUG "%s: Tx while transmitter busy!\n", 
-                      dev->name);
-               TRACE_EXIT(dev->name);
-               return 1;
-       }
+       err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_SUPPORTEDDATARATES,
+                             sizeof(list), NULL, &list);
+       orinoco_unlock(priv, &flags);
+
+       if (err)
+               return err;
        
-       if (orinoco_lock(priv, &flags) != 0) {
-               printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n",
-                      dev->name);
-               TRACE_EXIT(dev->name);
-/*             BUG(); */
-               return 1;
-       }
+       num = le16_to_cpu(list.len);
+       *numrates = num;
+       num = min(num, max);
 
-       if (! priv->connected) {
-               /* Oops, the firmware hasn't established a connection,
-                   silently drop the packet (this seems to be the
-                   safest approach). */
-               stats->tx_errors++;
-               orinoco_unlock(priv, &flags);
-               dev_kfree_skb(skb);
-               TRACE_EXIT(dev->name);
-               return 0;
+       for (i = 0; i < num; i++) {
+               rates[i] = (p[i] & 0x7f) * 500000; /* convert to bps */
        }
 
-       /* Length of the packet body */
-       /* FIXME: what if the skb is smaller than this? */
-       len = max_t(int,skb->len - ETH_HLEN, ETH_ZLEN - ETH_HLEN);
+       return 0;
+}
 
-       eh = (struct ethhdr *)skb->data;
+static int orinoco_ioctl_getname(struct net_device *dev,
+                                struct iw_request_info *info,
+                                char *name,
+                                char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int numrates;
+       int err;
 
-       memset(&desc, 0, sizeof(desc));
-       desc.tx_control = cpu_to_le16(HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX);
-       err = hermes_bap_pwrite(hw, USER_BAP, &desc, sizeof(desc), txfid, 0);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d writing Tx descriptor to BAP\n",
-                      dev->name, err);
-               stats->tx_errors++;
-               goto fail;
-       }
+       err = orinoco_hw_get_bitratelist(priv, &numrates, NULL, 0);
 
-       /* Clear the 802.11 header and data length fields - some
-        * firmwares (e.g. Lucent/Agere 8.xx) appear to get confused
-        * if this isn't done. */
-       hermes_clear_words(hw, HERMES_DATA0,
-                          HERMES_802_3_OFFSET - HERMES_802_11_OFFSET);
+       if (!err && (numrates > 2))
+               strcpy(name, "IEEE 802.11b");
+       else
+               strcpy(name, "IEEE 802.11-DS");
 
-       /* Encapsulate Ethernet-II frames */
-       if (ntohs(eh->h_proto) > 1500) { /* Ethernet-II frame */
-               struct header_struct hdr;
-               data_len = len;
-               data_off = HERMES_802_3_OFFSET + sizeof(hdr);
-               p = skb->data + ETH_HLEN;
-
-               /* 802.3 header */
-               memcpy(hdr.dest, eh->h_dest, ETH_ALEN);
-               memcpy(hdr.src, eh->h_source, ETH_ALEN);
-               hdr.len = htons(data_len + ENCAPS_OVERHEAD);
-               
-               /* 802.2 header */
-               memcpy(&hdr.dsap, &encaps_hdr, sizeof(encaps_hdr));
-                       
-               hdr.ethertype = eh->h_proto;
-               err  = hermes_bap_pwrite(hw, USER_BAP, &hdr, sizeof(hdr),
-                                        txfid, HERMES_802_3_OFFSET);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d writing packet header to BAP\n",
-                              dev->name, err);
-                       stats->tx_errors++;
-                       goto fail;
+       return 0;
+}
+
+static int orinoco_ioctl_setwap(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct sockaddr *ap_addr,
+                               char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int err = -EINPROGRESS;         /* Call commit handler */
+       unsigned long flags;
+       static const u8 off_addr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+       static const u8 any_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+
+       /* Enable automatic roaming - no sanity checks are needed */
+       if (memcmp(&ap_addr->sa_data, off_addr, ETH_ALEN) == 0 ||
+           memcmp(&ap_addr->sa_data, any_addr, ETH_ALEN) == 0) {
+               priv->bssid_fixed = 0;
+               memset(priv->desired_bssid, 0, ETH_ALEN);
+
+               /* "off" means keep existing connection */
+               if (ap_addr->sa_data[0] == 0) {
+                       __orinoco_hw_set_wap(priv);
+                       err = 0;
                }
-       } else { /* IEEE 802.3 frame */
-               data_len = len + ETH_HLEN;
-               data_off = HERMES_802_3_OFFSET;
-               p = skb->data;
+               goto out;
        }
 
-       /* Round up for odd length packets */
-       err = hermes_bap_pwrite(hw, USER_BAP, p, RUP_EVEN(data_len), txfid, data_off);
-       if (err) {
-               printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
-                      dev->name, err);
-               stats->tx_errors++;
-               goto fail;
+       if (priv->firmware_type == FIRMWARE_TYPE_AGERE) {
+               printk(KERN_WARNING "%s: Lucent/Agere firmware doesn't "
+                      "support manual roaming\n",
+                      dev->name);
+               err = -EOPNOTSUPP;
+               goto out;
        }
 
-       /* Finally, we actually initiate the send */
-       netif_stop_queue(dev);
-
-       err = hermes_docmd_wait(hw, HERMES_CMD_TX | HERMES_CMD_RECL, txfid, NULL);
-       if (err) {
-               netif_start_queue(dev);
-               printk(KERN_ERR "%s: Error %d transmitting packet\n", dev->name, err);
-               stats->tx_errors++;
-               goto fail;
+       if (priv->iw_mode != IW_MODE_INFRA) {
+               printk(KERN_WARNING "%s: Manual roaming supported only in "
+                      "managed mode\n", dev->name);
+               err = -EOPNOTSUPP;
+               goto out;
        }
 
-       dev->trans_start = jiffies;
-       stats->tx_bytes += data_off + data_len;
-
-       orinoco_unlock(priv, &flags);
-
-       dev_kfree_skb(skb);
-
-       TRACE_EXIT(dev->name);
+       /* Intersil firmware hangs without Desired ESSID */
+       if (priv->firmware_type == FIRMWARE_TYPE_INTERSIL &&
+           strlen(priv->desired_essid) == 0) {
+               printk(KERN_WARNING "%s: Desired ESSID must be set for "
+                      "manual roaming\n", dev->name);
+               err = -EOPNOTSUPP;
+               goto out;
+       }
 
-       return 0;
- fail:
-       TRACE_EXIT(dev->name);
+       /* Finally, enable manual roaming */
+       priv->bssid_fixed = 1;
+       memcpy(priv->desired_bssid, &ap_addr->sa_data, ETH_ALEN);
 
+ out:
        orinoco_unlock(priv, &flags);
        return err;
 }
 
-static void
-orinoco_tx_timeout(struct net_device *dev)
+static int orinoco_ioctl_getwap(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct sockaddr *ap_addr,
+                               char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       struct net_device_stats *stats = &priv->stats;
-       struct hermes *hw = &priv->hw;
 
-       printk(KERN_WARNING "%s: Tx timeout! "
-              "ALLOCFID=%04x, TXCOMPLFID=%04x, EVSTAT=%04x\n",
-              dev->name, hermes_read_regn(hw, ALLOCFID),
-              hermes_read_regn(hw, TXCOMPLFID), hermes_read_regn(hw, EVSTAT));
+       hermes_t *hw = &priv->hw;
+       int err = 0;
+       unsigned long flags;
 
-       stats->tx_errors++;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       schedule_work(&priv->reset_work);
+       ap_addr->sa_family = ARPHRD_ETHER;
+       err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID,
+                             ETH_ALEN, NULL, ap_addr->sa_data);
+
+       orinoco_unlock(priv, &flags);
+
+       return err;
 }
 
-static int
-orinoco_change_mtu(struct net_device *dev, int new_mtu)
+static int orinoco_ioctl_setmode(struct net_device *dev,
+                                struct iw_request_info *info,
+                                u32 *mode,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
+       int err = -EINPROGRESS;         /* Call commit handler */
+       unsigned long flags;
 
-       if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
-               return -EINVAL;
+       if (priv->iw_mode == *mode)
+               return 0;
 
-       if ( (new_mtu + ENCAPS_OVERHEAD + IEEE802_11_HLEN) >
-            (priv->nicbuf_size - ETH_HLEN) )
-               return -EINVAL;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       dev->mtu = new_mtu;
+       switch (*mode) {
+       case IW_MODE_ADHOC:
+               if (!priv->has_ibss && !priv->has_port3)
+                       err = -EOPNOTSUPP;
+               break;
 
-       return 0;
-}
+       case IW_MODE_INFRA:
+               break;
 
-/* FIXME: return int? */
-static void
-__orinoco_set_multicast_list(struct net_device *dev)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       hermes_t *hw = &priv->hw;
-       int err = 0;
-       int promisc, mc_count;
+       case IW_MODE_MONITOR:
+               if (priv->broken_monitor && !force_monitor) {
+                       printk(KERN_WARNING "%s: Monitor mode support is "
+                              "buggy in this firmware, not enabling\n",
+                              dev->name);
+                       err = -EOPNOTSUPP;
+               }
+               break;
 
-       /* The Hermes doesn't seem to have an allmulti mode, so we go
-        * into promiscuous mode and let the upper levels deal. */
-       if ( (dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) ||
-            (dev->mc_count > MAX_MULTICAST(priv)) ) {
-               promisc = 1;
-               mc_count = 0;
-       } else {
-               promisc = 0;
-               mc_count = dev->mc_count;
+       default:
+               err = -EOPNOTSUPP;
+               break;
        }
 
-       if (promisc != priv->promiscuous) {
-               err = hermes_write_wordrec(hw, USER_BAP,
-                                          HERMES_RID_CNFPROMISCUOUSMODE,
-                                          promisc);
-               if (err) {
-                       printk(KERN_ERR "%s: Error %d setting PROMISCUOUSMODE to 1.\n",
-                              dev->name, err);
-               } else 
-                       priv->promiscuous = promisc;
+       if (err == -EINPROGRESS) {
+               priv->iw_mode = *mode;
+               set_port_type(priv);
        }
 
-       if (! promisc && (mc_count || priv->mc_count) ) {
-               struct dev_mc_list *p = dev->mc_list;
-               hermes_multicast_t mclist;
-               int i;
+       orinoco_unlock(priv, &flags);
 
-               for (i = 0; i < mc_count; i++) {
-                       /* Paranoia: */
-                       if (! p)
-                               BUG(); /* Multicast list shorter than mc_count */
-                       if (p->dmi_addrlen != ETH_ALEN)
-                               BUG(); /* Bad address size in multicast list */
-                       
-                       memcpy(mclist.addr[i], p->dmi_addr, ETH_ALEN);
-                       p = p->next;
-               }
-               
-               if (p)
-                       printk(KERN_WARNING "Multicast list is longer than mc_count\n");
+       return err;
+}
 
-               err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFGROUPADDRESSES,
-                                      HERMES_BYTES_TO_RECLEN(priv->mc_count * ETH_ALEN),
-                                      &mclist);
-               if (err)
-                       printk(KERN_ERR "%s: Error %d setting multicast list.\n",
-                              dev->name, err);
-               else
-                       priv->mc_count = mc_count;
-       }
+static int orinoco_ioctl_getmode(struct net_device *dev,
+                                struct iw_request_info *info,
+                                u32 *mode,
+                                char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
 
-       /* Since we can set the promiscuous flag when it wasn't asked
-          for, make sure the net_device knows about it. */
-       if (priv->promiscuous)
-               dev->flags |= IFF_PROMISC;
-       else
-               dev->flags &= ~IFF_PROMISC;
+       *mode = priv->iw_mode;
+       return 0;
 }
 
-/********************************************************************/
-/* Wireless extensions support                                      */
-/********************************************************************/
-
-static int orinoco_ioctl_getiwrange(struct net_device *dev, struct iw_point *rrq)
+static int orinoco_ioctl_getiwrange(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   struct iw_point *rrq,
+                                   char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int err = 0;
-       int mode;
-       struct iw_range range;
+       struct iw_range *range = (struct iw_range *) extra;
        int numrates;
        int i, k;
-       unsigned long flags;
-
-       TRACE_ENTER(dev->name);
 
-       err = verify_area(VERIFY_WRITE, rrq->pointer, sizeof(range));
-       if (err)
-               return err;
-
-       rrq->length = sizeof(range);
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-
-       mode = priv->iw_mode;
-       orinoco_unlock(priv, &flags);
+       rrq->length = sizeof(struct iw_range);
+       memset(range, 0, sizeof(struct iw_range));
 
-       memset(&range, 0, sizeof(range));
-
-       /* Much of this shamelessly taken from wvlan_cs.c. No idea
-        * what it all means -dgibson */
-#if WIRELESS_EXT > 10
-       range.we_version_compiled = WIRELESS_EXT;
-       range.we_version_source = 11;
-#endif /* WIRELESS_EXT > 10 */
-
-       range.min_nwid = range.max_nwid = 0; /* We don't use nwids */
+       range->we_version_compiled = WIRELESS_EXT;
+       range->we_version_source = 14;
 
        /* Set available channels/frequencies */
-       range.num_channels = NUM_CHANNELS;
+       range->num_channels = NUM_CHANNELS;
        k = 0;
        for (i = 0; i < NUM_CHANNELS; i++) {
                if (priv->channel_mask & (1 << i)) {
-                       range.freq[k].i = i + 1;
-                       range.freq[k].m = channel_frequency[i] * 100000;
-                       range.freq[k].e = 1;
+                       range->freq[k].i = i + 1;
+                       range->freq[k].m = channel_frequency[i] * 100000;
+                       range->freq[k].e = 1;
                        k++;
                }
                
                if (k >= IW_MAX_FREQUENCIES)
                        break;
        }
-       range.num_frequency = k;
+       range->num_frequency = k;
+       range->sensitivity = 3;
 
-       range.sensitivity = 3;
+       if (priv->has_wep) {
+               range->max_encoding_tokens = ORINOCO_MAX_KEYS;
+               range->encoding_size[0] = SMALL_KEY_SIZE;
+               range->num_encoding_sizes = 1;
 
-       if ((mode == IW_MODE_ADHOC) && (priv->spy_number == 0)){
-               /* Quality stats meaningless in ad-hoc mode */
-               range.max_qual.qual = 0;
-               range.max_qual.level = 0;
-               range.max_qual.noise = 0;
-#if WIRELESS_EXT > 11
-               range.avg_qual.qual = 0;
-               range.avg_qual.level = 0;
-               range.avg_qual.noise = 0;
-#endif /* WIRELESS_EXT > 11 */
+               if (priv->has_big_wep) {
+                       range->encoding_size[1] = LARGE_KEY_SIZE;
+                       range->num_encoding_sizes = 2;
+               }
+       }
 
+       if ((priv->iw_mode == IW_MODE_ADHOC) && (!SPY_NUMBER(priv))){
+               /* Quality stats meaningless in ad-hoc mode */
        } else {
-               range.max_qual.qual = 0x8b - 0x2f;
-               range.max_qual.level = 0x2f - 0x95 - 1;
-               range.max_qual.noise = 0x2f - 0x95 - 1;
-#if WIRELESS_EXT > 11
+               range->max_qual.qual = 0x8b - 0x2f;
+               range->max_qual.level = 0x2f - 0x95 - 1;
+               range->max_qual.noise = 0x2f - 0x95 - 1;
                /* Need to get better values */
-               range.avg_qual.qual = 0x24;
-               range.avg_qual.level = 0xC2;
-               range.avg_qual.noise = 0x9E;
-#endif /* WIRELESS_EXT > 11 */
+               range->avg_qual.qual = 0x24;
+               range->avg_qual.level = 0xC2;
+               range->avg_qual.noise = 0x9E;
        }
 
        err = orinoco_hw_get_bitratelist(priv, &numrates,
-                                        range.bitrate, IW_MAX_BITRATES);
+                                        range->bitrate, IW_MAX_BITRATES);
        if (err)
                return err;
-       range.num_bitrates = numrates;
-       
+       range->num_bitrates = numrates;
+
        /* Set an indication of the max TCP throughput in bit/s that we can
         * expect using this interface. May be use for QoS stuff...
         * Jean II */
-       if(numrates > 2)
-               range.throughput = 5 * 1000 * 1000;     /* ~5 Mb/s */
+       if (numrates > 2)
+               range->throughput = 5 * 1000 * 1000;    /* ~5 Mb/s */
        else
-               range.throughput = 1.5 * 1000 * 1000;   /* ~1.5 Mb/s */
-
-       range.min_rts = 0;
-       range.max_rts = 2347;
-       range.min_frag = 256;
-       range.max_frag = 2346;
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-       if (priv->has_wep) {
-               range.max_encoding_tokens = ORINOCO_MAX_KEYS;
-
-               range.encoding_size[0] = SMALL_KEY_SIZE;
-               range.num_encoding_sizes = 1;
-
-               if (priv->has_big_wep) {
-                       range.encoding_size[1] = LARGE_KEY_SIZE;
-                       range.num_encoding_sizes = 2;
-               }
-       } else {
-               range.num_encoding_sizes = 0;
-               range.max_encoding_tokens = 0;
-       }
-       orinoco_unlock(priv, &flags);
-               
-       range.min_pmp = 0;
-       range.max_pmp = 65535000;
-       range.min_pmt = 0;
-       range.max_pmt = 65535 * 1000;   /* ??? */
-       range.pmp_flags = IW_POWER_PERIOD;
-       range.pmt_flags = IW_POWER_TIMEOUT;
-       range.pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_UNICAST_R;
-
-       range.num_txpower = 1;
-       range.txpower[0] = 15; /* 15dBm */
-       range.txpower_capa = IW_TXPOW_DBM;
-
-#if WIRELESS_EXT > 10
-       range.retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;
-       range.retry_flags = IW_RETRY_LIMIT;
-       range.r_time_flags = IW_RETRY_LIFETIME;
-       range.min_retry = 0;
-       range.max_retry = 65535;        /* ??? */
-       range.min_r_time = 0;
-       range.max_r_time = 65535 * 1000;        /* ??? */
-#endif /* WIRELESS_EXT > 10 */
-
-       if (copy_to_user(rrq->pointer, &range, sizeof(range)))
-               return -EFAULT;
-
-       TRACE_EXIT(dev->name);
+               range->throughput = 1.5 * 1000 * 1000;  /* ~1.5 Mb/s */
+
+       range->min_rts = 0;
+       range->max_rts = 2347;
+       range->min_frag = 256;
+       range->max_frag = 2346;
+
+       range->min_pmp = 0;
+       range->max_pmp = 65535000;
+       range->min_pmt = 0;
+       range->max_pmt = 65535 * 1000;  /* ??? */
+       range->pmp_flags = IW_POWER_PERIOD;
+       range->pmt_flags = IW_POWER_TIMEOUT;
+       range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_UNICAST_R;
+
+       range->retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;
+       range->retry_flags = IW_RETRY_LIMIT;
+       range->r_time_flags = IW_RETRY_LIFETIME;
+       range->min_retry = 0;
+       range->max_retry = 65535;       /* ??? */
+       range->min_r_time = 0;
+       range->max_r_time = 65535 * 1000;       /* ??? */
+
+       /* Event capability (kernel) */
+       IW_EVENT_CAPA_SET_KERNEL(range->event_capa);
+       /* Event capability (driver) */
+       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWTHRSPY);
+       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
+       IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);
+       IW_EVENT_CAPA_SET(range->event_capa, IWEVTXDROP);
 
        return 0;
 }
 
-static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *erq)
+static int orinoco_ioctl_setiwencode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_point *erq,
+                                    char *keybuf)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int index = (erq->flags & IW_ENCODE_INDEX) - 1;
@@ -2706,45 +2865,36 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er
        int enable = priv->wep_on;
        int restricted = priv->wep_restrict;
        u16 xlen = 0;
-       int err = 0;
-       char keybuf[ORINOCO_MAX_KEY_SIZE];
+       int err = -EINPROGRESS;         /* Call commit handler */
        unsigned long flags;
-       
+
+       if (! priv->has_wep)
+               return -EOPNOTSUPP;
+
        if (erq->pointer) {
-               /* We actually have a key to set */
-               if ( (erq->length < SMALL_KEY_SIZE) || (erq->length > ORINOCO_MAX_KEY_SIZE) )
-                       return -EINVAL;
-               
-               if (copy_from_user(keybuf, erq->pointer, erq->length))
-                       return -EFAULT;
+               /* We actually have a key to set - check its length */
+               if (erq->length > LARGE_KEY_SIZE)
+                       return -E2BIG;
+
+               if ( (erq->length > SMALL_KEY_SIZE) && !priv->has_big_wep )
+                       return -E2BIG;
        }
-       
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-       
-       if (erq->pointer) {
-               if (erq->length > ORINOCO_MAX_KEY_SIZE) {
-                       err = -E2BIG;
-                       goto out;
-               }
-               
-               if ( (erq->length > LARGE_KEY_SIZE)
-                    || ( ! priv->has_big_wep && (erq->length > SMALL_KEY_SIZE))  ) {
-                       err = -EINVAL;
-                       goto out;
-               }
-               
+
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+
+       if (erq->length > 0) {
                if ((index < 0) || (index >= ORINOCO_MAX_KEYS))
                        index = priv->tx_key;
-               
+
+               /* Adjust key length to a supported value */
                if (erq->length > SMALL_KEY_SIZE) {
                        xlen = LARGE_KEY_SIZE;
                } else if (erq->length > 0) {
                        xlen = SMALL_KEY_SIZE;
                } else
                        xlen = 0;
-               
+
                /* Switch on WEP if off */
                if ((!enable) && (xlen > 0)) {
                        setindex = index;
@@ -2768,43 +2918,54 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er
                        setindex = index;
                }
        }
-       
+
        if (erq->flags & IW_ENCODE_DISABLED)
                enable = 0;
-       /* Only for Prism2 & Symbol cards (so far) - Jean II */
        if (erq->flags & IW_ENCODE_OPEN)
                restricted = 0;
        if (erq->flags & IW_ENCODE_RESTRICTED)
                restricted = 1;
 
-       if (erq->pointer) {
+       if (erq->pointer && erq->length > 0) {
                priv->keys[index].len = cpu_to_le16(xlen);
-               memset(priv->keys[index].data, 0, sizeof(priv->keys[index].data));
+               memset(priv->keys[index].data, 0,
+                      sizeof(priv->keys[index].data));
                memcpy(priv->keys[index].data, keybuf, erq->length);
        }
        priv->tx_key = setindex;
+
+       /* Try fast key change if connected and only keys are changed */
+       if (priv->wep_on && enable && (priv->wep_restrict == restricted) &&
+           netif_carrier_ok(dev)) {
+               err = __orinoco_hw_setup_wepkeys(priv);
+               /* No need to commit if successful */
+               goto out;
+       }
+
        priv->wep_on = enable;
        priv->wep_restrict = restricted;
 
-       
  out:
        orinoco_unlock(priv, &flags);
 
        return err;
 }
 
-static int orinoco_ioctl_getiwencode(struct net_device *dev, struct iw_point *erq)
+static int orinoco_ioctl_getiwencode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    struct iw_point *erq,
+                                    char *keybuf)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int index = (erq->flags & IW_ENCODE_INDEX) - 1;
        u16 xlen = 0;
-       char keybuf[ORINOCO_MAX_KEY_SIZE];
-       int err;
        unsigned long flags;
-       
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+
+       if (! priv->has_wep)
+               return -EOPNOTSUPP;
+
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        if ((index < 0) || (index >= ORINOCO_MAX_KEYS))
                index = priv->tx_key;
@@ -2813,161 +2974,136 @@ static int orinoco_ioctl_getiwencode(struct net_device *dev, struct iw_point *er
        if (! priv->wep_on)
                erq->flags |= IW_ENCODE_DISABLED;
        erq->flags |= index + 1;
-       
-       /* Only for symbol cards - Jean II */
-       if (priv->firmware_type != FIRMWARE_TYPE_AGERE) {
-               if(priv->wep_restrict)
-                       erq->flags |= IW_ENCODE_RESTRICTED;
-               else
-                       erq->flags |= IW_ENCODE_OPEN;
-       }
+
+       if (priv->wep_restrict)
+               erq->flags |= IW_ENCODE_RESTRICTED;
+       else
+               erq->flags |= IW_ENCODE_OPEN;
 
        xlen = le16_to_cpu(priv->keys[index].len);
 
        erq->length = xlen;
 
-       if (erq->pointer) {
-               memcpy(keybuf, priv->keys[index].data, ORINOCO_MAX_KEY_SIZE);
-       }
-       
-       orinoco_unlock(priv, &flags);
-
-       if (erq->pointer) {
-               if (copy_to_user(erq->pointer, keybuf, xlen))
-                       return -EFAULT;
-       }
+       memcpy(keybuf, priv->keys[index].data, ORINOCO_MAX_KEY_SIZE);
 
+       orinoco_unlock(priv, &flags);
        return 0;
 }
 
-static int orinoco_ioctl_setessid(struct net_device *dev, struct iw_point *erq)
+static int orinoco_ioctl_setessid(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *erq,
+                                 char *essidbuf)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       char essidbuf[IW_ESSID_MAX_SIZE+1];
-       int err;
        unsigned long flags;
 
        /* Note : ESSID is ignored in Ad-Hoc demo mode, but we can set it
         * anyway... - Jean II */
 
-       memset(&essidbuf, 0, sizeof(essidbuf));
-
-       if (erq->flags) {
-               if (erq->length > IW_ESSID_MAX_SIZE)
-                       return -E2BIG;
-               
-               if (copy_from_user(&essidbuf, erq->pointer, erq->length))
-                       return -EFAULT;
+       /* Hum... Should not use Wireless Extension constant (may change),
+        * should use our own... - Jean II */
+       if (erq->length > IW_ESSID_MAX_SIZE)
+               return -E2BIG;
 
-               essidbuf[erq->length] = '\0';
-       }
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       /* NULL the string (for NULL termination & ESSID = ANY) - Jean II */
+       memset(priv->desired_essid, 0, sizeof(priv->desired_essid));
 
-       memcpy(priv->desired_essid, essidbuf, sizeof(priv->desired_essid));
+       /* If not ANY, get the new ESSID */
+       if (erq->flags) {
+               memcpy(priv->desired_essid, essidbuf, erq->length);
+       }
 
        orinoco_unlock(priv, &flags);
 
-       return 0;
+       return -EINPROGRESS;            /* Call commit handler */
 }
 
-static int orinoco_ioctl_getessid(struct net_device *dev, struct iw_point *erq)
+static int orinoco_ioctl_getessid(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *erq,
+                                 char *essidbuf)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       char essidbuf[IW_ESSID_MAX_SIZE+1];
        int active;
        int err = 0;
        unsigned long flags;
 
-       TRACE_ENTER(dev->name);
-
        if (netif_running(dev)) {
                err = orinoco_hw_get_essid(priv, &active, essidbuf);
-               if (err)
+               if (err < 0)
                        return err;
+               erq->length = err;
        } else {
-               err = orinoco_lock(priv, &flags);
-               if (err)
-                       return err;
-               memcpy(essidbuf, priv->desired_essid, sizeof(essidbuf));
+               if (orinoco_lock(priv, &flags) != 0)
+                       return -EBUSY;
+               memcpy(essidbuf, priv->desired_essid, IW_ESSID_MAX_SIZE);
+               erq->length = strlen(priv->desired_essid);
                orinoco_unlock(priv, &flags);
        }
 
        erq->flags = 1;
-       erq->length = strlen(essidbuf) + 1;
-       if (erq->pointer)
-               if (copy_to_user(erq->pointer, essidbuf, erq->length))
-                       return -EFAULT;
 
-       TRACE_EXIT(dev->name);
-       
        return 0;
 }
 
-static int orinoco_ioctl_setnick(struct net_device *dev, struct iw_point *nrq)
+static int orinoco_ioctl_setnick(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_point *nrq,
+                                char *nickbuf)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       char nickbuf[IW_ESSID_MAX_SIZE+1];
-       int err;
        unsigned long flags;
 
        if (nrq->length > IW_ESSID_MAX_SIZE)
                return -E2BIG;
 
-       memset(nickbuf, 0, sizeof(nickbuf));
-
-       if (copy_from_user(nickbuf, nrq->pointer, nrq->length))
-               return -EFAULT;
-
-       nickbuf[nrq->length] = '\0';
-       
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       memcpy(priv->nick, nickbuf, sizeof(priv->nick));
+       memset(priv->nick, 0, sizeof(priv->nick));
+       memcpy(priv->nick, nickbuf, nrq->length);
 
        orinoco_unlock(priv, &flags);
 
-       return 0;
+       return -EINPROGRESS;            /* Call commit handler */
 }
 
-static int orinoco_ioctl_getnick(struct net_device *dev, struct iw_point *nrq)
+static int orinoco_ioctl_getnick(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_point *nrq,
+                                char *nickbuf)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       char nickbuf[IW_ESSID_MAX_SIZE+1];
-       int err;
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE+1);
+       memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE);
        orinoco_unlock(priv, &flags);
 
-       nrq->length = strlen(nickbuf)+1;
-
-       if (copy_to_user(nrq->pointer, nickbuf, sizeof(nickbuf)))
-               return -EFAULT;
+       nrq->length = strlen(priv->nick);
 
        return 0;
 }
 
-static int orinoco_ioctl_setfreq(struct net_device *dev, struct iw_freq *frq)
+static int orinoco_ioctl_setfreq(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_freq *frq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int chan = -1;
-       int err;
        unsigned long flags;
+       int err = -EINPROGRESS;         /* Call commit handler */
 
-       /* We can only use this in Ad-Hoc demo mode to set the operating
-        * frequency, or in IBSS mode to set the frequency where the IBSS
-        * will be created - Jean II */
-       if (priv->iw_mode != IW_MODE_ADHOC)
-               return -EOPNOTSUPP;
+       /* In infrastructure mode the AP sets the channel */
+       if (priv->iw_mode == IW_MODE_INFRA)
+               return -EBUSY;
 
        if ( (frq->e == 0) && (frq->m <= 1000) ) {
                /* Setting by channel number */
@@ -2989,16 +3125,46 @@ static int orinoco_ioctl_setfreq(struct net_device *dev, struct iw_freq *frq)
             ! (priv->channel_mask & (1 << (chan-1)) ) )
                return -EINVAL;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+
        priv->channel = chan;
+       if (priv->iw_mode == IW_MODE_MONITOR) {
+               /* Fast channel change - no commit if successful */
+               hermes_t *hw = &priv->hw;
+               err = hermes_docmd_wait(hw, HERMES_CMD_TEST |
+                                           HERMES_TEST_SET_CHANNEL,
+                                       chan, NULL);
+       }
        orinoco_unlock(priv, &flags);
 
+       return err;
+}
+
+static int orinoco_ioctl_getfreq(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_freq *frq,
+                                char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int tmp;
+
+       /* Locking done in there */
+       tmp = orinoco_hw_get_freq(priv);
+       if (tmp < 0) {
+               return tmp;
+       }
+
+       frq->m = tmp;
+       frq->e = 1;
+
        return 0;
 }
 
-static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq)
+static int orinoco_ioctl_getsens(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *srq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
@@ -3009,10 +3175,10 @@ static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq)
        if (!priv->has_sensitivity)
                return -EOPNOTSUPP;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-       err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE, &val);
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+       err = hermes_read_wordrec(hw, USER_BAP,
+                                 HERMES_RID_CNFSYSTEMSCALE, &val);
        orinoco_unlock(priv, &flags);
 
        if (err)
@@ -3024,11 +3190,13 @@ static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq)
        return 0;
 }
 
-static int orinoco_ioctl_setsens(struct net_device *dev, struct iw_param *srq)
+static int orinoco_ioctl_setsens(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *srq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int val = srq->value;
-       int err;
        unsigned long flags;
 
        if (!priv->has_sensitivity)
@@ -3037,20 +3205,21 @@ static int orinoco_ioctl_setsens(struct net_device *dev, struct iw_param *srq)
        if ((val < 1) || (val > 3))
                return -EINVAL;
        
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
        priv->ap_density = val;
        orinoco_unlock(priv, &flags);
 
-       return 0;
+       return -EINPROGRESS;            /* Call commit handler */
 }
 
-static int orinoco_ioctl_setrts(struct net_device *dev, struct iw_param *rrq)
+static int orinoco_ioctl_setrts(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_param *rrq,
+                               char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        int val = rrq->value;
-       int err;
        unsigned long flags;
 
        if (rrq->disabled)
@@ -3059,33 +3228,49 @@ static int orinoco_ioctl_setrts(struct net_device *dev, struct iw_param *rrq)
        if ( (val < 0) || (val > 2347) )
                return -EINVAL;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        priv->rts_thresh = val;
        orinoco_unlock(priv, &flags);
 
+       return -EINPROGRESS;            /* Call commit handler */
+}
+
+static int orinoco_ioctl_getrts(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_param *rrq,
+                               char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+
+       rrq->value = priv->rts_thresh;
+       rrq->disabled = (rrq->value == 2347);
+       rrq->fixed = 1;
+
        return 0;
 }
 
-static int orinoco_ioctl_setfrag(struct net_device *dev, struct iw_param *frq)
+static int orinoco_ioctl_setfrag(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *frq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       int err = 0;
+       int err = -EINPROGRESS;         /* Call commit handler */
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        if (priv->has_mwo) {
                if (frq->disabled)
                        priv->mwo_robust = 0;
                else {
                        if (frq->fixed)
-                               printk(KERN_WARNING "%s: Fixed fragmentation not \
-supported on this firmware. Using MWO robust instead.\n", dev->name);
+                               printk(KERN_WARNING "%s: Fixed fragmentation is "
+                                      "not supported on this firmware. "
+                                      "Using MWO robust instead.\n", dev->name);
                        priv->mwo_robust = 1;
                }
        } else {
@@ -3104,17 +3289,19 @@ supported on this firmware. Using MWO robust instead.\n", dev->name);
        return err;
 }
 
-static int orinoco_ioctl_getfrag(struct net_device *dev, struct iw_param *frq)
+static int orinoco_ioctl_getfrag(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *frq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
-       int err = 0;
+       int err;
        u16 val;
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
        
        if (priv->has_mwo) {
                err = hermes_read_wordrec(hw, USER_BAP,
@@ -3142,10 +3329,12 @@ static int orinoco_ioctl_getfrag(struct net_device *dev, struct iw_param *frq)
        return err;
 }
 
-static int orinoco_ioctl_setrate(struct net_device *dev, struct iw_param *rrq)
+static int orinoco_ioctl_setrate(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *rrq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       int err = 0;
        int ratemode = -1;
        int bitrate; /* 100s of kilobits */
        int i;
@@ -3176,16 +3365,18 @@ static int orinoco_ioctl_setrate(struct net_device *dev, struct iw_param *rrq)
        if (ratemode == -1)
                return -EINVAL;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
        priv->bitratemode = ratemode;
        orinoco_unlock(priv, &flags);
 
-       return err;
+       return -EINPROGRESS;
 }
 
-static int orinoco_ioctl_getrate(struct net_device *dev, struct iw_param *rrq)
+static int orinoco_ioctl_getrate(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *rrq,
+                                char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
@@ -3195,14 +3386,12 @@ static int orinoco_ioctl_getrate(struct net_device *dev, struct iw_param *rrq)
        u16 val;
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        ratemode = priv->bitratemode;
 
-       if ( (ratemode < 0) || (ratemode >= BITRATE_TABLE_SIZE) )
-               BUG();
+       BUG_ON((ratemode < 0) || (ratemode >= BITRATE_TABLE_SIZE));
 
        rrq->value = bitrate_table[ratemode].bitrate * 100000;
        rrq->fixed = ! bitrate_table[ratemode].automatic;
@@ -3252,15 +3441,17 @@ static int orinoco_ioctl_getrate(struct net_device *dev, struct iw_param *rrq)
        return err;
 }
 
-static int orinoco_ioctl_setpower(struct net_device *dev, struct iw_param *prq)
+static int orinoco_ioctl_setpower(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *prq,
+                                 char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       int err = 0;
+       int err = -EINPROGRESS;         /* Call commit handler */
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        if (prq->disabled) {
                priv->pm_on = 0;
@@ -3279,9 +3470,8 @@ static int orinoco_ioctl_setpower(struct net_device *dev, struct iw_param *prq)
                        break;
                default:
                        err = -EINVAL;
-               }
-               if (err)
                        goto out;
+               }
                
                if (prq->flags & IW_POWER_TIMEOUT) {
                        priv->pm_on = 1;
@@ -3305,7 +3495,10 @@ static int orinoco_ioctl_setpower(struct net_device *dev, struct iw_param *prq)
        return err;
 }
 
-static int orinoco_ioctl_getpower(struct net_device *dev, struct iw_param *prq)
+static int orinoco_ioctl_getpower(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *prq,
+                                 char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
@@ -3313,9 +3506,8 @@ static int orinoco_ioctl_getpower(struct net_device *dev, struct iw_param *prq)
        u16 enable, period, timeout, mcast;
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
        
        err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFPMENABLED, &enable);
        if (err)
@@ -3354,8 +3546,10 @@ static int orinoco_ioctl_getpower(struct net_device *dev, struct iw_param *prq)
        return err;
 }
 
-#if WIRELESS_EXT > 10
-static int orinoco_ioctl_getretry(struct net_device *dev, struct iw_param *rrq)
+static int orinoco_ioctl_getretry(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *rrq,
+                                 char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        hermes_t *hw = &priv->hw;
@@ -3363,9 +3557,8 @@ static int orinoco_ioctl_getretry(struct net_device *dev, struct iw_param *rrq)
        u16 short_limit, long_limit, lifetime;
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
        
        err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_SHORTRETRYLIMIT,
                                  &short_limit);
@@ -3390,14 +3583,14 @@ static int orinoco_ioctl_getretry(struct net_device *dev, struct iw_param *rrq)
                rrq->value = lifetime * 1000;   /* ??? */
        } else {
                /* By default, display the min number */
-               if ((rrq->flags & IW_RETRY_MAX)) {
-                       rrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
+               if ((rrq->flags & IW_RETRY_LONG)) {
+                       rrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
                        rrq->value = long_limit;
                } else {
                        rrq->flags = IW_RETRY_LIMIT;
                        rrq->value = short_limit;
                        if(short_limit != long_limit)
-                               rrq->flags |= IW_RETRY_MIN;
+                               rrq->flags |= IW_RETRY_SHORT;
                }
        }
 
@@ -3406,18 +3599,43 @@ static int orinoco_ioctl_getretry(struct net_device *dev, struct iw_param *rrq)
 
        return err;
 }
-#endif /* WIRELESS_EXT > 10 */
 
-static int orinoco_ioctl_setibssport(struct net_device *dev, struct iwreq *wrq)
+static int orinoco_ioctl_reset(struct net_device *dev,
+                              struct iw_request_info *info,
+                              void *wrqu,
+                              char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       int val = *( (int *) wrq->u.name );
-       int err;
+
+       if (! capable(CAP_NET_ADMIN))
+               return -EPERM;
+
+       if (info->cmd == (SIOCIWFIRSTPRIV + 0x1)) {
+               printk(KERN_DEBUG "%s: Forcing reset!\n", dev->name);
+
+               /* Firmware reset */
+               orinoco_reset(&priv->reset_work);
+       } else {
+               printk(KERN_DEBUG "%s: Force scheduling reset!\n", dev->name);
+
+               schedule_work(&priv->reset_work);
+       }
+
+       return 0;
+}
+
+static int orinoco_ioctl_setibssport(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    void *wrqu,
+                                    char *extra)
+
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int val = *( (int *) extra );
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        priv->ibss_port = val ;
 
@@ -3425,36 +3643,33 @@ static int orinoco_ioctl_setibssport(struct net_device *dev, struct iwreq *wrq)
        set_port_type(priv);
 
        orinoco_unlock(priv, &flags);
-       return 0;
+       return -EINPROGRESS;            /* Call commit handler */
 }
 
-static int orinoco_ioctl_getibssport(struct net_device *dev, struct iwreq *wrq)
+static int orinoco_ioctl_getibssport(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    void *wrqu,
+                                    char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       int *val = (int *)wrq->u.name;
-       int err;
-       unsigned long flags;
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       int *val = (int *) extra;
 
        *val = priv->ibss_port;
-       orinoco_unlock(priv, &flags);
-
        return 0;
 }
 
-static int orinoco_ioctl_setport3(struct net_device *dev, struct iwreq *wrq)
+static int orinoco_ioctl_setport3(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 void *wrqu,
+                                 char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       int val = *( (int *) wrq->u.name );
+       int val = *( (int *) extra );
        int err = 0;
        unsigned long flags;
 
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
        switch (val) {
        case 0: /* Try to do IEEE ad-hoc mode */
@@ -3478,714 +3693,637 @@ static int orinoco_ioctl_setport3(struct net_device *dev, struct iwreq *wrq)
                err = -EINVAL;
        }
 
-       if (! err)
+       if (! err) {
                /* Actually update the mode we are using */
                set_port_type(priv);
-
-       orinoco_unlock(priv, &flags);
-
-       return err;
-}
-
-static int orinoco_ioctl_getport3(struct net_device *dev, struct iwreq *wrq)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       int *val = (int *)wrq->u.name;
-       int err;
-       unsigned long flags;
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-
-       *val = priv->prefer_port3;
-       orinoco_unlock(priv, &flags);
-
-       return 0;
-}
-
-/* Spy is used for link quality/strength measurements in Ad-Hoc mode
- * Jean II */
-static int orinoco_ioctl_setspy(struct net_device *dev, struct iw_point *srq)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct sockaddr address[IW_MAX_SPY];
-       int number = srq->length;
-       int i;
-       int err = 0;
-       unsigned long flags;
-
-       /* Check the number of addresses */
-       if (number > IW_MAX_SPY)
-               return -E2BIG;
-
-       /* Get the data in the driver */
-       if (srq->pointer) {
-               if (copy_from_user(address, srq->pointer,
-                                  sizeof(struct sockaddr) * number))
-                       return -EFAULT;
-       }
-
-       /* Make sure nobody mess with the structure while we do */
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-
-       /* orinoco_lock() doesn't disable interrupts, so make sure the
-        * interrupt rx path don't get confused while we copy */
-       priv->spy_number = 0;
-
-       if (number > 0) {
-               /* Extract the addresses */
-               for (i = 0; i < number; i++)
-                       memcpy(priv->spy_address[i], address[i].sa_data,
-                              ETH_ALEN);
-               /* Reset stats */
-               memset(priv->spy_stat, 0,
-                      sizeof(struct iw_quality) * IW_MAX_SPY);
-               /* Set number of addresses */
-               priv->spy_number = number;
-       }
-
-       /* Now, let the others play */
-       orinoco_unlock(priv, &flags);
-
-       return err;
-}
-
-static int orinoco_ioctl_getspy(struct net_device *dev, struct iw_point *srq)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct sockaddr address[IW_MAX_SPY];
-       struct iw_quality spy_stat[IW_MAX_SPY];
-       int number;
-       int i;
-       int err;
-       unsigned long flags;
-
-       err = orinoco_lock(priv, &flags);
-       if (err)
-               return err;
-
-       number = priv->spy_number;
-       if ((number > 0) && (srq->pointer)) {
-               /* Create address struct */
-               for (i = 0; i < number; i++) {
-                       memcpy(address[i].sa_data, priv->spy_address[i],
-                              ETH_ALEN);
-                       address[i].sa_family = AF_UNIX;
-               }
-               /* Copy stats */
-               /* In theory, we should disable irqs while copying the stats
-                * because the rx path migh update it in the middle...
-                * Bah, who care ? - Jean II */
-               memcpy(&spy_stat, priv->spy_stat,
-                      sizeof(struct iw_quality) * IW_MAX_SPY);
-               for (i=0; i < number; i++)
-                       priv->spy_stat[i].updated = 0;
+               err = -EINPROGRESS;
        }
 
-       orinoco_unlock(priv, &flags);
-
-       /* Push stuff to user space */
-       srq->length = number;
-       if(copy_to_user(srq->pointer, address,
-                        sizeof(struct sockaddr) * number))
-               return -EFAULT;
-       if(copy_to_user(srq->pointer + (sizeof(struct sockaddr)*number),
-                       &spy_stat, sizeof(struct iw_quality) * number))
-               return -EFAULT;
-
-       return 0;
-}
-
-static int
-orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       struct orinoco_private *priv = netdev_priv(dev);
-       struct iwreq *wrq = (struct iwreq *)rq;
-       int err = 0;
-       int tmp;
-       int changed = 0;
-       unsigned long flags;
-
-       TRACE_ENTER(dev->name);
-
-       /* In theory, we could allow most of the the SET stuff to be
-        * done. In practice, the lapse of time at startup when the
-        * card is not ready is very short, so why bother...  Note
-        * that netif_device_present is different from up/down
-        * (ifconfig), when the device is not yet up, it is usually
-        * already ready...  Jean II */
-       if (! netif_device_present(dev))
-               return -ENODEV;
-
-       switch (cmd) {
-       case SIOCGIWNAME:
-               strcpy(wrq->u.name, "IEEE 802.11-DS");
-               break;
-               
-       case SIOCGIWAP:
-               wrq->u.ap_addr.sa_family = ARPHRD_ETHER;
-               err = orinoco_hw_get_bssid(priv, wrq->u.ap_addr.sa_data);
-               break;
-
-       case SIOCGIWRANGE:
-               err = orinoco_ioctl_getiwrange(dev, &wrq->u.data);
-               break;
-
-       case SIOCSIWMODE:
-               err = orinoco_lock(priv, &flags);
-               if (err)
-                       return err;
-               switch (wrq->u.mode) {
-               case IW_MODE_ADHOC:
-                       if (! (priv->has_ibss || priv->has_port3) )
-                               err = -EINVAL;
-                       else {
-                               priv->iw_mode = IW_MODE_ADHOC;
-                               changed = 1;
-                       }
-                       break;
-
-               case IW_MODE_INFRA:
-                       priv->iw_mode = IW_MODE_INFRA;
-                       changed = 1;
-                       break;
-
-               default:
-                       err = -EINVAL;
-                       break;
-               }
-               set_port_type(priv);
-               orinoco_unlock(priv, &flags);
-               break;
-
-       case SIOCGIWMODE:
-               err = orinoco_lock(priv, &flags);
-               if (err)
-                       return err;
-               wrq->u.mode = priv->iw_mode;
-               orinoco_unlock(priv, &flags);
-               break;
+       orinoco_unlock(priv, &flags);
 
-       case SIOCSIWENCODE:
-               if (! priv->has_wep) {
-                       err = -EOPNOTSUPP;
-                       break;
-               }
+       return err;
+}
 
-               err = orinoco_ioctl_setiwencode(dev, &wrq->u.encoding);
-               if (! err)
-                       changed = 1;
-               break;
+static int orinoco_ioctl_getport3(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 void *wrqu,
+                                 char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int *val = (int *) extra;
 
-       case SIOCGIWENCODE:
-               if (! priv->has_wep) {
-                       err = -EOPNOTSUPP;
-                       break;
-               }
+       *val = priv->prefer_port3;
+       return 0;
+}
 
-               if (! capable(CAP_NET_ADMIN)) {
-                       err = -EPERM;
-                       break;
-               }
+static int orinoco_ioctl_setpreamble(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    void *wrqu,
+                                    char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       unsigned long flags;
+       int val;
 
-               err = orinoco_ioctl_getiwencode(dev, &wrq->u.encoding);
-               break;
+       if (! priv->has_preamble)
+               return -EOPNOTSUPP;
 
-       case SIOCSIWESSID:
-               err = orinoco_ioctl_setessid(dev, &wrq->u.essid);
-               if (! err)
-                       changed = 1;
-               break;
+       /* 802.11b has recently defined some short preamble.
+        * Basically, the Phy header has been reduced in size.
+        * This increase performance, especially at high rates
+        * (the preamble is transmitted at 1Mb/s), unfortunately
+        * this give compatibility troubles... - Jean II */
+       val = *( (int *) extra );
 
-       case SIOCGIWESSID:
-               err = orinoco_ioctl_getessid(dev, &wrq->u.essid);
-               break;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       case SIOCSIWNICKN:
-               err = orinoco_ioctl_setnick(dev, &wrq->u.data);
-               if (! err)
-                       changed = 1;
-               break;
+       if (val)
+               priv->preamble = 1;
+       else
+               priv->preamble = 0;
 
-       case SIOCGIWNICKN:
-               err = orinoco_ioctl_getnick(dev, &wrq->u.data);
-               break;
+       orinoco_unlock(priv, &flags);
 
-       case SIOCGIWFREQ:
-               tmp = orinoco_hw_get_freq(priv);
-               if (tmp < 0) {
-                       err = tmp;
-               } else {
-                       wrq->u.freq.m = tmp;
-                       wrq->u.freq.e = 1;
-               }
-               break;
+       return -EINPROGRESS;            /* Call commit handler */
+}
 
-       case SIOCSIWFREQ:
-               err = orinoco_ioctl_setfreq(dev, &wrq->u.freq);
-               if (! err)
-                       changed = 1;
-               break;
+static int orinoco_ioctl_getpreamble(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    void *wrqu,
+                                    char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int *val = (int *) extra;
 
-       case SIOCGIWSENS:
-               err = orinoco_ioctl_getsens(dev, &wrq->u.sens);
-               break;
+       if (! priv->has_preamble)
+               return -EOPNOTSUPP;
 
-       case SIOCSIWSENS:
-               err = orinoco_ioctl_setsens(dev, &wrq->u.sens);
-               if (! err)
-                       changed = 1;
-               break;
+       *val = priv->preamble;
+       return 0;
+}
 
-       case SIOCGIWRTS:
-               wrq->u.rts.value = priv->rts_thresh;
-               wrq->u.rts.disabled = (wrq->u.rts.value == 2347);
-               wrq->u.rts.fixed = 1;
-               break;
+/* ioctl interface to hermes_read_ltv()
+ * To use with iwpriv, pass the RID as the token argument, e.g.
+ * iwpriv get_rid [0xfc00]
+ * At least Wireless Tools 25 is required to use iwpriv.
+ * For Wireless Tools 25 and 26 append "dummy" are the end. */
+static int orinoco_ioctl_getrid(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_point *data,
+                               char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       hermes_t *hw = &priv->hw;
+       int rid = data->flags;
+       u16 length;
+       int err;
+       unsigned long flags;
 
-       case SIOCSIWRTS:
-               err = orinoco_ioctl_setrts(dev, &wrq->u.rts);
-               if (! err)
-                       changed = 1;
-               break;
+       /* It's a "get" function, but we don't want users to access the
+        * WEP key and other raw firmware data */
+       if (! capable(CAP_NET_ADMIN))
+               return -EPERM;
 
-       case SIOCSIWFRAG:
-               err = orinoco_ioctl_setfrag(dev, &wrq->u.frag);
-               if (! err)
-                       changed = 1;
-               break;
+       if (rid < 0xfc00 || rid > 0xffff)
+               return -EINVAL;
 
-       case SIOCGIWFRAG:
-               err = orinoco_ioctl_getfrag(dev, &wrq->u.frag);
-               break;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
 
-       case SIOCSIWRATE:
-               err = orinoco_ioctl_setrate(dev, &wrq->u.bitrate);
-               if (! err)
-                       changed = 1;
-               break;
+       err = hermes_read_ltv(hw, USER_BAP, rid, MAX_RID_LEN, &length,
+                             extra);
+       if (err)
+               goto out;
 
-       case SIOCGIWRATE:
-               err = orinoco_ioctl_getrate(dev, &wrq->u.bitrate);
-               break;
+       data->length = min_t(u16, HERMES_RECLEN_TO_BYTES(length),
+                            MAX_RID_LEN);
 
-       case SIOCSIWPOWER:
-               err = orinoco_ioctl_setpower(dev, &wrq->u.power);
-               if (! err)
-                       changed = 1;
-               break;
+ out:
+       orinoco_unlock(priv, &flags);
+       return err;
+}
 
-       case SIOCGIWPOWER:
-               err = orinoco_ioctl_getpower(dev, &wrq->u.power);
-               break;
+/* Trigger a scan (look for other cells in the vicinity */
+static int orinoco_ioctl_setscan(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *srq,
+                                char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       hermes_t *hw = &priv->hw;
+       int err = 0;
+       unsigned long flags;
 
-       case SIOCGIWTXPOW:
-               /* The card only supports one tx power, so this is easy */
-               wrq->u.txpower.value = 15; /* dBm */
-               wrq->u.txpower.fixed = 1;
-               wrq->u.txpower.disabled = 0;
-               wrq->u.txpower.flags = IW_TXPOW_DBM;
-               break;
+       /* Note : you may have realised that, as this is a SET operation,
+        * this is privileged and therefore a normal user can't
+        * perform scanning.
+        * This is not an error, while the device perform scanning,
+        * traffic doesn't flow, so it's a perfect DoS...
+        * Jean II */
 
-#if WIRELESS_EXT > 10
-       case SIOCSIWRETRY:
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+
+       /* Scanning with port 0 disabled would fail */
+       if (!netif_running(dev)) {
+               err = -ENETDOWN;
+               goto out;
+       }
+
+       /* In monitor mode, the scan results are always empty.
+        * Probe responses are passed to the driver as received
+        * frames and could be processed in software. */
+       if (priv->iw_mode == IW_MODE_MONITOR) {
                err = -EOPNOTSUPP;
-               break;
+               goto out;
+       }
 
-       case SIOCGIWRETRY:
-               err = orinoco_ioctl_getretry(dev, &wrq->u.retry);
-               break;
-#endif /* WIRELESS_EXT > 10 */
+       /* Note : because we don't lock out the irq handler, the way
+        * we access scan variables in priv is critical.
+        *      o scan_inprogress : not touched by irq handler
+        *      o scan_mode : not touched by irq handler
+        *      o scan_result : irq is strict producer, non-irq is strict
+        *              consumer.
+        *      o scan_len : synchronised with scan_result
+        * Before modifying anything on those variables, please think hard !
+        * Jean II */
 
-       case SIOCSIWSPY:
-               err = orinoco_ioctl_setspy(dev, &wrq->u.data);
-               break;
+       /* If there is still some left-over scan results, get rid of it */
+       if (priv->scan_result != NULL) {
+               /* What's likely is that a client did crash or was killed
+                * between triggering the scan request and reading the
+                * results, so we need to reset everything.
+                * Some clients that are too slow may suffer from that...
+                * Jean II */
+               kfree(priv->scan_result);
+               priv->scan_result = NULL;
+       }
 
-       case SIOCGIWSPY:
-               err = orinoco_ioctl_getspy(dev, &wrq->u.data);
-               break;
+       /* Save flags */
+       priv->scan_mode = srq->flags;
 
-       case SIOCGIWPRIV:
-               if (wrq->u.data.pointer) {
-                       struct iw_priv_args privtab[] = {
-                               { SIOCIWFIRSTPRIV + 0x0, 0, 0, "force_reset" },
-                               { SIOCIWFIRSTPRIV + 0x1, 0, 0, "card_reset" },
-                               { SIOCIWFIRSTPRIV + 0x2,
-                                 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                                 0, "set_port3" },
-                               { SIOCIWFIRSTPRIV + 0x3, 0,
-                                 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                                 "get_port3" },
-                               { SIOCIWFIRSTPRIV + 0x4,
-                                 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                                 0, "set_preamble" },
-                               { SIOCIWFIRSTPRIV + 0x5, 0,
-                                 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                                 "get_preamble" },
-                               { SIOCIWFIRSTPRIV + 0x6,
-                                 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                                 0, "set_ibssport" },
-                               { SIOCIWFIRSTPRIV + 0x7, 0,
-                                 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                                 "get_ibssport" },
-                               { SIOCIWLASTPRIV, 0, 0, "dump_recs" },
-                       };
-
-                       wrq->u.data.length = sizeof(privtab) / sizeof(privtab[0]);
-                       if (copy_to_user(wrq->u.data.pointer, privtab, sizeof(privtab)))
-                               err = -EFAULT;
-               }
-               break;
-              
-       case SIOCIWFIRSTPRIV + 0x0: /* force_reset */
-       case SIOCIWFIRSTPRIV + 0x1: /* card_reset */
-               if (! capable(CAP_NET_ADMIN)) {
-                       err = -EPERM;
+       /* Always trigger scanning, even if it's in progress.
+        * This way, if the info frame get lost, we will recover somewhat
+        * gracefully  - Jean II */
+
+       if (priv->has_hostscan) {
+               switch (priv->firmware_type) {
+               case FIRMWARE_TYPE_SYMBOL:
+                       err = hermes_write_wordrec(hw, USER_BAP,
+                                                  HERMES_RID_CNFHOSTSCAN_SYMBOL,
+                                                  HERMES_HOSTSCAN_SYMBOL_ONCE |
+                                                  HERMES_HOSTSCAN_SYMBOL_BCAST);
                        break;
-               }
-               
-               printk(KERN_DEBUG "%s: Force scheduling reset!\n", dev->name);
+               case FIRMWARE_TYPE_INTERSIL: {
+                       __le16 req[3];
 
-               schedule_work(&priv->reset_work);
+                       req[0] = cpu_to_le16(0x3fff);   /* All channels */
+                       req[1] = cpu_to_le16(0x0001);   /* rate 1 Mbps */
+                       req[2] = 0;                     /* Any ESSID */
+                       err = HERMES_WRITE_RECORD(hw, USER_BAP,
+                                                 HERMES_RID_CNFHOSTSCAN, &req);
+               }
                break;
+               case FIRMWARE_TYPE_AGERE:
+                       err = hermes_write_wordrec(hw, USER_BAP,
+                                                  HERMES_RID_CNFSCANSSID_AGERE,
+                                                  0);  /* Any ESSID */
+                       if (err)
+                               break;
 
-       case SIOCIWFIRSTPRIV + 0x2: /* set_port3 */
-               if (! capable(CAP_NET_ADMIN)) {
-                       err = -EPERM;
+                       err = hermes_inquire(hw, HERMES_INQ_SCAN);
                        break;
                }
+       } else
+               err = hermes_inquire(hw, HERMES_INQ_SCAN);
 
-               err = orinoco_ioctl_setport3(dev, wrq);
-               if (! err)
-                       changed = 1;
-               break;
+       /* One more client */
+       if (! err)
+               priv->scan_inprogress = 1;
+
+ out:
+       orinoco_unlock(priv, &flags);
+       return err;
+}
 
-       case SIOCIWFIRSTPRIV + 0x3: /* get_port3 */
-               err = orinoco_ioctl_getport3(dev, wrq);
+/* Translate scan data returned from the card to a card independant
+ * format that the Wireless Tools will understand - Jean II
+ * Return message length or -errno for fatal errors */
+static inline int orinoco_translate_scan(struct net_device *dev,
+                                        char *buffer,
+                                        char *scan,
+                                        int scan_len)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int                     offset;         /* In the scan data */
+       union hermes_scan_info *atom;
+       int                     atom_len;
+       u16                     capabilities;
+       u16                     channel;
+       struct iw_event         iwe;            /* Temporary buffer */
+       char *                  current_ev = buffer;
+       char *                  end_buf = buffer + IW_SCAN_MAX_DATA;
+
+       switch (priv->firmware_type) {
+       case FIRMWARE_TYPE_AGERE:
+               atom_len = sizeof(struct agere_scan_apinfo);
+               offset = 0;
+               break;
+       case FIRMWARE_TYPE_SYMBOL:
+               /* Lack of documentation necessitates this hack.
+                * Different firmwares have 68 or 76 byte long atoms.
+                * We try modulo first.  If the length divides by both,
+                * we check what would be the channel in the second
+                * frame for a 68-byte atom.  76-byte atoms have 0 there.
+                * Valid channel cannot be 0.  */
+               if (scan_len % 76)
+                       atom_len = 68;
+               else if (scan_len % 68)
+                       atom_len = 76;
+               else if (scan_len >= 1292 && scan[68] == 0)
+                       atom_len = 76;
+               else
+                       atom_len = 68;
+               offset = 0;
                break;
+       case FIRMWARE_TYPE_INTERSIL:
+               offset = 4;
+               if (priv->has_hostscan) {
+                       atom_len = le16_to_cpup((__le16 *)scan);
+                       /* Sanity check for atom_len */
+                       if (atom_len < sizeof(struct prism2_scan_apinfo)) {
+                               printk(KERN_ERR "%s: Invalid atom_len in scan data: %d\n",
+                               dev->name, atom_len);
+                               return -EIO;
+                       }
+               } else
+                       atom_len = offsetof(struct prism2_scan_apinfo, atim);
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
 
-       case SIOCIWFIRSTPRIV + 0x4: /* set_preamble */
-               if (! capable(CAP_NET_ADMIN)) {
-                       err = -EPERM;
-                       break;
+       /* Check that we got an whole number of atoms */
+       if ((scan_len - offset) % atom_len) {
+               printk(KERN_ERR "%s: Unexpected scan data length %d, "
+                      "atom_len %d, offset %d\n", dev->name, scan_len,
+                      atom_len, offset);
+               return -EIO;
+       }
+
+       /* Read the entries one by one */
+       for (; offset + atom_len <= scan_len; offset += atom_len) {
+               /* Get next atom */
+               atom = (union hermes_scan_info *) (scan + offset);
+
+               /* First entry *MUST* be the AP MAC address */
+               iwe.cmd = SIOCGIWAP;
+               iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+               memcpy(iwe.u.ap_addr.sa_data, atom->a.bssid, ETH_ALEN);
+               current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
+
+               /* Other entries will be displayed in the order we give them */
+
+               /* Add the ESSID */
+               iwe.u.data.length = le16_to_cpu(atom->a.essid_len);
+               if (iwe.u.data.length > 32)
+                       iwe.u.data.length = 32;
+               iwe.cmd = SIOCGIWESSID;
+               iwe.u.data.flags = 1;
+               current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, atom->a.essid);
+
+               /* Add mode */
+               iwe.cmd = SIOCGIWMODE;
+               capabilities = le16_to_cpu(atom->a.capabilities);
+               if (capabilities & 0x3) {
+                       if (capabilities & 0x1)
+                               iwe.u.mode = IW_MODE_MASTER;
+                       else
+                               iwe.u.mode = IW_MODE_ADHOC;
+                       current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
+               }
+
+               channel = atom->s.channel;
+               if ( (channel >= 1) && (channel <= NUM_CHANNELS) ) {
+                       /* Add frequency */
+                       iwe.cmd = SIOCGIWFREQ;
+                       iwe.u.freq.m = channel_frequency[channel-1] * 100000;
+                       iwe.u.freq.e = 1;
+                       current_ev = iwe_stream_add_event(current_ev, end_buf,
+                                                         &iwe, IW_EV_FREQ_LEN);
                }
 
-               /* 802.11b has recently defined some short preamble.
-                * Basically, the Phy header has been reduced in size.
-                * This increase performance, especially at high rates
-                * (the preamble is transmitted at 1Mb/s), unfortunately
-                * this give compatibility troubles... - Jean II */
-               if(priv->has_preamble) {
-                       int val = *( (int *) wrq->u.name );
+               /* Add quality statistics */
+               iwe.cmd = IWEVQUAL;
+               iwe.u.qual.updated = 0x10;      /* no link quality */
+               iwe.u.qual.level = (__u8) le16_to_cpu(atom->a.level) - 0x95;
+               iwe.u.qual.noise = (__u8) le16_to_cpu(atom->a.noise) - 0x95;
+               /* Wireless tools prior to 27.pre22 will show link quality
+                * anyway, so we provide a reasonable value. */
+               if (iwe.u.qual.level > iwe.u.qual.noise)
+                       iwe.u.qual.qual = iwe.u.qual.level - iwe.u.qual.noise;
+               else
+                       iwe.u.qual.qual = 0;
+               current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
-                       err = orinoco_lock(priv, &flags);
-                       if (err)
-                               return err;
-                       if (val)
-                               priv->preamble = 1;
+               /* Add encryption capability */
+               iwe.cmd = SIOCGIWENCODE;
+               if (capabilities & 0x10)
+                       iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+               else
+                       iwe.u.data.flags = IW_ENCODE_DISABLED;
+               iwe.u.data.length = 0;
+               current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, atom->a.essid);
+
+               /* Bit rate is not available in Lucent/Agere firmwares */
+               if (priv->firmware_type != FIRMWARE_TYPE_AGERE) {
+                       char *  current_val = current_ev + IW_EV_LCP_LEN;
+                       int     i;
+                       int     step;
+
+                       if (priv->firmware_type == FIRMWARE_TYPE_SYMBOL)
+                               step = 2;
                        else
-                               priv->preamble = 0;
-                       orinoco_unlock(priv, &flags);
-                       changed = 1;
-               } else
-                       err = -EOPNOTSUPP;
-               break;
+                               step = 1;
+
+                       iwe.cmd = SIOCGIWRATE;
+                       /* Those two flags are ignored... */
+                       iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+                       /* Max 10 values */
+                       for (i = 0; i < 10; i += step) {
+                               /* NULL terminated */
+                               if (atom->p.rates[i] == 0x0)
+                                       break;
+                               /* Bit rate given in 500 kb/s units (+ 0x80) */
+                               iwe.u.bitrate.value = ((atom->p.rates[i] & 0x7f) * 500000);
+                               current_val = iwe_stream_add_value(current_ev, current_val,
+                                                                  end_buf, &iwe,
+                                                                  IW_EV_PARAM_LEN);
+                       }
+                       /* Check if we added any event */
+                       if ((current_val - current_ev) > IW_EV_LCP_LEN)
+                               current_ev = current_val;
+               }
 
-       case SIOCIWFIRSTPRIV + 0x5: /* get_preamble */
-               if(priv->has_preamble) {
-                       int *val = (int *)wrq->u.name;
+               /* The other data in the scan result are not really
+                * interesting, so for now drop it - Jean II */
+       }
+       return current_ev - buffer;
+}
 
-                       err = orinoco_lock(priv, &flags);
-                       if (err)
-                               return err;
-                       *val = priv->preamble;
-                       orinoco_unlock(priv, &flags);
-               } else
-                       err = -EOPNOTSUPP;
-               break;
-       case SIOCIWFIRSTPRIV + 0x6: /* set_ibssport */
-               if (! capable(CAP_NET_ADMIN)) {
-                       err = -EPERM;
-                       break;
-               }
+/* Return results of a scan */
+static int orinoco_ioctl_getscan(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_point *srq,
+                                char *extra)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
+       int err = 0;
+       unsigned long flags;
 
-               err = orinoco_ioctl_setibssport(dev, wrq);
-               if (! err)
-                       changed = 1;
-               break;
+       if (orinoco_lock(priv, &flags) != 0)
+               return -EBUSY;
+
+       /* If no results yet, ask to try again later */
+       if (priv->scan_result == NULL) {
+               if (priv->scan_inprogress)
+                       /* Important note : we don't want to block the caller
+                        * until results are ready for various reasons.
+                        * First, managing wait queues is complex and racy.
+                        * Second, we grab some rtnetlink lock before comming
+                        * here (in dev_ioctl()).
+                        * Third, we generate an Wireless Event, so the
+                        * caller can wait itself on that - Jean II */
+                       err = -EAGAIN;
+               else
+                       /* Client error, no scan results...
+                        * The caller need to restart the scan. */
+                       err = -ENODATA;
+       } else {
+               /* We have some results to push back to user space */
 
-       case SIOCIWFIRSTPRIV + 0x7: /* get_ibssport */
-               err = orinoco_ioctl_getibssport(dev, wrq);
-               break;
+               /* Translate to WE format */
+               int ret = orinoco_translate_scan(dev, extra,
+                                                priv->scan_result,
+                                                priv->scan_len);
 
-       case SIOCIWLASTPRIV:
-               err = orinoco_debug_dump_recs(dev);
-               if (err)
-                       printk(KERN_ERR "%s: Unable to dump records (%d)\n",
-                              dev->name, err);
-               break;
+               if (ret < 0) {
+                       err = ret;
+                       kfree(priv->scan_result);
+                       priv->scan_result = NULL;
+               } else {
+                       srq->length = ret;
 
+                       /* Return flags */
+                       srq->flags = (__u16) priv->scan_mode;
 
-       default:
-               err = -EOPNOTSUPP;
-       }
-       
-       if (! err && changed && netif_running(dev)) {
-               err = orinoco_reconfigure(dev);
-       }               
+                       /* In any case, Scan results will be cleaned up in the
+                        * reset function and when exiting the driver.
+                        * The person triggering the scanning may never come to
+                        * pick the results, so we need to do it in those places.
+                        * Jean II */
 
-       TRACE_EXIT(dev->name);
+#ifdef SCAN_SINGLE_READ
+                       /* If you enable this option, only one client (the first
+                        * one) will be able to read the result (and only one
+                        * time). If there is multiple concurent clients that
+                        * want to read scan results, this behavior is not
+                        * advisable - Jean II */
+                       kfree(priv->scan_result);
+                       priv->scan_result = NULL;
+#endif /* SCAN_SINGLE_READ */
+                       /* Here, if too much time has elapsed since last scan,
+                        * we may want to clean up scan results... - Jean II */
+               }
 
+               /* Scan is no longer in progress */
+               priv->scan_inprogress = 0;
+       }
+         
+       orinoco_unlock(priv, &flags);
        return err;
 }
 
-struct {
-       u16 rid;
-       char *name;
-       int displaytype;
-#define DISPLAY_WORDS  0
-#define DISPLAY_BYTES  1
-#define DISPLAY_STRING 2
-#define DISPLAY_XSTRING        3
-} record_table[] = {
-#define DEBUG_REC(name,type) { HERMES_RID_##name, #name, DISPLAY_##type }
-       DEBUG_REC(CNFPORTTYPE,WORDS),
-       DEBUG_REC(CNFOWNMACADDR,BYTES),
-       DEBUG_REC(CNFDESIREDSSID,STRING),
-       DEBUG_REC(CNFOWNCHANNEL,WORDS),
-       DEBUG_REC(CNFOWNSSID,STRING),
-       DEBUG_REC(CNFOWNATIMWINDOW,WORDS),
-       DEBUG_REC(CNFSYSTEMSCALE,WORDS),
-       DEBUG_REC(CNFMAXDATALEN,WORDS),
-       DEBUG_REC(CNFPMENABLED,WORDS),
-       DEBUG_REC(CNFPMEPS,WORDS),
-       DEBUG_REC(CNFMULTICASTRECEIVE,WORDS),
-       DEBUG_REC(CNFMAXSLEEPDURATION,WORDS),
-       DEBUG_REC(CNFPMHOLDOVERDURATION,WORDS),
-       DEBUG_REC(CNFOWNNAME,STRING),
-       DEBUG_REC(CNFOWNDTIMPERIOD,WORDS),
-       DEBUG_REC(CNFMULTICASTPMBUFFERING,WORDS),
-       DEBUG_REC(CNFWEPENABLED_AGERE,WORDS),
-       DEBUG_REC(CNFMANDATORYBSSID_SYMBOL,WORDS),
-       DEBUG_REC(CNFWEPDEFAULTKEYID,WORDS),
-       DEBUG_REC(CNFDEFAULTKEY0,BYTES),
-       DEBUG_REC(CNFDEFAULTKEY1,BYTES),
-       DEBUG_REC(CNFMWOROBUST_AGERE,WORDS),
-       DEBUG_REC(CNFDEFAULTKEY2,BYTES),
-       DEBUG_REC(CNFDEFAULTKEY3,BYTES),
-       DEBUG_REC(CNFWEPFLAGS_INTERSIL,WORDS),
-       DEBUG_REC(CNFWEPKEYMAPPINGTABLE,WORDS),
-       DEBUG_REC(CNFAUTHENTICATION,WORDS),
-       DEBUG_REC(CNFMAXASSOCSTA,WORDS),
-       DEBUG_REC(CNFKEYLENGTH_SYMBOL,WORDS),
-       DEBUG_REC(CNFTXCONTROL,WORDS),
-       DEBUG_REC(CNFROAMINGMODE,WORDS),
-       DEBUG_REC(CNFHOSTAUTHENTICATION,WORDS),
-       DEBUG_REC(CNFRCVCRCERROR,WORDS),
-       DEBUG_REC(CNFMMLIFE,WORDS),
-       DEBUG_REC(CNFALTRETRYCOUNT,WORDS),
-       DEBUG_REC(CNFBEACONINT,WORDS),
-       DEBUG_REC(CNFAPPCFINFO,WORDS),
-       DEBUG_REC(CNFSTAPCFINFO,WORDS),
-       DEBUG_REC(CNFPRIORITYQUSAGE,WORDS),
-       DEBUG_REC(CNFTIMCTRL,WORDS),
-       DEBUG_REC(CNFTHIRTY2TALLY,WORDS),
-       DEBUG_REC(CNFENHSECURITY,WORDS),
-       DEBUG_REC(CNFGROUPADDRESSES,BYTES),
-       DEBUG_REC(CNFCREATEIBSS,WORDS),
-       DEBUG_REC(CNFFRAGMENTATIONTHRESHOLD,WORDS),
-       DEBUG_REC(CNFRTSTHRESHOLD,WORDS),
-       DEBUG_REC(CNFTXRATECONTROL,WORDS),
-       DEBUG_REC(CNFPROMISCUOUSMODE,WORDS),
-       DEBUG_REC(CNFBASICRATES_SYMBOL,WORDS),
-       DEBUG_REC(CNFPREAMBLE_SYMBOL,WORDS),
-       DEBUG_REC(CNFSHORTPREAMBLE,WORDS),
-       DEBUG_REC(CNFWEPKEYS_AGERE,BYTES),
-       DEBUG_REC(CNFEXCLUDELONGPREAMBLE,WORDS),
-       DEBUG_REC(CNFTXKEY_AGERE,WORDS),
-       DEBUG_REC(CNFAUTHENTICATIONRSPTO,WORDS),
-       DEBUG_REC(CNFBASICRATES,WORDS),
-       DEBUG_REC(CNFSUPPORTEDRATES,WORDS),
-       DEBUG_REC(CNFTICKTIME,WORDS),
-       DEBUG_REC(CNFSCANREQUEST,WORDS),
-       DEBUG_REC(CNFJOINREQUEST,WORDS),
-       DEBUG_REC(CNFAUTHENTICATESTATION,WORDS),
-       DEBUG_REC(CNFCHANNELINFOREQUEST,WORDS),
-       DEBUG_REC(MAXLOADTIME,WORDS),
-       DEBUG_REC(DOWNLOADBUFFER,WORDS),
-       DEBUG_REC(PRIID,WORDS),
-       DEBUG_REC(PRISUPRANGE,WORDS),
-       DEBUG_REC(CFIACTRANGES,WORDS),
-       DEBUG_REC(NICSERNUM,XSTRING),
-       DEBUG_REC(NICID,WORDS),
-       DEBUG_REC(MFISUPRANGE,WORDS),
-       DEBUG_REC(CFISUPRANGE,WORDS),
-       DEBUG_REC(CHANNELLIST,WORDS),
-       DEBUG_REC(REGULATORYDOMAINS,WORDS),
-       DEBUG_REC(TEMPTYPE,WORDS),
-/*     DEBUG_REC(CIS,BYTES), */
-       DEBUG_REC(STAID,WORDS),
-       DEBUG_REC(CURRENTSSID,STRING),
-       DEBUG_REC(CURRENTBSSID,BYTES),
-       DEBUG_REC(COMMSQUALITY,WORDS),
-       DEBUG_REC(CURRENTTXRATE,WORDS),
-       DEBUG_REC(CURRENTBEACONINTERVAL,WORDS),
-       DEBUG_REC(CURRENTSCALETHRESHOLDS,WORDS),
-       DEBUG_REC(PROTOCOLRSPTIME,WORDS),
-       DEBUG_REC(SHORTRETRYLIMIT,WORDS),
-       DEBUG_REC(LONGRETRYLIMIT,WORDS),
-       DEBUG_REC(MAXTRANSMITLIFETIME,WORDS),
-       DEBUG_REC(MAXRECEIVELIFETIME,WORDS),
-       DEBUG_REC(CFPOLLABLE,WORDS),
-       DEBUG_REC(AUTHENTICATIONALGORITHMS,WORDS),
-       DEBUG_REC(PRIVACYOPTIONIMPLEMENTED,WORDS),
-       DEBUG_REC(OWNMACADDR,BYTES),
-       DEBUG_REC(SCANRESULTSTABLE,WORDS),
-       DEBUG_REC(PHYTYPE,WORDS),
-       DEBUG_REC(CURRENTCHANNEL,WORDS),
-       DEBUG_REC(CURRENTPOWERSTATE,WORDS),
-       DEBUG_REC(CCAMODE,WORDS),
-       DEBUG_REC(SUPPORTEDDATARATES,WORDS),
-       DEBUG_REC(BUILDSEQ,BYTES),
-       DEBUG_REC(FWID,XSTRING)
-#undef DEBUG_REC
-};
-
-#define DEBUG_LTV_SIZE         128
-
-static int orinoco_debug_dump_recs(struct net_device *dev)
+/* Commit handler, called after set operations */
+static int orinoco_ioctl_commit(struct net_device *dev,
+                               struct iw_request_info *info,
+                               void *wrqu,
+                               char *extra)
 {
        struct orinoco_private *priv = netdev_priv(dev);
-       hermes_t *hw = &priv->hw;
-       u8 *val8;
-       u16 *val16;
-       int i,j;
-       u16 length;
-       int err;
-
-       /* I'm not sure: we might have a lock here, so we'd better go
-           atomic, just in case. */
-       val8 = kmalloc(DEBUG_LTV_SIZE + 2, GFP_ATOMIC);
-       if (! val8)
-               return -ENOMEM;
-       val16 = (u16 *)val8;
-
-       for (i = 0; i < ARRAY_SIZE(record_table); i++) {
-               u16 rid = record_table[i].rid;
-               int len;
+       struct hermes *hw = &priv->hw;
+       unsigned long flags;
+       int err = 0;
 
-               memset(val8, 0, DEBUG_LTV_SIZE + 2);
+       if (!priv->open)
+               return 0;
 
-               err = hermes_read_ltv(hw, USER_BAP, rid, DEBUG_LTV_SIZE,
-                                     &length, val8);
-               if (err) {
-                       DEBUG(0, "Error %d reading RID 0x%04x\n", err, rid);
-                       continue;
-               }
-               val16 = (u16 *)val8;
-               if (length == 0)
-                       continue;
-
-               printk(KERN_DEBUG "%-15s (0x%04x): length=%d (%d bytes)\tvalue=",
-                      record_table[i].name,
-                      rid, length, (length-1)*2);
-               len = min(((int)length-1)*2, DEBUG_LTV_SIZE);
-
-               switch (record_table[i].displaytype) {
-               case DISPLAY_WORDS:
-                       for (j = 0; j < len / 2; j++)
-                               printk("%04X-", le16_to_cpu(val16[j]));
-                       break;
+       if (priv->broken_disableport) {
+               orinoco_reset(&priv->reset_work);
+               return 0;
+       }
 
-               case DISPLAY_BYTES:
-               default:
-                       for (j = 0; j < len; j++)
-                               printk("%02X:", val8[j]);
-                       break;
+       if (orinoco_lock(priv, &flags) != 0)
+               return err;
 
-               case DISPLAY_STRING:
-                       len = min(len, le16_to_cpu(val16[0])+2);
-                       val8[len] = '\0';
-                       printk("\"%s\"", (char *)&val16[1]);
-                       break;
+       err = hermes_disable_port(hw, 0);
+       if (err) {
+               printk(KERN_WARNING "%s: Unable to disable port "
+                      "while reconfiguring card\n", dev->name);
+               priv->broken_disableport = 1;
+               goto out;
+       }
 
-               case DISPLAY_XSTRING:
-                       printk("'%s'", (char *)val8);
-               }
+       err = __orinoco_program_rids(dev);
+       if (err) {
+               printk(KERN_WARNING "%s: Unable to reconfigure card\n",
+                      dev->name);
+               goto out;
+       }
 
-               printk("\n");
+       err = hermes_enable_port(hw, 0);
+       if (err) {
+               printk(KERN_WARNING "%s: Unable to enable port while reconfiguring card\n",
+                      dev->name);
+               goto out;
        }
 
-       kfree(val8);
+ out:
+       if (err) {
+               printk(KERN_WARNING "%s: Resetting instead...\n", dev->name);
+               schedule_work(&priv->reset_work);
+               err = 0;
+       }
 
-       return 0;
+       orinoco_unlock(priv, &flags);
+       return err;
 }
 
-struct net_device *alloc_orinocodev(int sizeof_card, int (*hard_reset)(struct orinoco_private *))
-{
-       struct net_device *dev;
-       struct orinoco_private *priv;
+static const struct iw_priv_args orinoco_privtab[] = {
+       { SIOCIWFIRSTPRIV + 0x0, 0, 0, "force_reset" },
+       { SIOCIWFIRSTPRIV + 0x1, 0, 0, "card_reset" },
+       { SIOCIWFIRSTPRIV + 0x2, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         0, "set_port3" },
+       { SIOCIWFIRSTPRIV + 0x3, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "get_port3" },
+       { SIOCIWFIRSTPRIV + 0x4, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         0, "set_preamble" },
+       { SIOCIWFIRSTPRIV + 0x5, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "get_preamble" },
+       { SIOCIWFIRSTPRIV + 0x6, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         0, "set_ibssport" },
+       { SIOCIWFIRSTPRIV + 0x7, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         "get_ibssport" },
+       { SIOCIWFIRSTPRIV + 0x9, 0, IW_PRIV_TYPE_BYTE | MAX_RID_LEN,
+         "get_rid" },
+};
 
-       dev = alloc_etherdev(sizeof(struct orinoco_private) + sizeof_card);
-       if (!dev)
-               return NULL;
-       priv = netdev_priv(dev);
-       priv->ndev = dev;
-       if (sizeof_card)
-               priv->card = (void *)((unsigned long)dev->priv + sizeof(struct orinoco_private));
-       else
-               priv->card = NULL;
 
-       /* Setup / override net_device fields */
-       dev->init = orinoco_init;
-       dev->hard_start_xmit = orinoco_xmit;
-       dev->tx_timeout = orinoco_tx_timeout;
-       dev->watchdog_timeo = HZ; /* 1 second timeout */
-       dev->get_stats = orinoco_get_stats;
-       dev->get_wireless_stats = orinoco_get_wireless_stats;
-       dev->do_ioctl = orinoco_ioctl;
-       dev->change_mtu = orinoco_change_mtu;
-       dev->set_multicast_list = orinoco_set_multicast_list;
-       /* we use the default eth_mac_addr for setting the MAC addr */
+/*
+ * Structures to export the Wireless Handlers
+ */
 
-       /* Set up default callbacks */
-       dev->open = orinoco_open;
-       dev->stop = orinoco_stop;
-       priv->hard_reset = hard_reset;
+static const iw_handler        orinoco_handler[] = {
+       [SIOCSIWCOMMIT-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_commit,
+       [SIOCGIWNAME  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getname,
+       [SIOCSIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfreq,
+       [SIOCGIWFREQ  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfreq,
+       [SIOCSIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setmode,
+       [SIOCGIWMODE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getmode,
+       [SIOCSIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setsens,
+       [SIOCGIWSENS  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getsens,
+       [SIOCGIWRANGE -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwrange,
+       [SIOCSIWSPY   -SIOCIWFIRST] = (iw_handler) iw_handler_set_spy,
+       [SIOCGIWSPY   -SIOCIWFIRST] = (iw_handler) iw_handler_get_spy,
+       [SIOCSIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_set_thrspy,
+       [SIOCGIWTHRSPY-SIOCIWFIRST] = (iw_handler) iw_handler_get_thrspy,
+       [SIOCSIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setwap,
+       [SIOCGIWAP    -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getwap,
+       [SIOCSIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setscan,
+       [SIOCGIWSCAN  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getscan,
+       [SIOCSIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setessid,
+       [SIOCGIWESSID -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getessid,
+       [SIOCSIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setnick,
+       [SIOCGIWNICKN -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getnick,
+       [SIOCSIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrate,
+       [SIOCGIWRATE  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrate,
+       [SIOCSIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setrts,
+       [SIOCGIWRTS   -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getrts,
+       [SIOCSIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setfrag,
+       [SIOCGIWFRAG  -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getfrag,
+       [SIOCGIWRETRY -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getretry,
+       [SIOCSIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setiwencode,
+       [SIOCGIWENCODE-SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getiwencode,
+       [SIOCSIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_setpower,
+       [SIOCGIWPOWER -SIOCIWFIRST] = (iw_handler) orinoco_ioctl_getpower,
+};
 
-       spin_lock_init(&priv->lock);
-       priv->open = 0;
-       priv->hw_unavailable = 1; /* orinoco_init() must clear this
-                                  * before anything else touches the
-                                  * hardware */
-       INIT_WORK(&priv->reset_work, (void (*)(void *))orinoco_reset, dev);
 
-       priv->last_linkstatus = 0xffff;
-       priv->connected = 0;
+/*
+  Added typecasting since we no longer use iwreq_data -- Moustafa
+ */
+static const iw_handler        orinoco_private_handler[] = {
+       [0] = (iw_handler) orinoco_ioctl_reset,
+       [1] = (iw_handler) orinoco_ioctl_reset,
+       [2] = (iw_handler) orinoco_ioctl_setport3,
+       [3] = (iw_handler) orinoco_ioctl_getport3,
+       [4] = (iw_handler) orinoco_ioctl_setpreamble,
+       [5] = (iw_handler) orinoco_ioctl_getpreamble,
+       [6] = (iw_handler) orinoco_ioctl_setibssport,
+       [7] = (iw_handler) orinoco_ioctl_getibssport,
+       [9] = (iw_handler) orinoco_ioctl_getrid,
+};
 
-       return dev;
+static const struct iw_handler_def orinoco_handler_def = {
+       .num_standard = ARRAY_SIZE(orinoco_handler),
+       .num_private = ARRAY_SIZE(orinoco_private_handler),
+       .num_private_args = ARRAY_SIZE(orinoco_privtab),
+       .standard = orinoco_handler,
+       .private = orinoco_private_handler,
+       .private_args = orinoco_privtab,
+       .get_wireless_stats = orinoco_get_wireless_stats,
+};
+
+static void orinoco_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info)
+{
+       struct orinoco_private *priv = netdev_priv(dev);
 
+       strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1);
+       strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
+       strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1);
+       if (dev->class_dev.dev)
+               strncpy(info->bus_info, dev->class_dev.dev->bus_id,
+                       sizeof(info->bus_info) - 1);
+       else
+               snprintf(info->bus_info, sizeof(info->bus_info) - 1,
+                        "PCMCIA %p", priv->hw.iobase);
 }
 
+static const struct ethtool_ops orinoco_ethtool_ops = {
+       .get_drvinfo = orinoco_get_drvinfo,
+       .get_link = ethtool_op_get_link,
+};
+
 /********************************************************************/
 /* Module initialization                                            */
 /********************************************************************/
 
 EXPORT_SYMBOL(alloc_orinocodev);
+EXPORT_SYMBOL(free_orinocodev);
 
 EXPORT_SYMBOL(__orinoco_up);
 EXPORT_SYMBOL(__orinoco_down);
-EXPORT_SYMBOL(orinoco_stop);
 EXPORT_SYMBOL(orinoco_reinit_firmware);
 
 EXPORT_SYMBOL(orinoco_interrupt);
 
 /* Can't be declared "const" or the whole __initdata section will
  * become const */
-static char version[] __initdata = "orinoco.c 0.13e (David Gibson <hermes@gibson.dropbear.id.au> and others)";
+static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
+       " (David Gibson <hermes@gibson.dropbear.id.au>, "
+       "Pavel Roskin <proski@gnu.org>, et al)";
 
 static int __init init_orinoco(void)
 {