]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Ran scripts/Lindent on drivers/net/wireless/ipw2{1,2}00.{c,h}
authorJames Ketrenos <jketreno@linux.intel.com>
Wed, 14 Sep 2005 14:47:29 +0000 (09:47 -0500)
committerJames Ketrenos <jketreno@linux.intel.com>
Mon, 7 Nov 2005 23:49:45 +0000 (17:49 -0600)
No other changes.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
drivers/net/wireless/ipw2100.c
drivers/net/wireless/ipw2100.h

index ad7f8cd76db9041376b19a024a74dc38ac5854b4..a15eef1c2a6277f0ec76c0c26ca459f49ecc006c 100644 (file)
@@ -174,10 +174,9 @@ that only one external action is invoked at a time.
 #define DRV_DESCRIPTION        "Intel(R) PRO/Wireless 2100 Network Driver"
 #define DRV_COPYRIGHT  "Copyright(c) 2003-2004 Intel Corporation"
 
-
 /* Debugging stuff */
 #ifdef CONFIG_IPW_DEBUG
-#define CONFIG_IPW2100_RX_DEBUG   /* Reception debugging */
+#define CONFIG_IPW2100_RX_DEBUG        /* Reception debugging */
 #endif
 
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
@@ -220,18 +219,18 @@ do { \
 } while (0)
 #else
 #define IPW_DEBUG(level, message...) do {} while (0)
-#endif /* CONFIG_IPW_DEBUG */
+#endif                         /* CONFIG_IPW_DEBUG */
 
 #ifdef CONFIG_IPW_DEBUG
 static const char *command_types[] = {
        "undefined",
-       "unused", /* HOST_ATTENTION */
+       "unused",               /* HOST_ATTENTION */
        "HOST_COMPLETE",
-       "unused", /* SLEEP */
-       "unused", /* HOST_POWER_DOWN */
+       "unused",               /* SLEEP */
+       "unused",               /* HOST_POWER_DOWN */
        "unused",
        "SYSTEM_CONFIG",
-       "unused", /* SET_IMR */
+       "unused",               /* SET_IMR */
        "SSID",
        "MANDATORY_BSSID",
        "AUTHENTICATION_TYPE",
@@ -277,17 +276,16 @@ static const char *command_types[] = {
        "GROUP_ORDINALS",
        "SHORT_RETRY_LIMIT",
        "LONG_RETRY_LIMIT",
-       "unused", /* SAVE_CALIBRATION */
-       "unused", /* RESTORE_CALIBRATION */
+       "unused",               /* SAVE_CALIBRATION */
+       "unused",               /* RESTORE_CALIBRATION */
        "undefined",
        "undefined",
        "undefined",
        "HOST_PRE_POWER_DOWN",
-       "unused", /* HOST_INTERRUPT_COALESCING */
+       "unused",               /* HOST_INTERRUPT_COALESCING */
        "undefined",
        "CARD_DISABLE_PHY_OFF",
-       "MSDU_TX_RATES"
-       "undefined",
+       "MSDU_TX_RATES" "undefined",
        "undefined",
        "SET_STATION_STAT_BITS",
        "CLEAR_STATIONS_STAT_BITS",
@@ -298,7 +296,6 @@ static const char *command_types[] = {
 };
 #endif
 
-
 /* Pre-decl until we get the code solid and then we can clean it up */
 static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
 static void ipw2100_tx_send_data(struct ipw2100_priv *priv);
@@ -321,11 +318,10 @@ static void ipw2100_release_firmware(struct ipw2100_priv *priv,
 static int ipw2100_ucode_download(struct ipw2100_priv *priv,
                                  struct ipw2100_fw *fw);
 static void ipw2100_wx_event_work(struct ipw2100_priv *priv);
-static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev);
+static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev);
 static struct iw_handler_def ipw2100_wx_handler_def;
 
-
-static inline void read_register(struct net_device *dev, u32 reg, u32 *val)
+static inline void read_register(struct net_device *dev, u32 reg, u32 * val)
 {
        *val = readl((void __iomem *)(dev->base_addr + reg));
        IPW_DEBUG_IO("r: 0x%08X => 0x%08X\n", reg, *val);
@@ -337,13 +333,14 @@ static inline void write_register(struct net_device *dev, u32 reg, u32 val)
        IPW_DEBUG_IO("w: 0x%08X <= 0x%08X\n", reg, val);
 }
 
-static inline void read_register_word(struct net_device *dev, u32 reg, u16 *val)
+static inline void read_register_word(struct net_device *dev, u32 reg,
+                                     u16 * val)
 {
        *val = readw((void __iomem *)(dev->base_addr + reg));
        IPW_DEBUG_IO("r: 0x%08X => %04X\n", reg, *val);
 }
 
-static inline void read_register_byte(struct net_device *dev, u32 reg, u8 *val)
+static inline void read_register_byte(struct net_device *dev, u32 reg, u8 * val)
 {
        *val = readb((void __iomem *)(dev->base_addr + reg));
        IPW_DEBUG_IO("r: 0x%08X => %02X\n", reg, *val);
@@ -355,14 +352,13 @@ static inline void write_register_word(struct net_device *dev, u32 reg, u16 val)
        IPW_DEBUG_IO("w: 0x%08X <= %04X\n", reg, val);
 }
 
-
 static inline void write_register_byte(struct net_device *dev, u32 reg, u8 val)
 {
        writeb(val, (void __iomem *)(dev->base_addr + reg));
        IPW_DEBUG_IO("w: 0x%08X =< %02X\n", reg, val);
 }
 
-static inline void read_nic_dword(struct net_device *dev, u32 addr, u32 *val)
+static inline void read_nic_dword(struct net_device *dev, u32 addr, u32 * val)
 {
        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
                       addr & IPW_REG_INDIRECT_ADDR_MASK);
@@ -376,7 +372,7 @@ static inline void write_nic_dword(struct net_device *dev, u32 addr, u32 val)
        write_register(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
 }
 
-static inline void read_nic_word(struct net_device *dev, u32 addr, u16 *val)
+static inline void read_nic_word(struct net_device *dev, u32 addr, u16 * val)
 {
        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
                       addr & IPW_REG_INDIRECT_ADDR_MASK);
@@ -390,7 +386,7 @@ static inline void write_nic_word(struct net_device *dev, u32 addr, u16 val)
        write_register_word(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
 }
 
-static inline void read_nic_byte(struct net_device *dev, u32 addr, u8 *val)
+static inline void read_nic_byte(struct net_device *dev, u32 addr, u8 * val)
 {
        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
                       addr & IPW_REG_INDIRECT_ADDR_MASK);
@@ -416,7 +412,7 @@ static inline void write_nic_dword_auto_inc(struct net_device *dev, u32 val)
 }
 
 static inline void write_nic_memory(struct net_device *dev, u32 addr, u32 len,
-                                   const u8 *buf)
+                                   const u8 * buf)
 {
        u32 aligned_addr;
        u32 aligned_len;
@@ -431,32 +427,30 @@ static inline void write_nic_memory(struct net_device *dev, u32 addr, u32 len,
                write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
                               aligned_addr);
                for (i = dif_len; i < 4; i++, buf++)
-                       write_register_byte(
-                               dev, IPW_REG_INDIRECT_ACCESS_DATA + i,
-                               *buf);
+                       write_register_byte(dev,
+                                           IPW_REG_INDIRECT_ACCESS_DATA + i,
+                                           *buf);
 
                len -= dif_len;
                aligned_addr += 4;
        }
 
        /* read DWs through autoincrement registers */
-       write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
-                      aligned_addr);
+       write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS, aligned_addr);
        aligned_len = len & (~0x3);
        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
-               write_register(
-                       dev, IPW_REG_AUTOINCREMENT_DATA, *(u32 *)buf);
+               write_register(dev, IPW_REG_AUTOINCREMENT_DATA, *(u32 *) buf);
 
        /* copy the last nibble */
        dif_len = len - aligned_len;
        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS, aligned_addr);
        for (i = 0; i < dif_len; i++, buf++)
-               write_register_byte(
-                       dev, IPW_REG_INDIRECT_ACCESS_DATA + i, *buf);
+               write_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA + i,
+                                   *buf);
 }
 
 static inline void read_nic_memory(struct net_device *dev, u32 addr, u32 len,
-                                  u8 *buf)
+                                  u8 * buf)
 {
        u32 aligned_addr;
        u32 aligned_len;
@@ -471,39 +465,38 @@ static inline void read_nic_memory(struct net_device *dev, u32 addr, u32 len,
                write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
                               aligned_addr);
                for (i = dif_len; i < 4; i++, buf++)
-                       read_register_byte(
-                               dev, IPW_REG_INDIRECT_ACCESS_DATA + i, buf);
+                       read_register_byte(dev,
+                                          IPW_REG_INDIRECT_ACCESS_DATA + i,
+                                          buf);
 
                len -= dif_len;
                aligned_addr += 4;
        }
 
        /* read DWs through autoincrement registers */
-       write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
-                      aligned_addr);
+       write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS, aligned_addr);
        aligned_len = len & (~0x3);
        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
-               read_register(dev, IPW_REG_AUTOINCREMENT_DATA,
-                             (u32 *)buf);
+               read_register(dev, IPW_REG_AUTOINCREMENT_DATA, (u32 *) buf);
 
        /* copy the last nibble */
        dif_len = len - aligned_len;
-       write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
-                      aligned_addr);
+       write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS, aligned_addr);
        for (i = 0; i < dif_len; i++, buf++)
-               read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA +
-                                  i, buf);
+               read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA + i, buf);
 }
 
 static inline int ipw2100_hw_is_adapter_in_system(struct net_device *dev)
 {
        return (dev->base_addr &&
-               (readl((void __iomem *)(dev->base_addr + IPW_REG_DOA_DEBUG_AREA_START))
+               (readl
+                ((void __iomem *)(dev->base_addr +
+                                  IPW_REG_DOA_DEBUG_AREA_START))
                 == IPW_DATA_DOA_DEBUG_VALUE));
 }
 
 static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
-                              void *val, u32 *len)
+                              void *val, u32 * len)
 {
        struct ipw2100_ordinals *ordinals = &priv->ordinals;
        u32 addr;
@@ -529,8 +522,8 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
                        return -EINVAL;
                }
 
-               read_nic_dword(priv->net_dev, ordinals->table1_addr + (ord << 2),
-                              &addr);
+               read_nic_dword(priv->net_dev,
+                              ordinals->table1_addr + (ord << 2), &addr);
                read_nic_dword(priv->net_dev, addr, val);
 
                *len = IPW_ORD_TAB_1_ENTRY_SIZE;
@@ -543,8 +536,8 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
                ord -= IPW_START_ORD_TAB_2;
 
                /* get the address of statistic */
-               read_nic_dword(priv->net_dev, ordinals->table2_addr + (ord << 3),
-                              &addr);
+               read_nic_dword(priv->net_dev,
+                              ordinals->table2_addr + (ord << 3), &addr);
 
                /* get the second DW of statistics ;
                 * two 16-bit words - first is length, second is count */
@@ -553,10 +546,10 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
                               &field_info);
 
                /* get each entry length */
-               field_len = *((u16 *)&field_info);
+               field_len = *((u16 *) & field_info);
 
                /* get number of entries */
-               field_count = *(((u16 *)&field_info) + 1);
+               field_count = *(((u16 *) & field_info) + 1);
 
                /* abort if no enought memory */
                total_length = field_len * field_count;
@@ -581,8 +574,8 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
        return -EINVAL;
 }
 
-static int ipw2100_set_ordinal(struct ipw2100_priv *priv, u32 ord, u32 *val,
-                              u32 *len)
+static int ipw2100_set_ordinal(struct ipw2100_priv *priv, u32 ord, u32 * val,
+                              u32 * len)
 {
        struct ipw2100_ordinals *ordinals = &priv->ordinals;
        u32 addr;
@@ -594,8 +587,8 @@ static int ipw2100_set_ordinal(struct ipw2100_priv *priv, u32 ord, u32 *val,
                        return -EINVAL;
                }
 
-               read_nic_dword(priv->net_dev, ordinals->table1_addr + (ord << 2),
-                              &addr);
+               read_nic_dword(priv->net_dev,
+                              ordinals->table1_addr + (ord << 2), &addr);
 
                write_nic_dword(priv->net_dev, addr, *val);
 
@@ -612,7 +605,7 @@ static int ipw2100_set_ordinal(struct ipw2100_priv *priv, u32 ord, u32 *val,
 }
 
 static char *snprint_line(char *buf, size_t count,
-                         const u8 *data, u32 len, u32 ofs)
+                         const u8 * data, u32 len, u32 ofs)
 {
        int out, i, j, l;
        char c;
@@ -646,7 +639,7 @@ static char *snprint_line(char *buf, size_t count,
        return buf;
 }
 
-static void printk_buf(int level, const u8 *data, u32 len)
+static void printk_buf(int level, const u8 * data, u32 len)
 {
        char line[81];
        u32 ofs = 0;
@@ -662,8 +655,6 @@ static void printk_buf(int level, const u8 *data, u32 len)
        }
 }
 
-
-
 #define MAX_RESET_BACKOFF 10
 
 static inline void schedule_reset(struct ipw2100_priv *priv)
@@ -703,7 +694,7 @@ static inline void schedule_reset(struct ipw2100_priv *priv)
 
 #define HOST_COMPLETE_TIMEOUT (2 * HZ)
 static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
-                                  struct host_command * cmd)
+                                  struct host_command *cmd)
 {
        struct list_head *element;
        struct ipw2100_tx_packet *packet;
@@ -713,25 +704,28 @@ static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
        IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n",
                     command_types[cmd->host_command], cmd->host_command,
                     cmd->host_command_length);
-       printk_buf(IPW_DL_HC, (u8*)cmd->host_command_parameters,
+       printk_buf(IPW_DL_HC, (u8 *) cmd->host_command_parameters,
                   cmd->host_command_length);
 
        spin_lock_irqsave(&priv->low_lock, flags);
 
        if (priv->fatal_error) {
-               IPW_DEBUG_INFO("Attempt to send command while hardware in fatal error condition.\n");
+               IPW_DEBUG_INFO
+                   ("Attempt to send command while hardware in fatal error condition.\n");
                err = -EIO;
                goto fail_unlock;
        }
 
        if (!(priv->status & STATUS_RUNNING)) {
-               IPW_DEBUG_INFO("Attempt to send command while hardware is not running.\n");
+               IPW_DEBUG_INFO
+                   ("Attempt to send command while hardware is not running.\n");
                err = -EIO;
                goto fail_unlock;
        }
 
        if (priv->status & STATUS_CMD_ACTIVE) {
-               IPW_DEBUG_INFO("Attempt to send command while another command is pending.\n");
+               IPW_DEBUG_INFO
+                   ("Attempt to send command while another command is pending.\n");
                err = -EBUSY;
                goto fail_unlock;
        }
@@ -752,7 +746,8 @@ static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
        /* initialize the firmware command packet */
        packet->info.c_struct.cmd->host_command_reg = cmd->host_command;
        packet->info.c_struct.cmd->host_command_reg1 = cmd->host_command1;
-       packet->info.c_struct.cmd->host_command_len_reg = cmd->host_command_length;
+       packet->info.c_struct.cmd->host_command_len_reg =
+           cmd->host_command_length;
        packet->info.c_struct.cmd->sequence = cmd->host_command_sequence;
 
        memcpy(packet->info.c_struct.cmd->host_command_params_reg,
@@ -776,9 +771,11 @@ static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
         * then there is a problem.
         */
 
-       err = wait_event_interruptible_timeout(
-               priv->wait_command_queue, !(priv->status & STATUS_CMD_ACTIVE),
-               HOST_COMPLETE_TIMEOUT);
+       err =
+           wait_event_interruptible_timeout(priv->wait_command_queue,
+                                            !(priv->
+                                              status & STATUS_CMD_ACTIVE),
+                                            HOST_COMPLETE_TIMEOUT);
 
        if (err == 0) {
                IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
@@ -804,13 +801,12 @@ static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
 
        return 0;
 
- fail_unlock:
     fail_unlock:
        spin_unlock_irqrestore(&priv->low_lock, flags);
 
        return err;
 }
 
-
 /*
  * Verify the values and data access of the hardware
  * No locks needed or used.  No functions called.
@@ -825,8 +821,7 @@ static int ipw2100_verify(struct ipw2100_priv *priv)
 
        /* Domain 0 check - all values should be DOA_DEBUG */
        for (address = IPW_REG_DOA_DEBUG_AREA_START;
-            address < IPW_REG_DOA_DEBUG_AREA_END;
-            address += sizeof(u32)) {
+            address < IPW_REG_DOA_DEBUG_AREA_END; address += sizeof(u32)) {
                read_register(priv->net_dev, address, &data1);
                if (data1 != IPW_DATA_DOA_DEBUG_VALUE)
                        return -EIO;
@@ -898,7 +893,6 @@ static int ipw2100_wait_for_card_state(struct ipw2100_priv *priv, int state)
        return -EIO;
 }
 
-
 /*********************************************************************
     Procedure   :   sw_reset_and_clock
     Purpose     :   Asserts s/w reset, asserts clock initialization
@@ -975,17 +969,16 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
 
        if (priv->fatal_error) {
                IPW_DEBUG_ERROR("%s: ipw2100_download_firmware called after "
-                      "fatal error %d.  Interface must be brought down.\n",
-                      priv->net_dev->name, priv->fatal_error);
+                               "fatal error %d.  Interface must be brought down.\n",
+                               priv->net_dev->name, priv->fatal_error);
                return -EINVAL;
        }
-
 #ifdef CONFIG_PM
        if (!ipw2100_firmware.version) {
                err = ipw2100_get_firmware(priv, &ipw2100_firmware);
                if (err) {
                        IPW_DEBUG_ERROR("%s: ipw2100_get_firmware failed: %d\n",
-                              priv->net_dev->name, err);
+                                       priv->net_dev->name, err);
                        priv->fatal_error = IPW2100_ERR_FW_LOAD;
                        goto fail;
                }
@@ -994,7 +987,7 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
        err = ipw2100_get_firmware(priv, &ipw2100_firmware);
        if (err) {
                IPW_DEBUG_ERROR("%s: ipw2100_get_firmware failed: %d\n",
-                      priv->net_dev->name, err);
+                               priv->net_dev->name, err);
                priv->fatal_error = IPW2100_ERR_FW_LOAD;
                goto fail;
        }
@@ -1005,21 +998,20 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
        err = sw_reset_and_clock(priv);
        if (err) {
                IPW_DEBUG_ERROR("%s: sw_reset_and_clock failed: %d\n",
-                      priv->net_dev->name, err);
+                               priv->net_dev->name, err);
                goto fail;
        }
 
        err = ipw2100_verify(priv);
        if (err) {
                IPW_DEBUG_ERROR("%s: ipw2100_verify failed: %d\n",
-                      priv->net_dev->name, err);
+                               priv->net_dev->name, err);
                goto fail;
        }
 
        /* Hold ARC */
        write_nic_dword(priv->net_dev,
-                       IPW_INTERNAL_REGISTER_HALT_AND_RESET,
-                       0x80000000);
+                       IPW_INTERNAL_REGISTER_HALT_AND_RESET, 0x80000000);
 
        /* allow ARC to run */
        write_register(priv->net_dev, IPW_REG_RESET_REG, 0);
@@ -1034,13 +1026,13 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
 
        /* release ARC */
        write_nic_dword(priv->net_dev,
-                       IPW_INTERNAL_REGISTER_HALT_AND_RESET,
-                       0x00000000);
+                       IPW_INTERNAL_REGISTER_HALT_AND_RESET, 0x00000000);
 
        /* s/w reset and clock stabilization (again!!!) */
        err = sw_reset_and_clock(priv);
        if (err) {
-               printk(KERN_ERR DRV_NAME ": %s: sw_reset_and_clock failed: %d\n",
+               printk(KERN_ERR DRV_NAME
+                      ": %s: sw_reset_and_clock failed: %d\n",
                       priv->net_dev->name, err);
                goto fail;
        }
@@ -1049,10 +1041,9 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
        err = ipw2100_fw_download(priv, &ipw2100_firmware);
        if (err) {
                IPW_DEBUG_ERROR("%s: Error loading firmware: %d\n",
-                      priv->net_dev->name, err);
+                               priv->net_dev->name, err);
                goto fail;
        }
-
 #ifndef CONFIG_PM
        /*
         * When the .resume method of the driver is called, the other
@@ -1084,7 +1075,7 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
 
        return 0;
 
- fail:
     fail:
        ipw2100_release_firmware(priv, &ipw2100_firmware);
        return err;
 }
@@ -1105,7 +1096,6 @@ static inline void ipw2100_disable_interrupts(struct ipw2100_priv *priv)
        write_register(priv->net_dev, IPW_REG_INTA_MASK, 0x0);
 }
 
-
 static void ipw2100_initialize_ordinals(struct ipw2100_priv *priv)
 {
        struct ipw2100_ordinals *ord = &priv->ordinals;
@@ -1177,11 +1167,10 @@ static int ipw2100_get_hw_features(struct ipw2100_priv *priv)
         * EEPROM_SRAM_DB_START_ADDRESS using ordinal in ordinal table 1
         */
        len = sizeof(addr);
-       if (ipw2100_get_ordinal(
-                   priv, IPW_ORD_EEPROM_SRAM_DB_BLOCK_START_ADDRESS,
-                   &addr, &len)) {
+       if (ipw2100_get_ordinal
+           (priv, IPW_ORD_EEPROM_SRAM_DB_BLOCK_START_ADDRESS, &addr, &len)) {
                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
-                      __LINE__);
+                              __LINE__);
                return -EIO;
        }
 
@@ -1194,7 +1183,7 @@ static int ipw2100_get_hw_features(struct ipw2100_priv *priv)
        priv->eeprom_version = (val >> 24) & 0xFF;
        IPW_DEBUG_INFO("EEPROM version: %d\n", priv->eeprom_version);
 
-        /*
+       /*
         *  HW RF Kill enable is bit 0 in byte at offset 0x21 in firmware
         *
         *  notice that the EEPROM bit is reverse polarity, i.e.
@@ -1206,8 +1195,7 @@ static int ipw2100_get_hw_features(struct ipw2100_priv *priv)
                priv->hw_features |= HW_FEATURE_RFKILL;
 
        IPW_DEBUG_INFO("HW RF Kill: %ssupported.\n",
-                          (priv->hw_features & HW_FEATURE_RFKILL) ?
-                          "" : "not ");
+                      (priv->hw_features & HW_FEATURE_RFKILL) ? "" : "not ");
 
        return 0;
 }
@@ -1234,7 +1222,8 @@ static int ipw2100_start_adapter(struct ipw2100_priv *priv)
         * fw & dino ucode
         */
        if (ipw2100_download_firmware(priv)) {
-               printk(KERN_ERR DRV_NAME ": %s: Failed to power on the adapter.\n",
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Failed to power on the adapter.\n",
                       priv->net_dev->name);
                return -EIO;
        }
@@ -1293,7 +1282,8 @@ static int ipw2100_start_adapter(struct ipw2100_priv *priv)
                     i ? "SUCCESS" : "FAILED");
 
        if (!i) {
-               printk(KERN_WARNING DRV_NAME ": %s: Firmware did not initialize.\n",
+               printk(KERN_WARNING DRV_NAME
+                      ": %s: Firmware did not initialize.\n",
                       priv->net_dev->name);
                return -EIO;
        }
@@ -1326,7 +1316,6 @@ static inline void ipw2100_reset_fatalerror(struct ipw2100_priv *priv)
        priv->fatal_error = 0;
 }
 
-
 /* NOTE: Our interrupt is disabled when this method is called */
 static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
 {
@@ -1350,19 +1339,19 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
 
                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
                        break;
-       }  while(i--);
+       } while (i--);
 
        priv->status &= ~STATUS_RESET_PENDING;
 
        if (!i) {
-               IPW_DEBUG_INFO("exit - waited too long for master assert stop\n");
+               IPW_DEBUG_INFO
+                   ("exit - waited too long for master assert stop\n");
                return -EIO;
        }
 
        write_register(priv->net_dev, IPW_REG_RESET_REG,
                       IPW_AUX_HOST_RESET_REG_SW_RESET);
 
-
        /* Reset any fatal_error conditions */
        ipw2100_reset_fatalerror(priv);
 
@@ -1415,7 +1404,6 @@ static int ipw2100_hw_phy_off(struct ipw2100_priv *priv)
        return -EIO;
 }
 
-
 static int ipw2100_enable_adapter(struct ipw2100_priv *priv)
 {
        struct host_command cmd = {
@@ -1445,9 +1433,8 @@ static int ipw2100_enable_adapter(struct ipw2100_priv *priv)
 
        err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_ENABLED);
        if (err) {
-               IPW_DEBUG_INFO(
-                      "%s: card not responding to init command.\n",
-                      priv->net_dev->name);
+               IPW_DEBUG_INFO("%s: card not responding to init command.\n",
+                              priv->net_dev->name);
                goto fail_up;
        }
 
@@ -1456,7 +1443,7 @@ static int ipw2100_enable_adapter(struct ipw2100_priv *priv)
                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
        }
 
-fail_up:
+      fail_up:
        up(&priv->adapter_sem);
        return err;
 }
@@ -1488,7 +1475,8 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
 
                err = ipw2100_hw_phy_off(priv);
                if (err)
-                       printk(KERN_WARNING DRV_NAME ": Error disabling radio %d\n", err);
+                       printk(KERN_WARNING DRV_NAME
+                              ": Error disabling radio %d\n", err);
 
                /*
                 * If in D0-standby mode going directly to D3 may cause a
@@ -1566,7 +1554,6 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
        return 0;
 }
 
-
 static int ipw2100_disable_adapter(struct ipw2100_priv *priv)
 {
        struct host_command cmd = {
@@ -1593,19 +1580,21 @@ static int ipw2100_disable_adapter(struct ipw2100_priv *priv)
 
        err = ipw2100_hw_send_command(priv, &cmd);
        if (err) {
-               printk(KERN_WARNING DRV_NAME ": exit - failed to send CARD_DISABLE command\n");
+               printk(KERN_WARNING DRV_NAME
+                      ": exit - failed to send CARD_DISABLE command\n");
                goto fail_up;
        }
 
        err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_DISABLED);
        if (err) {
-               printk(KERN_WARNING DRV_NAME ": exit - card failed to change to DISABLED\n");
+               printk(KERN_WARNING DRV_NAME
+                      ": exit - card failed to change to DISABLED\n");
                goto fail_up;
        }
 
        IPW_DEBUG_INFO("TODO: implement scan state machine\n");
 
-fail_up:
+      fail_up:
        up(&priv->adapter_sem);
        return err;
 }
@@ -1709,8 +1698,9 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
            (priv->status & STATUS_RESET_PENDING)) {
                /* Power cycle the card ... */
                if (ipw2100_power_cycle_adapter(priv)) {
-                       printk(KERN_WARNING DRV_NAME ": %s: Could not cycle adapter.\n",
-                                         priv->net_dev->name);
+                       printk(KERN_WARNING DRV_NAME
+                              ": %s: Could not cycle adapter.\n",
+                              priv->net_dev->name);
                        rc = 1;
                        goto exit;
                }
@@ -1719,8 +1709,9 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 
        /* Load the firmware, start the clocks, etc. */
        if (ipw2100_start_adapter(priv)) {
-               printk(KERN_ERR DRV_NAME ": %s: Failed to start the firmware.\n",
-                               priv->net_dev->name);
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Failed to start the firmware.\n",
+                      priv->net_dev->name);
                rc = 1;
                goto exit;
        }
@@ -1729,16 +1720,18 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 
        /* Determine capabilities of this particular HW configuration */
        if (ipw2100_get_hw_features(priv)) {
-               printk(KERN_ERR DRV_NAME ": %s: Failed to determine HW features.\n",
-                               priv->net_dev->name);
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Failed to determine HW features.\n",
+                      priv->net_dev->name);
                rc = 1;
                goto exit;
        }
 
        lock = LOCK_NONE;
        if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
-               printk(KERN_ERR DRV_NAME ": %s: Failed to clear ordinal lock.\n",
-                               priv->net_dev->name);
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Failed to clear ordinal lock.\n",
+                      priv->net_dev->name);
                rc = 1;
                goto exit;
        }
@@ -1764,7 +1757,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
         * HOST_COMPLETE */
        if (ipw2100_adapter_setup(priv)) {
                printk(KERN_ERR DRV_NAME ": %s: Failed to start the card.\n",
-                               priv->net_dev->name);
+                      priv->net_dev->name);
                rc = 1;
                goto exit;
        }
@@ -1773,20 +1766,19 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
                /* Enable the adapter - sends HOST_COMPLETE */
                if (ipw2100_enable_adapter(priv)) {
                        printk(KERN_ERR DRV_NAME ": "
-                               "%s: failed in call to enable adapter.\n",
-                               priv->net_dev->name);
+                              "%s: failed in call to enable adapter.\n",
+                              priv->net_dev->name);
                        ipw2100_hw_stop_adapter(priv);
                        rc = 1;
                        goto exit;
                }
 
-
                /* Start a scan . . . */
                ipw2100_set_scan_options(priv);
                ipw2100_start_scan(priv);
        }
 
- exit:
     exit:
        return rc;
 }
 
@@ -1802,8 +1794,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
        unsigned long flags;
        union iwreq_data wrqu = {
                .ap_addr = {
-                       .sa_family = ARPHRD_ETHER
-               }
+                           .sa_family = ARPHRD_ETHER}
        };
        int associated = priv->status & STATUS_ASSOCIATED;
 
@@ -1862,8 +1853,7 @@ static void ipw2100_reset_adapter(struct ipw2100_priv *priv)
        unsigned long flags;
        union iwreq_data wrqu = {
                .ap_addr = {
-                       .sa_family = ARPHRD_ETHER
-               }
+                           .sa_family = ARPHRD_ETHER}
        };
        int associated = priv->status & STATUS_ASSOCIATED;
 
@@ -1894,7 +1884,6 @@ static void ipw2100_reset_adapter(struct ipw2100_priv *priv)
 
 }
 
-
 static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
 {
 
@@ -1904,7 +1893,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
        u32 txrate;
        u32 chan;
        char *txratename;
-       u8 bssid[ETH_ALEN];
+       u8 bssid[ETH_ALEN];
 
        /*
         * TBD: BSSID is usually 00:00:00:00:00:00 here and not
@@ -1918,16 +1907,15 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
                                  essid, &essid_len);
        if (ret) {
                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
-                                  __LINE__);
+                              __LINE__);
                return;
        }
 
        len = sizeof(u32);
-       ret = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE,
-                                 &txrate, &len);
+       ret = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE, &txrate, &len);
        if (ret) {
                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
-                                  __LINE__);
+                              __LINE__);
                return;
        }
 
@@ -1935,19 +1923,18 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
        ret = ipw2100_get_ordinal(priv, IPW_ORD_OUR_FREQ, &chan, &len);
        if (ret) {
                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
-                                  __LINE__);
+                              __LINE__);
                return;
        }
        len = ETH_ALEN;
-        ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid,  &len);
+       ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid, &len);
        if (ret) {
                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
-                                  __LINE__);
+                              __LINE__);
                return;
        }
        memcpy(priv->ieee->bssid, bssid, ETH_ALEN);
 
-
        switch (txrate) {
        case TX_RATE_1_MBIT:
                txratename = "1Mbps";
@@ -1974,7 +1961,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
 
        /* now we copy read ssid into dev */
        if (!(priv->config & CFG_STATIC_ESSID)) {
-               priv->essid_len = min((u8)essid_len, (u8)IW_ESSID_MAX_SIZE);
+               priv->essid_len = min((u8) essid_len, (u8) IW_ESSID_MAX_SIZE);
                memcpy(priv->essid, essid, priv->essid_len);
        }
        priv->channel = chan;
@@ -1986,7 +1973,6 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
        queue_delayed_work(priv->workqueue, &priv->wx_event_work, HZ / 10);
 }
 
-
 static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
                             int length, int batch_mode)
 {
@@ -2001,8 +1987,7 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
        IPW_DEBUG_HC("SSID: '%s'\n", escape_essid(essid, ssid_len));
 
        if (ssid_len)
-               memcpy((char*)cmd.host_command_parameters,
-                      essid, ssid_len);
+               memcpy((char *)cmd.host_command_parameters, essid, ssid_len);
 
        if (!batch_mode) {
                err = ipw2100_disable_adapter(priv);
@@ -2014,7 +1999,7 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
         * disable auto association -- so we cheat by setting a bogus SSID */
        if (!ssid_len && !(priv->config & CFG_ASSOCIATE)) {
                int i;
-               u8 *bogus = (u8*)cmd.host_command_parameters;
+               u8 *bogus = (u8 *) cmd.host_command_parameters;
                for (i = 0; i < IW_ESSID_MAX_SIZE; i++)
                        bogus[i] = 0x18 + i;
                cmd.host_command_length = IW_ESSID_MAX_SIZE;
@@ -2025,8 +2010,7 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
 
        err = ipw2100_hw_send_command(priv, &cmd);
        if (!err) {
-               memset(priv->essid + ssid_len, 0,
-                      IW_ESSID_MAX_SIZE - ssid_len);
+               memset(priv->essid + ssid_len, 0, IW_ESSID_MAX_SIZE - ssid_len);
                memcpy(priv->essid, essid, ssid_len);
                priv->essid_len = ssid_len;
        }
@@ -2071,7 +2055,7 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
 static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
 {
        IPW_DEBUG_INFO("%s: RF Kill state changed to radio OFF.\n",
-              priv->net_dev->name);
+                      priv->net_dev->name);
 
        /* RF_KILL is now enabled (else we wouldn't be here) */
        priv->status |= STATUS_RF_KILL_HW;
@@ -2102,16 +2086,16 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
 #define IPW2100_HANDLER(v, f) { v, f, # v }
 struct ipw2100_status_indicator {
        int status;
-       void (*cb)(struct ipw2100_priv *priv, u32 status);
+       void (*cb) (struct ipw2100_priv * priv, u32 status);
        char *name;
 };
 #else
 #define IPW2100_HANDLER(v, f) { v, f }
 struct ipw2100_status_indicator {
        int status;
-       void (*cb)(struct ipw2100_priv *priv, u32 status);
+       void (*cb) (struct ipw2100_priv * priv, u32 status);
 };
-#endif /* CONFIG_IPW_DEBUG */
+#endif                         /* CONFIG_IPW_DEBUG */
 
 static void isr_indicate_scanning(struct ipw2100_priv *priv, u32 status)
 {
@@ -2135,7 +2119,6 @@ static const struct ipw2100_status_indicator status_handlers[] = {
        IPW2100_HANDLER(-1, NULL)
 };
 
-
 static void isr_status_change(struct ipw2100_priv *priv, int status)
 {
        int i;
@@ -2153,7 +2136,7 @@ static void isr_status_change(struct ipw2100_priv *priv, int status)
        for (i = 0; status_handlers[i].status != -1; i++) {
                if (status == status_handlers[i].status) {
                        IPW_DEBUG_NOTIF("Status change: %s\n",
-                                        status_handlers[i].name);
+                                       status_handlers[i].name);
                        if (status_handlers[i].cb)
                                status_handlers[i].cb(priv, status);
                        priv->wstats.status = status;
@@ -2164,9 +2147,8 @@ static void isr_status_change(struct ipw2100_priv *priv, int status)
        IPW_DEBUG_NOTIF("unknown status received: %04x\n", status);
 }
 
-static void isr_rx_complete_command(
-       struct ipw2100_priv *priv,
-       struct ipw2100_cmd_header *cmd)
+static void isr_rx_complete_command(struct ipw2100_priv *priv,
+                                   struct ipw2100_cmd_header *cmd)
 {
 #ifdef CONFIG_IPW_DEBUG
        if (cmd->host_command_reg < ARRAY_SIZE(command_types)) {
@@ -2196,10 +2178,8 @@ static const char *frame_types[] = {
 };
 #endif
 
-
-static inline int ipw2100_alloc_skb(
-       struct ipw2100_priv *priv,
-       struct ipw2100_rx_packet *packet)
+static inline int ipw2100_alloc_skb(struct ipw2100_priv *priv,
+                                   struct ipw2100_rx_packet *packet)
 {
        packet->skb = dev_alloc_skb(sizeof(struct ipw2100_rx));
        if (!packet->skb)
@@ -2215,7 +2195,6 @@ static inline int ipw2100_alloc_skb(
        return 0;
 }
 
-
 #define SEARCH_ERROR   0xffffffff
 #define SEARCH_FAIL    0xfffffffe
 #define SEARCH_SUCCESS 0xfffffff0
@@ -2229,10 +2208,10 @@ static inline int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)
        if (priv->snapshot[0])
                return 1;
        for (i = 0; i < 0x30; i++) {
-               priv->snapshot[i] = (u8*)kmalloc(0x1000, GFP_ATOMIC);
+               priv->snapshot[i] = (u8 *) kmalloc(0x1000, GFP_ATOMIC);
                if (!priv->snapshot[i]) {
                        IPW_DEBUG_INFO("%s: Error allocating snapshot "
-                              "buffer %d\n", priv->net_dev->name, i);
+                                      "buffer %d\n", priv->net_dev->name, i);
                        while (i > 0)
                                kfree(priv->snapshot[--i]);
                        priv->snapshot[0] = NULL;
@@ -2253,7 +2232,7 @@ static inline void ipw2100_snapshot_free(struct ipw2100_priv *priv)
        priv->snapshot[0] = NULL;
 }
 
-static inline u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 *in_buf,
+static inline u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 * in_buf,
                                    size_t len, int mode)
 {
        u32 i, j;
@@ -2270,9 +2249,9 @@ static inline u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 *in_buf,
        for (ret = SEARCH_FAIL, i = 0; i < 0x30000; i += 4) {
                read_nic_dword(priv->net_dev, i, &tmp);
                if (mode == SEARCH_SNAPSHOT)
-                       *(u32 *)SNAPSHOT_ADDR(i) = tmp;
+                       *(u32 *) SNAPSHOT_ADDR(i) = tmp;
                if (ret == SEARCH_FAIL) {
-                       d = (u8*)&tmp;
+                       d = (u8 *) & tmp;
                        for (j = 0; j < 4; j++) {
                                if (*s != *d) {
                                        s = in_buf;
@@ -2310,8 +2289,7 @@ static inline u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 *in_buf,
 static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH];
 #endif
 
-static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv,
-                                              int i)
+static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
 {
 #ifdef CONFIG_IPW_DEBUG_C3
        struct ipw2100_status *status = &priv->status_queue.drv[i];
@@ -2346,9 +2324,9 @@ static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv,
 
                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
                        break;
-       }  while (j--);
+       } while (j--);
 
-       match = ipw2100_match_buf(priv, (u8*)status,
+       match = ipw2100_match_buf(priv, (u8 *) status,
                                  sizeof(struct ipw2100_status),
                                  SEARCH_SNAPSHOT);
        if (match < SEARCH_SUCCESS)
@@ -2360,7 +2338,7 @@ static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv,
                IPW_DEBUG_INFO("%s: No DMA status match in "
                               "Firmware.\n", priv->net_dev->name);
 
-       printk_buf((u8*)priv->status_queue.drv,
+       printk_buf((u8 *) priv->status_queue.drv,
                   sizeof(struct ipw2100_status) * RX_QUEUE_LENGTH);
 #endif
 
@@ -2401,17 +2379,15 @@ static inline void isr_rx(struct ipw2100_priv *priv, int i,
        }
 
        if (unlikely(priv->ieee->iw_mode != IW_MODE_MONITOR &&
-               !(priv->status & STATUS_ASSOCIATED))) {
+                    !(priv->status & STATUS_ASSOCIATED))) {
                IPW_DEBUG_DROP("Dropping packet while not associated.\n");
                priv->wstats.discard.misc++;
                return;
        }
 
-
        pci_unmap_single(priv->pci_dev,
                         packet->dma_addr,
-                        sizeof(struct ipw2100_rx),
-                        PCI_DMA_FROMDEVICE);
+                        sizeof(struct ipw2100_rx), PCI_DMA_FROMDEVICE);
 
        skb_put(packet->skb, status->frame_size);
 
@@ -2438,8 +2414,8 @@ static inline void isr_rx(struct ipw2100_priv *priv, int i,
        /* We need to allocate a new SKB and attach it to the RDB. */
        if (unlikely(ipw2100_alloc_skb(priv, packet))) {
                printk(KERN_WARNING DRV_NAME ": "
-                       "%s: Unable to allocate SKB onto RBD ring - disabling "
-                       "adapter.\n", priv->net_dev->name);
+                      "%s: Unable to allocate SKB onto RBD ring - disabling "
+                      "adapter.\n", priv->net_dev->name);
                /* TODO: schedule adapter shutdown */
                IPW_DEBUG_INFO("TODO: Shutdown adapter...\n");
        }
@@ -2534,11 +2510,11 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
 
                /* Sync the DMA for the STATUS buffer so CPU is sure to get
                 * the correct values */
-               pci_dma_sync_single_for_cpu(
-                       priv->pci_dev,
-                       sq->nic + sizeof(struct ipw2100_status) * i,
-                       sizeof(struct ipw2100_status),
-                       PCI_DMA_FROMDEVICE);
+               pci_dma_sync_single_for_cpu(priv->pci_dev,
+                                           sq->nic +
+                                           sizeof(struct ipw2100_status) * i,
+                                           sizeof(struct ipw2100_status),
+                                           PCI_DMA_FROMDEVICE);
 
                /* Sync the DMA for the RX buffer so CPU is sure to get
                 * the correct values */
@@ -2552,8 +2528,7 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
                }
 
                u = packet->rxp;
-               frame_type = sq->drv[i].status_fields &
-                       STATUS_TYPE_MASK;
+               frame_type = sq->drv[i].status_fields & STATUS_TYPE_MASK;
                stats.rssi = sq->drv[i].rssi + IPW2100_RSSI_TO_DBM;
                stats.len = sq->drv[i].frame_size;
 
@@ -2562,16 +2537,14 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
                        stats.mask |= IEEE80211_STATMASK_RSSI;
                stats.freq = IEEE80211_24GHZ_BAND;
 
-               IPW_DEBUG_RX(
-                       "%s: '%s' frame type received (%d).\n",
-                       priv->net_dev->name, frame_types[frame_type],
-                       stats.len);
+               IPW_DEBUG_RX("%s: '%s' frame type received (%d).\n",
+                            priv->net_dev->name, frame_types[frame_type],
+                            stats.len);
 
                switch (frame_type) {
                case COMMAND_STATUS_VAL:
                        /* Reset Rx watchdog */
-                       isr_rx_complete_command(
-                               priv, &u->rx_data.command);
+                       isr_rx_complete_command(priv, &u->rx_data.command);
                        break;
 
                case STATUS_CHANGE_VAL:
@@ -2588,12 +2561,10 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
 #endif
                        if (stats.len < sizeof(u->rx_data.header))
                                break;
-                       switch (WLAN_FC_GET_TYPE(u->rx_data.header.
-                                                frame_ctl)) {
+                       switch (WLAN_FC_GET_TYPE(u->rx_data.header.frame_ctl)) {
                        case IEEE80211_FTYPE_MGMT:
                                ieee80211_rx_mgt(priv->ieee,
-                                                &u->rx_data.header,
-                                                &stats);
+                                                &u->rx_data.header, &stats);
                                break;
 
                        case IEEE80211_FTYPE_CTL:
@@ -2607,7 +2578,7 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
                        break;
                }
 
-       increment:
+             increment:
                /* clear status field associated with this RBD */
                rxq->drv[i].status.info.field = 0;
 
@@ -2619,12 +2590,10 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
                rxq->next = (i ? i : rxq->entries) - 1;
 
                write_register(priv->net_dev,
-                              IPW_MEM_HOST_SHARED_RX_WRITE_INDEX,
-                              rxq->next);
+                              IPW_MEM_HOST_SHARED_RX_WRITE_INDEX, rxq->next);
        }
 }
 
-
 /*
  * __ipw2100_tx_process
  *
@@ -2667,7 +2636,7 @@ static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
 static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
 {
        struct ipw2100_bd_queue *txq = &priv->tx_queue;
-        struct ipw2100_bd *tbd;
+       struct ipw2100_bd *tbd;
        struct list_head *element;
        struct ipw2100_tx_packet *packet;
        int descriptors_used;
@@ -2680,7 +2649,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
        element = priv->fw_pend_list.next;
 
        packet = list_entry(element, struct ipw2100_tx_packet, list);
-        tbd = &txq->drv[packet->index];
+       tbd = &txq->drv[packet->index];
 
        /* Determine how many TBD entries must be finished... */
        switch (packet->type) {
@@ -2693,14 +2662,14 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
        case DATA:
                /* DATA uses two slots; advance and loop position. */
                descriptors_used = tbd->num_fragments;
-                frag_num = tbd->num_fragments - 1;
+               frag_num = tbd->num_fragments - 1;
                e = txq->oldest + frag_num;
                e %= txq->entries;
                break;
 
        default:
                printk(KERN_WARNING DRV_NAME ": %s: Bad fw_pend_list entry!\n",
-                                  priv->net_dev->name);
+                      priv->net_dev->name);
                return 0;
        }
 
@@ -2716,13 +2685,12 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
                printk(KERN_WARNING DRV_NAME ": %s: write index mismatch\n",
                       priv->net_dev->name);
 
-        /*
+       /*
         * txq->next is the index of the last packet written txq->oldest is
         * the index of the r is the index of the next packet to be read by
         * firmware
         */
 
-
        /*
         * Quick graphic to help you visualize the following
         * if / else statement
@@ -2750,23 +2718,20 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
 #ifdef CONFIG_IPW_DEBUG
        {
                int i = txq->oldest;
-               IPW_DEBUG_TX(
-                       "TX%d V=%p P=%04X T=%04X L=%d\n", i,
-                       &txq->drv[i],
-                       (u32)(txq->nic + i * sizeof(struct ipw2100_bd)),
-                       txq->drv[i].host_addr,
-                       txq->drv[i].buf_length);
+               IPW_DEBUG_TX("TX%d V=%p P=%04X T=%04X L=%d\n", i,
+                            &txq->drv[i],
+                            (u32) (txq->nic + i * sizeof(struct ipw2100_bd)),
+                            txq->drv[i].host_addr, txq->drv[i].buf_length);
 
                if (packet->type == DATA) {
                        i = (i + 1) % txq->entries;
 
-                       IPW_DEBUG_TX(
-                               "TX%d V=%p P=%04X T=%04X L=%d\n", i,
-                               &txq->drv[i],
-                               (u32)(txq->nic + i *
-                               sizeof(struct ipw2100_bd)),
-                               (u32)txq->drv[i].host_addr,
-                               txq->drv[i].buf_length);
+                       IPW_DEBUG_TX("TX%d V=%p P=%04X T=%04X L=%d\n", i,
+                                    &txq->drv[i],
+                                    (u32) (txq->nic + i *
+                                           sizeof(struct ipw2100_bd)),
+                                    (u32) txq->drv[i].host_addr,
+                                    txq->drv[i].buf_length);
                }
        }
 #endif
@@ -2782,21 +2747,19 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
                /* DATA packet; we have to unmap and free the SKB */
                priv->ieee->stats.tx_packets++;
                for (i = 0; i < frag_num; i++) {
-                       tbd = &txq->drv[(packet->index + 1 + i) %
-                                       txq->entries];
+                       tbd = &txq->drv[(packet->index + 1 + i) % txq->entries];
 
-                       IPW_DEBUG_TX(
-                               "TX%d P=%08x L=%d\n",
-                               (packet->index + 1 + i) % txq->entries,
-                               tbd->host_addr, tbd->buf_length);
+                       IPW_DEBUG_TX("TX%d P=%08x L=%d\n",
+                                    (packet->index + 1 + i) % txq->entries,
+                                    tbd->host_addr, tbd->buf_length);
 
                        pci_unmap_single(priv->pci_dev,
                                         tbd->host_addr,
-                                        tbd->buf_length,
-                                        PCI_DMA_TODEVICE);
+                                        tbd->buf_length, PCI_DMA_TODEVICE);
                }
 
-               priv->ieee->stats.tx_bytes += packet->info.d_struct.txb->payload_size;
+               priv->ieee->stats.tx_bytes +=
+                   packet->info.d_struct.txb->payload_size;
                ieee80211_txb_free(packet->info.d_struct.txb);
                packet->info.d_struct.txb = NULL;
 
@@ -2808,8 +2771,8 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
                if (priv->status & STATUS_ASSOCIATED &&
                    netif_queue_stopped(priv->net_dev)) {
                        IPW_DEBUG_INFO(KERN_INFO
-                                          "%s: Waking net queue.\n",
-                                          priv->net_dev->name);
+                                      "%s: Waking net queue.\n",
+                                      priv->net_dev->name);
                        netif_wake_queue(priv->net_dev);
                }
 
@@ -2829,11 +2792,12 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
 #ifdef CONFIG_IPW_DEBUG
                if (packet->info.c_struct.cmd->host_command_reg <
                    sizeof(command_types) / sizeof(*command_types))
-                       IPW_DEBUG_TX(
-                               "Command '%s (%d)' processed: %d.\n",
-                               command_types[packet->info.c_struct.cmd->host_command_reg],
-                               packet->info.c_struct.cmd->host_command_reg,
-                               packet->info.c_struct.cmd->cmd_status_reg);
+                       IPW_DEBUG_TX("Command '%s (%d)' processed: %d.\n",
+                                    command_types[packet->info.c_struct.cmd->
+                                                  host_command_reg],
+                                    packet->info.c_struct.cmd->
+                                    host_command_reg,
+                                    packet->info.c_struct.cmd->cmd_status_reg);
 #endif
 
                list_add_tail(element, &priv->msg_free_list);
@@ -2848,17 +2812,17 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
        SET_STAT(&priv->txq_stat, txq->available);
 
        IPW_DEBUG_TX("packet latency (send to process)  %ld jiffies\n",
-                        jiffies - packet->jiffy_start);
+                    jiffies - packet->jiffy_start);
 
        return (!list_empty(&priv->fw_pend_list));
 }
 
-
 static inline void __ipw2100_tx_complete(struct ipw2100_priv *priv)
 {
        int i = 0;
 
-       while (__ipw2100_tx_process(priv) && i < 200) i++;
+       while (__ipw2100_tx_process(priv) && i < 200)
+               i++;
 
        if (i == 200) {
                printk(KERN_WARNING DRV_NAME ": "
@@ -2867,7 +2831,6 @@ static inline void __ipw2100_tx_complete(struct ipw2100_priv *priv)
        }
 }
 
-
 static void ipw2100_tx_send_commands(struct ipw2100_priv *priv)
 {
        struct list_head *element;
@@ -2892,13 +2855,12 @@ static void ipw2100_tx_send_commands(struct ipw2100_priv *priv)
                list_del(element);
                DEC_STAT(&priv->msg_pend_stat);
 
-               packet = list_entry(element,
-                                   struct ipw2100_tx_packet, list);
+               packet = list_entry(element, struct ipw2100_tx_packet, list);
 
                IPW_DEBUG_TX("using TBD at virt=%p, phys=%p\n",
-                                &txq->drv[txq->next],
-                                (void*)(txq->nic + txq->next *
-                                        sizeof(struct ipw2100_bd)));
+                            &txq->drv[txq->next],
+                            (void *)(txq->nic + txq->next *
+                                     sizeof(struct ipw2100_bd)));
 
                packet->index = txq->next;
 
@@ -2911,8 +2873,8 @@ static void ipw2100_tx_send_commands(struct ipw2100_priv *priv)
                 * with f/w debug version */
                tbd->num_fragments = 1;
                tbd->status.info.field =
-                       IPW_BD_STATUS_TX_FRAME_COMMAND |
-                       IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
+                   IPW_BD_STATUS_TX_FRAME_COMMAND |
+                   IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
 
                /* update TBD queue counters */
                txq->next++;
@@ -2934,7 +2896,6 @@ static void ipw2100_tx_send_commands(struct ipw2100_priv *priv)
        }
 }
 
-
 /*
  * ipw2100_tx_send_data
  *
@@ -2946,7 +2907,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
        struct ipw2100_bd_queue *txq = &priv->tx_queue;
        struct ipw2100_bd *tbd;
        int next = txq->next;
-        int i = 0;
+       int i = 0;
        struct ipw2100_data_header *ipw_hdr;
        struct ieee80211_hdr_3addr *hdr;
 
@@ -2958,20 +2919,18 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                 *       maintained between the r and w indexes
                 */
                element = priv->tx_pend_list.next;
-                packet = list_entry(element, struct ipw2100_tx_packet, list);
+               packet = list_entry(element, struct ipw2100_tx_packet, list);
 
                if (unlikely(1 + packet->info.d_struct.txb->nr_frags >
                             IPW_MAX_BDS)) {
                        /* TODO: Support merging buffers if more than
                         * IPW_MAX_BDS are used */
-                       IPW_DEBUG_INFO(
-                              "%s: Maximum BD theshold exceeded.  "
-                              "Increase fragmentation level.\n",
-                              priv->net_dev->name);
+                       IPW_DEBUG_INFO("%s: Maximum BD theshold exceeded.  "
+                                      "Increase fragmentation level.\n",
+                                      priv->net_dev->name);
                }
 
-               if (txq->available <= 3 +
-                   packet->info.d_struct.txb->nr_frags) {
+               if (txq->available <= 3 + packet->info.d_struct.txb->nr_frags) {
                        IPW_DEBUG_TX("no room in tx_queue\n");
                        break;
                }
@@ -2985,7 +2944,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
 
                ipw_hdr = packet->info.d_struct.data;
                hdr = (struct ieee80211_hdr_3addr *)packet->info.d_struct.txb->
-                       fragments[0]->data;
+                   fragments[0]->data;
 
                if (priv->ieee->iw_mode == IW_MODE_INFRA) {
                        /* To DS: Addr1 = BSSID, Addr2 = SA,
@@ -3007,7 +2966,8 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                ipw_hdr->encrypted = packet->info.d_struct.txb->encrypted;
                if (packet->info.d_struct.txb->nr_frags > 1)
                        ipw_hdr->fragment_size =
-                               packet->info.d_struct.txb->frag_size - IEEE80211_3ADDR_LEN;
+                           packet->info.d_struct.txb->frag_size -
+                           IEEE80211_3ADDR_LEN;
                else
                        ipw_hdr->fragment_size = 0;
 
@@ -3015,54 +2975,53 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                tbd->buf_length = sizeof(struct ipw2100_data_header);
                tbd->num_fragments = 1 + packet->info.d_struct.txb->nr_frags;
                tbd->status.info.field =
-                       IPW_BD_STATUS_TX_FRAME_802_3 |
-                       IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
+                   IPW_BD_STATUS_TX_FRAME_802_3 |
+                   IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
                txq->next++;
                txq->next %= txq->entries;
 
-               IPW_DEBUG_TX(
-                       "data header tbd TX%d P=%08x L=%d\n",
-                       packet->index, tbd->host_addr,
-                       tbd->buf_length);
+               IPW_DEBUG_TX("data header tbd TX%d P=%08x L=%d\n",
+                            packet->index, tbd->host_addr, tbd->buf_length);
 #ifdef CONFIG_IPW_DEBUG
                if (packet->info.d_struct.txb->nr_frags > 1)
                        IPW_DEBUG_FRAG("fragment Tx: %d frames\n",
                                       packet->info.d_struct.txb->nr_frags);
 #endif
 
-                for (i = 0; i < packet->info.d_struct.txb->nr_frags; i++) {
-                       tbd = &txq->drv[txq->next];
+               for (i = 0; i < packet->info.d_struct.txb->nr_frags; i++) {
+                       tbd = &txq->drv[txq->next];
                        if (i == packet->info.d_struct.txb->nr_frags - 1)
                                tbd->status.info.field =
-                                       IPW_BD_STATUS_TX_FRAME_802_3 |
-                                       IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
+                                   IPW_BD_STATUS_TX_FRAME_802_3 |
+                                   IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
                        else
                                tbd->status.info.field =
-                                       IPW_BD_STATUS_TX_FRAME_802_3 |
-                                       IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
+                                   IPW_BD_STATUS_TX_FRAME_802_3 |
+                                   IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
 
                        tbd->buf_length = packet->info.d_struct.txb->
-                               fragments[i]->len - IEEE80211_3ADDR_LEN;
+                           fragments[i]->len - IEEE80211_3ADDR_LEN;
 
-                        tbd->host_addr = pci_map_single(
-                               priv->pci_dev,
-                               packet->info.d_struct.txb->fragments[i]->data +
-                               IEEE80211_3ADDR_LEN,
-                               tbd->buf_length,
-                               PCI_DMA_TODEVICE);
+                       tbd->host_addr = pci_map_single(priv->pci_dev,
+                                                       packet->info.d_struct.
+                                                       txb->fragments[i]->
+                                                       data +
+                                                       IEEE80211_3ADDR_LEN,
+                                                       tbd->buf_length,
+                                                       PCI_DMA_TODEVICE);
 
-                       IPW_DEBUG_TX(
-                               "data frag tbd TX%d P=%08x L=%d\n",
-                               txq->next, tbd->host_addr, tbd->buf_length);
+                       IPW_DEBUG_TX("data frag tbd TX%d P=%08x L=%d\n",
+                                    txq->next, tbd->host_addr,
+                                    tbd->buf_length);
 
-                       pci_dma_sync_single_for_device(
-                               priv->pci_dev, tbd->host_addr,
-                               tbd->buf_length,
-                               PCI_DMA_TODEVICE);
+                       pci_dma_sync_single_for_device(priv->pci_dev,
+                                                      tbd->host_addr,
+                                                      tbd->buf_length,
+                                                      PCI_DMA_TODEVICE);
 
                        txq->next++;
                        txq->next %= txq->entries;
-                }
+               }
 
                txq->available -= 1 + packet->info.d_struct.txb->nr_frags;
                SET_STAT(&priv->txq_stat, txq->available);
@@ -3078,7 +3037,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                               IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
                               txq->next);
        }
-        return;
+       return;
 }
 
 static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
@@ -3106,11 +3065,9 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
 
        if (inta & IPW2100_INTA_FATAL_ERROR) {
                printk(KERN_WARNING DRV_NAME
-                                 ": Fatal interrupt. Scheduling firmware restart.\n");
+                      ": Fatal interrupt. Scheduling firmware restart.\n");
                priv->inta_other++;
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_FATAL_ERROR);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_FATAL_ERROR);
 
                read_nic_dword(dev, IPW_NIC_FATAL_ERROR, &priv->fatal_error);
                IPW_DEBUG_INFO("%s: Fatal error value: 0x%08X\n",
@@ -3125,11 +3082,10 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
        }
 
        if (inta & IPW2100_INTA_PARITY_ERROR) {
-               printk(KERN_ERR DRV_NAME ": ***** PARITY ERROR INTERRUPT !!!! \n");
+               printk(KERN_ERR DRV_NAME
+                      ": ***** PARITY ERROR INTERRUPT !!!! \n");
                priv->inta_other++;
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_PARITY_ERROR);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_PARITY_ERROR);
        }
 
        if (inta & IPW2100_INTA_RX_TRANSFER) {
@@ -3137,9 +3093,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
 
                priv->rx_interrupts++;
 
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_RX_TRANSFER);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_RX_TRANSFER);
 
                __ipw2100_rx_process(priv);
                __ipw2100_tx_complete(priv);
@@ -3150,8 +3104,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
 
                priv->tx_interrupts++;
 
-               write_register(dev, IPW_REG_INTA,
-                              IPW2100_INTA_TX_TRANSFER);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_TX_TRANSFER);
 
                __ipw2100_tx_complete(priv);
                ipw2100_tx_send_commands(priv);
@@ -3161,9 +3114,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
        if (inta & IPW2100_INTA_TX_COMPLETE) {
                IPW_DEBUG_ISR("TX complete\n");
                priv->inta_other++;
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_TX_COMPLETE);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_TX_COMPLETE);
 
                __ipw2100_tx_complete(priv);
        }
@@ -3171,9 +3122,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
        if (inta & IPW2100_INTA_EVENT_INTERRUPT) {
                /* ipw2100_handle_event(dev); */
                priv->inta_other++;
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_EVENT_INTERRUPT);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_EVENT_INTERRUPT);
        }
 
        if (inta & IPW2100_INTA_FW_INIT_DONE) {
@@ -3183,30 +3132,25 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
                read_register(dev, IPW_REG_INTA, &tmp);
                if (tmp & (IPW2100_INTA_FATAL_ERROR |
                           IPW2100_INTA_PARITY_ERROR)) {
-                       write_register(
-                               dev, IPW_REG_INTA,
-                               IPW2100_INTA_FATAL_ERROR |
-                               IPW2100_INTA_PARITY_ERROR);
+                       write_register(dev, IPW_REG_INTA,
+                                      IPW2100_INTA_FATAL_ERROR |
+                                      IPW2100_INTA_PARITY_ERROR);
                }
 
-               write_register(dev, IPW_REG_INTA,
-                              IPW2100_INTA_FW_INIT_DONE);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_FW_INIT_DONE);
        }
 
        if (inta & IPW2100_INTA_STATUS_CHANGE) {
                IPW_DEBUG_ISR("Status change interrupt\n");
                priv->inta_other++;
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_STATUS_CHANGE);
+               write_register(dev, IPW_REG_INTA, IPW2100_INTA_STATUS_CHANGE);
        }
 
        if (inta & IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE) {
                IPW_DEBUG_ISR("slave host mode interrupt\n");
                priv->inta_other++;
-               write_register(
-                       dev, IPW_REG_INTA,
-                       IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE);
+               write_register(dev, IPW_REG_INTA,
+                              IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE);
        }
 
        priv->in_isr--;
@@ -3217,9 +3161,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
        IPW_DEBUG_ISR("exit\n");
 }
 
-
-static irqreturn_t ipw2100_interrupt(int irq, void *data,
-                                    struct pt_regs *regs)
+static irqreturn_t ipw2100_interrupt(int irq, void *data, struct pt_regs *regs)
 {
        struct ipw2100_priv *priv = data;
        u32 inta, inta_mask;
@@ -3227,7 +3169,7 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data,
        if (!data)
                return IRQ_NONE;
 
-       spin_lock(&priv->low_lock);
+       spin_lock(&priv->low_lock);
 
        /* We check to see if we should be ignoring interrupts before
         * we touch the hardware.  During ucode load if we try and handle
@@ -3261,10 +3203,10 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data,
        ipw2100_disable_interrupts(priv);
 
        tasklet_schedule(&priv->irq_tasklet);
-       spin_unlock(&priv->low_lock);
+       spin_unlock(&priv->low_lock);
 
        return IRQ_HANDLED;
- none:
     none:
        spin_unlock(&priv->low_lock);
        return IRQ_NONE;
 }
@@ -3294,10 +3236,8 @@ static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev,
 
        packet->info.d_struct.txb = txb;
 
-       IPW_DEBUG_TX("Sending fragment (%d bytes):\n",
-                        txb->fragments[0]->len);
-       printk_buf(IPW_DL_TX, txb->fragments[0]->data,
-                  txb->fragments[0]->len);
+       IPW_DEBUG_TX("Sending fragment (%d bytes):\n", txb->fragments[0]->len);
+       printk_buf(IPW_DL_TX, txb->fragments[0]->data, txb->fragments[0]->len);
 
        packet->jiffy_start = jiffies;
 
@@ -3312,22 +3252,23 @@ static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev,
        spin_unlock_irqrestore(&priv->low_lock, flags);
        return 0;
 
- fail_unlock:
     fail_unlock:
        netif_stop_queue(dev);
        spin_unlock_irqrestore(&priv->low_lock, flags);
        return 1;
 }
 
-
 static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
 {
        int i, j, err = -EINVAL;
        void *v;
        dma_addr_t p;
 
-       priv->msg_buffers = (struct ipw2100_tx_packet *)kmalloc(
-               IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
-               GFP_KERNEL);
+       priv->msg_buffers =
+           (struct ipw2100_tx_packet *)kmalloc(IPW_COMMAND_POOL_SIZE *
+                                               sizeof(struct
+                                                      ipw2100_tx_packet),
+                                               GFP_KERNEL);
        if (!priv->msg_buffers) {
                printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
                       "buffers.\n", priv->net_dev->name);
@@ -3335,15 +3276,12 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
        }
 
        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
-               v = pci_alloc_consistent(
-                       priv->pci_dev,
-                       sizeof(struct ipw2100_cmd_header),
-                       &p);
+               v = pci_alloc_consistent(priv->pci_dev,
+                                        sizeof(struct ipw2100_cmd_header), &p);
                if (!v) {
                        printk(KERN_ERR DRV_NAME ": "
                               "%s: PCI alloc failed for msg "
-                              "buffers.\n",
-                              priv->net_dev->name);
+                              "buffers.\n", priv->net_dev->name);
                        err = -ENOMEM;
                        break;
                }
@@ -3352,7 +3290,7 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
 
                priv->msg_buffers[i].type = COMMAND;
                priv->msg_buffers[i].info.c_struct.cmd =
-                       (struct ipw2100_cmd_header*)v;
+                   (struct ipw2100_cmd_header *)v;
                priv->msg_buffers[i].info.c_struct.cmd_phys = p;
        }
 
@@ -3360,11 +3298,11 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
                return 0;
 
        for (j = 0; j < i; j++) {
-               pci_free_consistent(
-                       priv->pci_dev,
-                       sizeof(struct ipw2100_cmd_header),
-                       priv->msg_buffers[j].info.c_struct.cmd,
-                       priv->msg_buffers[j].info.c_struct.cmd_phys);
+               pci_free_consistent(priv->pci_dev,
+                                   sizeof(struct ipw2100_cmd_header),
+                                   priv->msg_buffers[j].info.c_struct.cmd,
+                                   priv->msg_buffers[j].info.c_struct.
+                                   cmd_phys);
        }
 
        kfree(priv->msg_buffers);
@@ -3398,7 +3336,8 @@ static void ipw2100_msg_free(struct ipw2100_priv *priv)
                pci_free_consistent(priv->pci_dev,
                                    sizeof(struct ipw2100_cmd_header),
                                    priv->msg_buffers[i].info.c_struct.cmd,
-                                   priv->msg_buffers[i].info.c_struct.cmd_phys);
+                                   priv->msg_buffers[i].info.c_struct.
+                                   cmd_phys);
        }
 
        kfree(priv->msg_buffers);
@@ -3424,6 +3363,7 @@ static ssize_t show_pci(struct device *d, struct device_attribute *attr,
 
        return out - buf;
 }
+
 static DEVICE_ATTR(pci, S_IRUGO, show_pci, NULL);
 
 static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
@@ -3432,209 +3372,269 @@ static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
        struct ipw2100_priv *p = d->driver_data;
        return sprintf(buf, "0x%08x\n", (int)p->config);
 }
+
 static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL);
 
 static ssize_t show_status(struct device *d, struct device_attribute *attr,
-                       char *buf)
+                          char *buf)
 {
        struct ipw2100_priv *p = d->driver_data;
        return sprintf(buf, "0x%08x\n", (int)p->status);
 }
+
 static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
 
 static ssize_t show_capability(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                              char *buf)
 {
        struct ipw2100_priv *p = d->driver_data;
        return sprintf(buf, "0x%08x\n", (int)p->capability);
 }
-static DEVICE_ATTR(capability, S_IRUGO, show_capability, NULL);
 
+static DEVICE_ATTR(capability, S_IRUGO, show_capability, NULL);
 
 #define IPW2100_REG(x) { IPW_ ##x, #x }
 static const struct {
        u32 addr;
        const char *name;
 } hw_data[] = {
-       IPW2100_REG(REG_GP_CNTRL),
-       IPW2100_REG(REG_GPIO),
-       IPW2100_REG(REG_INTA),
-       IPW2100_REG(REG_INTA_MASK),
-       IPW2100_REG(REG_RESET_REG),
-};
+IPW2100_REG(REG_GP_CNTRL),
+           IPW2100_REG(REG_GPIO),
+           IPW2100_REG(REG_INTA),
+           IPW2100_REG(REG_INTA_MASK), IPW2100_REG(REG_RESET_REG),};
 #define IPW2100_NIC(x, s) { x, #x, s }
 static const struct {
        u32 addr;
        const char *name;
        size_t size;
 } nic_data[] = {
-       IPW2100_NIC(IPW2100_CONTROL_REG, 2),
-       IPW2100_NIC(0x210014, 1),
-       IPW2100_NIC(0x210000, 1),
-};
+IPW2100_NIC(IPW2100_CONTROL_REG, 2),
+           IPW2100_NIC(0x210014, 1), IPW2100_NIC(0x210000, 1),};
 #define IPW2100_ORD(x, d) { IPW_ORD_ ##x, #x, d }
 static const struct {
        u8 index;
        const char *name;
        const char *desc;
 } ord_data[] = {
-       IPW2100_ORD(STAT_TX_HOST_REQUESTS, "requested Host Tx's (MSDU)"),
-       IPW2100_ORD(STAT_TX_HOST_COMPLETE, "successful Host Tx's (MSDU)"),
-       IPW2100_ORD(STAT_TX_DIR_DATA,      "successful Directed Tx's (MSDU)"),
-       IPW2100_ORD(STAT_TX_DIR_DATA1,     "successful Directed Tx's (MSDU) @ 1MB"),
-       IPW2100_ORD(STAT_TX_DIR_DATA2,     "successful Directed Tx's (MSDU) @ 2MB"),
-       IPW2100_ORD(STAT_TX_DIR_DATA5_5,   "successful Directed Tx's (MSDU) @ 5_5MB"),
-       IPW2100_ORD(STAT_TX_DIR_DATA11,    "successful Directed Tx's (MSDU) @ 11MB"),
-       IPW2100_ORD(STAT_TX_NODIR_DATA1,   "successful Non_Directed Tx's (MSDU) @ 1MB"),
-       IPW2100_ORD(STAT_TX_NODIR_DATA2,   "successful Non_Directed Tx's (MSDU) @ 2MB"),
-       IPW2100_ORD(STAT_TX_NODIR_DATA5_5, "successful Non_Directed Tx's (MSDU) @ 5.5MB"),
-       IPW2100_ORD(STAT_TX_NODIR_DATA11,  "successful Non_Directed Tx's (MSDU) @ 11MB"),
-       IPW2100_ORD(STAT_NULL_DATA,        "successful NULL data Tx's"),
-       IPW2100_ORD(STAT_TX_RTS,           "successful Tx RTS"),
-       IPW2100_ORD(STAT_TX_CTS,           "successful Tx CTS"),
-       IPW2100_ORD(STAT_TX_ACK,           "successful Tx ACK"),
-       IPW2100_ORD(STAT_TX_ASSN,          "successful Association Tx's"),
-       IPW2100_ORD(STAT_TX_ASSN_RESP,     "successful Association response Tx's"),
-       IPW2100_ORD(STAT_TX_REASSN,        "successful Reassociation Tx's"),
-       IPW2100_ORD(STAT_TX_REASSN_RESP,   "successful Reassociation response Tx's"),
-       IPW2100_ORD(STAT_TX_PROBE,         "probes successfully transmitted"),
-       IPW2100_ORD(STAT_TX_PROBE_RESP,    "probe responses successfully transmitted"),
-       IPW2100_ORD(STAT_TX_BEACON,        "tx beacon"),
-       IPW2100_ORD(STAT_TX_ATIM,          "Tx ATIM"),
-       IPW2100_ORD(STAT_TX_DISASSN,       "successful Disassociation TX"),
-       IPW2100_ORD(STAT_TX_AUTH,          "successful Authentication Tx"),
-       IPW2100_ORD(STAT_TX_DEAUTH,        "successful Deauthentication TX"),
-       IPW2100_ORD(STAT_TX_TOTAL_BYTES,   "Total successful Tx data bytes"),
-       IPW2100_ORD(STAT_TX_RETRIES,       "Tx retries"),
-       IPW2100_ORD(STAT_TX_RETRY1,        "Tx retries at 1MBPS"),
-       IPW2100_ORD(STAT_TX_RETRY2,        "Tx retries at 2MBPS"),
-       IPW2100_ORD(STAT_TX_RETRY5_5,      "Tx retries at 5.5MBPS"),
-       IPW2100_ORD(STAT_TX_RETRY11,       "Tx retries at 11MBPS"),
-       IPW2100_ORD(STAT_TX_FAILURES,      "Tx Failures"),
-       IPW2100_ORD(STAT_TX_MAX_TRIES_IN_HOP,"times max tries in a hop failed"),
-       IPW2100_ORD(STAT_TX_DISASSN_FAIL,       "times disassociation failed"),
-       IPW2100_ORD(STAT_TX_ERR_CTS,         "missed/bad CTS frames"),
-       IPW2100_ORD(STAT_TX_ERR_ACK,    "tx err due to acks"),
-       IPW2100_ORD(STAT_RX_HOST,       "packets passed to host"),
-       IPW2100_ORD(STAT_RX_DIR_DATA,   "directed packets"),
-       IPW2100_ORD(STAT_RX_DIR_DATA1,  "directed packets at 1MB"),
-       IPW2100_ORD(STAT_RX_DIR_DATA2,  "directed packets at 2MB"),
-       IPW2100_ORD(STAT_RX_DIR_DATA5_5,        "directed packets at 5.5MB"),
-       IPW2100_ORD(STAT_RX_DIR_DATA11, "directed packets at 11MB"),
-       IPW2100_ORD(STAT_RX_NODIR_DATA,"nondirected packets"),
-       IPW2100_ORD(STAT_RX_NODIR_DATA1,        "nondirected packets at 1MB"),
-       IPW2100_ORD(STAT_RX_NODIR_DATA2,        "nondirected packets at 2MB"),
-       IPW2100_ORD(STAT_RX_NODIR_DATA5_5,      "nondirected packets at 5.5MB"),
-       IPW2100_ORD(STAT_RX_NODIR_DATA11,       "nondirected packets at 11MB"),
-       IPW2100_ORD(STAT_RX_NULL_DATA,  "null data rx's"),
-       IPW2100_ORD(STAT_RX_RTS,        "Rx RTS"),
-       IPW2100_ORD(STAT_RX_CTS,        "Rx CTS"),
-       IPW2100_ORD(STAT_RX_ACK,        "Rx ACK"),
-       IPW2100_ORD(STAT_RX_CFEND,      "Rx CF End"),
-       IPW2100_ORD(STAT_RX_CFEND_ACK,  "Rx CF End + CF Ack"),
-       IPW2100_ORD(STAT_RX_ASSN,       "Association Rx's"),
-       IPW2100_ORD(STAT_RX_ASSN_RESP,  "Association response Rx's"),
-       IPW2100_ORD(STAT_RX_REASSN,     "Reassociation Rx's"),
-       IPW2100_ORD(STAT_RX_REASSN_RESP,        "Reassociation response Rx's"),
-       IPW2100_ORD(STAT_RX_PROBE,      "probe Rx's"),
-       IPW2100_ORD(STAT_RX_PROBE_RESP, "probe response Rx's"),
-       IPW2100_ORD(STAT_RX_BEACON,     "Rx beacon"),
-       IPW2100_ORD(STAT_RX_ATIM,       "Rx ATIM"),
-       IPW2100_ORD(STAT_RX_DISASSN,    "disassociation Rx"),
-       IPW2100_ORD(STAT_RX_AUTH,       "authentication Rx"),
-       IPW2100_ORD(STAT_RX_DEAUTH,     "deauthentication Rx"),
-       IPW2100_ORD(STAT_RX_TOTAL_BYTES,"Total rx data bytes received"),
-       IPW2100_ORD(STAT_RX_ERR_CRC,     "packets with Rx CRC error"),
-       IPW2100_ORD(STAT_RX_ERR_CRC1,    "Rx CRC errors at 1MB"),
-       IPW2100_ORD(STAT_RX_ERR_CRC2,    "Rx CRC errors at 2MB"),
-       IPW2100_ORD(STAT_RX_ERR_CRC5_5,  "Rx CRC errors at 5.5MB"),
-       IPW2100_ORD(STAT_RX_ERR_CRC11,   "Rx CRC errors at 11MB"),
-       IPW2100_ORD(STAT_RX_DUPLICATE1, "duplicate rx packets at 1MB"),
-       IPW2100_ORD(STAT_RX_DUPLICATE2,  "duplicate rx packets at 2MB"),
-       IPW2100_ORD(STAT_RX_DUPLICATE5_5,        "duplicate rx packets at 5.5MB"),
-       IPW2100_ORD(STAT_RX_DUPLICATE11,         "duplicate rx packets at 11MB"),
-       IPW2100_ORD(STAT_RX_DUPLICATE, "duplicate rx packets"),
-       IPW2100_ORD(PERS_DB_LOCK,       "locking fw permanent  db"),
-       IPW2100_ORD(PERS_DB_SIZE,       "size of fw permanent  db"),
-       IPW2100_ORD(PERS_DB_ADDR,       "address of fw permanent  db"),
-       IPW2100_ORD(STAT_RX_INVALID_PROTOCOL,   "rx frames with invalid protocol"),
-       IPW2100_ORD(SYS_BOOT_TIME,      "Boot time"),
-       IPW2100_ORD(STAT_RX_NO_BUFFER,  "rx frames rejected due to no buffer"),
-       IPW2100_ORD(STAT_RX_MISSING_FRAG,       "rx frames dropped due to missing fragment"),
-       IPW2100_ORD(STAT_RX_ORPHAN_FRAG,        "rx frames dropped due to non-sequential fragment"),
-       IPW2100_ORD(STAT_RX_ORPHAN_FRAME,       "rx frames dropped due to unmatched 1st frame"),
-       IPW2100_ORD(STAT_RX_FRAG_AGEOUT,        "rx frames dropped due to uncompleted frame"),
-       IPW2100_ORD(STAT_RX_ICV_ERRORS, "ICV errors during decryption"),
-       IPW2100_ORD(STAT_PSP_SUSPENSION,"times adapter suspended"),
-       IPW2100_ORD(STAT_PSP_BCN_TIMEOUT,       "beacon timeout"),
-       IPW2100_ORD(STAT_PSP_POLL_TIMEOUT,      "poll response timeouts"),
-       IPW2100_ORD(STAT_PSP_NONDIR_TIMEOUT, "timeouts waiting for last {broad,multi}cast pkt"),
-       IPW2100_ORD(STAT_PSP_RX_DTIMS,  "PSP DTIMs received"),
-       IPW2100_ORD(STAT_PSP_RX_TIMS,   "PSP TIMs received"),
-       IPW2100_ORD(STAT_PSP_STATION_ID,"PSP Station ID"),
-       IPW2100_ORD(LAST_ASSN_TIME,     "RTC time of last association"),
-       IPW2100_ORD(STAT_PERCENT_MISSED_BCNS,"current calculation of % missed beacons"),
-       IPW2100_ORD(STAT_PERCENT_RETRIES,"current calculation of % missed tx retries"),
-       IPW2100_ORD(ASSOCIATED_AP_PTR,  "0 if not associated, else pointer to AP table entry"),
-       IPW2100_ORD(AVAILABLE_AP_CNT,   "AP's decsribed in the AP table"),
-       IPW2100_ORD(AP_LIST_PTR,        "Ptr to list of available APs"),
-       IPW2100_ORD(STAT_AP_ASSNS,      "associations"),
-       IPW2100_ORD(STAT_ASSN_FAIL,     "association failures"),
-       IPW2100_ORD(STAT_ASSN_RESP_FAIL,"failures due to response fail"),
-       IPW2100_ORD(STAT_FULL_SCANS,    "full scans"),
-       IPW2100_ORD(CARD_DISABLED,      "Card Disabled"),
-       IPW2100_ORD(STAT_ROAM_INHIBIT,  "times roaming was inhibited due to activity"),
-       IPW2100_ORD(RSSI_AT_ASSN,       "RSSI of associated AP at time of association"),
-       IPW2100_ORD(STAT_ASSN_CAUSE1,   "reassociation: no probe response or TX on hop"),
-       IPW2100_ORD(STAT_ASSN_CAUSE2,   "reassociation: poor tx/rx quality"),
-       IPW2100_ORD(STAT_ASSN_CAUSE3,   "reassociation: tx/rx quality (excessive AP load"),
-       IPW2100_ORD(STAT_ASSN_CAUSE4,   "reassociation: AP RSSI level"),
-       IPW2100_ORD(STAT_ASSN_CAUSE5,   "reassociations due to load leveling"),
-       IPW2100_ORD(STAT_AUTH_FAIL,     "times authentication failed"),
-       IPW2100_ORD(STAT_AUTH_RESP_FAIL,"times authentication response failed"),
-       IPW2100_ORD(STATION_TABLE_CNT,  "entries in association table"),
-       IPW2100_ORD(RSSI_AVG_CURR,      "Current avg RSSI"),
-       IPW2100_ORD(POWER_MGMT_MODE,    "Power mode - 0=CAM, 1=PSP"),
-       IPW2100_ORD(COUNTRY_CODE,       "IEEE country code as recv'd from beacon"),
-       IPW2100_ORD(COUNTRY_CHANNELS,   "channels suported by country"),
-       IPW2100_ORD(RESET_CNT,  "adapter resets (warm)"),
-       IPW2100_ORD(BEACON_INTERVAL,    "Beacon interval"),
-       IPW2100_ORD(ANTENNA_DIVERSITY,  "TRUE if antenna diversity is disabled"),
-       IPW2100_ORD(DTIM_PERIOD,        "beacon intervals between DTIMs"),
-       IPW2100_ORD(OUR_FREQ,   "current radio freq lower digits - channel ID"),
-       IPW2100_ORD(RTC_TIME,   "current RTC time"),
-       IPW2100_ORD(PORT_TYPE,  "operating mode"),
-       IPW2100_ORD(CURRENT_TX_RATE,    "current tx rate"),
-       IPW2100_ORD(SUPPORTED_RATES,    "supported tx rates"),
-       IPW2100_ORD(ATIM_WINDOW,        "current ATIM Window"),
-       IPW2100_ORD(BASIC_RATES,        "basic tx rates"),
-       IPW2100_ORD(NIC_HIGHEST_RATE,   "NIC highest tx rate"),
-       IPW2100_ORD(AP_HIGHEST_RATE,    "AP highest tx rate"),
-       IPW2100_ORD(CAPABILITIES,       "Management frame capability field"),
-       IPW2100_ORD(AUTH_TYPE,  "Type of authentication"),
-       IPW2100_ORD(RADIO_TYPE, "Adapter card platform type"),
-       IPW2100_ORD(RTS_THRESHOLD,      "Min packet length for RTS handshaking"),
-       IPW2100_ORD(INT_MODE,   "International mode"),
-       IPW2100_ORD(FRAGMENTATION_THRESHOLD,    "protocol frag threshold"),
-       IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_START_ADDRESS, "EEPROM offset in SRAM"),
-       IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_SIZE,  "EEPROM size in SRAM"),
-       IPW2100_ORD(EEPROM_SKU_CAPABILITY,      "EEPROM SKU Capability"),
-       IPW2100_ORD(EEPROM_IBSS_11B_CHANNELS,   "EEPROM IBSS 11b channel set"),
-       IPW2100_ORD(MAC_VERSION,        "MAC Version"),
-       IPW2100_ORD(MAC_REVISION,       "MAC Revision"),
-       IPW2100_ORD(RADIO_VERSION,      "Radio Version"),
-       IPW2100_ORD(NIC_MANF_DATE_TIME, "MANF Date/Time STAMP"),
-       IPW2100_ORD(UCODE_VERSION,      "Ucode Version"),
-};
-
+IPW2100_ORD(STAT_TX_HOST_REQUESTS, "requested Host Tx's (MSDU)"),
+           IPW2100_ORD(STAT_TX_HOST_COMPLETE,
+                               "successful Host Tx's (MSDU)"),
+           IPW2100_ORD(STAT_TX_DIR_DATA,
+                               "successful Directed Tx's (MSDU)"),
+           IPW2100_ORD(STAT_TX_DIR_DATA1,
+                               "successful Directed Tx's (MSDU) @ 1MB"),
+           IPW2100_ORD(STAT_TX_DIR_DATA2,
+                               "successful Directed Tx's (MSDU) @ 2MB"),
+           IPW2100_ORD(STAT_TX_DIR_DATA5_5,
+                               "successful Directed Tx's (MSDU) @ 5_5MB"),
+           IPW2100_ORD(STAT_TX_DIR_DATA11,
+                               "successful Directed Tx's (MSDU) @ 11MB"),
+           IPW2100_ORD(STAT_TX_NODIR_DATA1,
+                               "successful Non_Directed Tx's (MSDU) @ 1MB"),
+           IPW2100_ORD(STAT_TX_NODIR_DATA2,
+                               "successful Non_Directed Tx's (MSDU) @ 2MB"),
+           IPW2100_ORD(STAT_TX_NODIR_DATA5_5,
+                               "successful Non_Directed Tx's (MSDU) @ 5.5MB"),
+           IPW2100_ORD(STAT_TX_NODIR_DATA11,
+                               "successful Non_Directed Tx's (MSDU) @ 11MB"),
+           IPW2100_ORD(STAT_NULL_DATA, "successful NULL data Tx's"),
+           IPW2100_ORD(STAT_TX_RTS, "successful Tx RTS"),
+           IPW2100_ORD(STAT_TX_CTS, "successful Tx CTS"),
+           IPW2100_ORD(STAT_TX_ACK, "successful Tx ACK"),
+           IPW2100_ORD(STAT_TX_ASSN, "successful Association Tx's"),
+           IPW2100_ORD(STAT_TX_ASSN_RESP,
+                               "successful Association response Tx's"),
+           IPW2100_ORD(STAT_TX_REASSN,
+                               "successful Reassociation Tx's"),
+           IPW2100_ORD(STAT_TX_REASSN_RESP,
+                               "successful Reassociation response Tx's"),
+           IPW2100_ORD(STAT_TX_PROBE,
+                               "probes successfully transmitted"),
+           IPW2100_ORD(STAT_TX_PROBE_RESP,
+                               "probe responses successfully transmitted"),
+           IPW2100_ORD(STAT_TX_BEACON, "tx beacon"),
+           IPW2100_ORD(STAT_TX_ATIM, "Tx ATIM"),
+           IPW2100_ORD(STAT_TX_DISASSN,
+                               "successful Disassociation TX"),
+           IPW2100_ORD(STAT_TX_AUTH, "successful Authentication Tx"),
+           IPW2100_ORD(STAT_TX_DEAUTH,
+                               "successful Deauthentication TX"),
+           IPW2100_ORD(STAT_TX_TOTAL_BYTES,
+                               "Total successful Tx data bytes"),
+           IPW2100_ORD(STAT_TX_RETRIES, "Tx retries"),
+           IPW2100_ORD(STAT_TX_RETRY1, "Tx retries at 1MBPS"),
+           IPW2100_ORD(STAT_TX_RETRY2, "Tx retries at 2MBPS"),
+           IPW2100_ORD(STAT_TX_RETRY5_5, "Tx retries at 5.5MBPS"),
+           IPW2100_ORD(STAT_TX_RETRY11, "Tx retries at 11MBPS"),
+           IPW2100_ORD(STAT_TX_FAILURES, "Tx Failures"),
+           IPW2100_ORD(STAT_TX_MAX_TRIES_IN_HOP,
+                               "times max tries in a hop failed"),
+           IPW2100_ORD(STAT_TX_DISASSN_FAIL,
+                               "times disassociation failed"),
+           IPW2100_ORD(STAT_TX_ERR_CTS, "missed/bad CTS frames"),
+           IPW2100_ORD(STAT_TX_ERR_ACK, "tx err due to acks"),
+           IPW2100_ORD(STAT_RX_HOST, "packets passed to host"),
+           IPW2100_ORD(STAT_RX_DIR_DATA, "directed packets"),
+           IPW2100_ORD(STAT_RX_DIR_DATA1, "directed packets at 1MB"),
+           IPW2100_ORD(STAT_RX_DIR_DATA2, "directed packets at 2MB"),
+           IPW2100_ORD(STAT_RX_DIR_DATA5_5,
+                               "directed packets at 5.5MB"),
+           IPW2100_ORD(STAT_RX_DIR_DATA11, "directed packets at 11MB"),
+           IPW2100_ORD(STAT_RX_NODIR_DATA, "nondirected packets"),
+           IPW2100_ORD(STAT_RX_NODIR_DATA1,
+                               "nondirected packets at 1MB"),
+           IPW2100_ORD(STAT_RX_NODIR_DATA2,
+                               "nondirected packets at 2MB"),
+           IPW2100_ORD(STAT_RX_NODIR_DATA5_5,
+                               "nondirected packets at 5.5MB"),
+           IPW2100_ORD(STAT_RX_NODIR_DATA11,
+                               "nondirected packets at 11MB"),
+           IPW2100_ORD(STAT_RX_NULL_DATA, "null data rx's"),
+           IPW2100_ORD(STAT_RX_RTS, "Rx RTS"), IPW2100_ORD(STAT_RX_CTS,
+                                                                   "Rx CTS"),
+           IPW2100_ORD(STAT_RX_ACK, "Rx ACK"),
+           IPW2100_ORD(STAT_RX_CFEND, "Rx CF End"),
+           IPW2100_ORD(STAT_RX_CFEND_ACK, "Rx CF End + CF Ack"),
+           IPW2100_ORD(STAT_RX_ASSN, "Association Rx's"),
+           IPW2100_ORD(STAT_RX_ASSN_RESP, "Association response Rx's"),
+           IPW2100_ORD(STAT_RX_REASSN, "Reassociation Rx's"),
+           IPW2100_ORD(STAT_RX_REASSN_RESP,
+                               "Reassociation response Rx's"),
+           IPW2100_ORD(STAT_RX_PROBE, "probe Rx's"),
+           IPW2100_ORD(STAT_RX_PROBE_RESP, "probe response Rx's"),
+           IPW2100_ORD(STAT_RX_BEACON, "Rx beacon"),
+           IPW2100_ORD(STAT_RX_ATIM, "Rx ATIM"),
+           IPW2100_ORD(STAT_RX_DISASSN, "disassociation Rx"),
+           IPW2100_ORD(STAT_RX_AUTH, "authentication Rx"),
+           IPW2100_ORD(STAT_RX_DEAUTH, "deauthentication Rx"),
+           IPW2100_ORD(STAT_RX_TOTAL_BYTES,
+                               "Total rx data bytes received"),
+           IPW2100_ORD(STAT_RX_ERR_CRC, "packets with Rx CRC error"),
+           IPW2100_ORD(STAT_RX_ERR_CRC1, "Rx CRC errors at 1MB"),
+           IPW2100_ORD(STAT_RX_ERR_CRC2, "Rx CRC errors at 2MB"),
+           IPW2100_ORD(STAT_RX_ERR_CRC5_5, "Rx CRC errors at 5.5MB"),
+           IPW2100_ORD(STAT_RX_ERR_CRC11, "Rx CRC errors at 11MB"),
+           IPW2100_ORD(STAT_RX_DUPLICATE1,
+                               "duplicate rx packets at 1MB"),
+           IPW2100_ORD(STAT_RX_DUPLICATE2,
+                               "duplicate rx packets at 2MB"),
+           IPW2100_ORD(STAT_RX_DUPLICATE5_5,
+                               "duplicate rx packets at 5.5MB"),
+           IPW2100_ORD(STAT_RX_DUPLICATE11,
+                               "duplicate rx packets at 11MB"),
+           IPW2100_ORD(STAT_RX_DUPLICATE, "duplicate rx packets"),
+           IPW2100_ORD(PERS_DB_LOCK, "locking fw permanent  db"),
+           IPW2100_ORD(PERS_DB_SIZE, "size of fw permanent  db"),
+           IPW2100_ORD(PERS_DB_ADDR, "address of fw permanent  db"),
+           IPW2100_ORD(STAT_RX_INVALID_PROTOCOL,
+                               "rx frames with invalid protocol"),
+           IPW2100_ORD(SYS_BOOT_TIME, "Boot time"),
+           IPW2100_ORD(STAT_RX_NO_BUFFER,
+                               "rx frames rejected due to no buffer"),
+           IPW2100_ORD(STAT_RX_MISSING_FRAG,
+                               "rx frames dropped due to missing fragment"),
+           IPW2100_ORD(STAT_RX_ORPHAN_FRAG,
+                               "rx frames dropped due to non-sequential fragment"),
+           IPW2100_ORD(STAT_RX_ORPHAN_FRAME,
+                               "rx frames dropped due to unmatched 1st frame"),
+           IPW2100_ORD(STAT_RX_FRAG_AGEOUT,
+                               "rx frames dropped due to uncompleted frame"),
+           IPW2100_ORD(STAT_RX_ICV_ERRORS,
+                               "ICV errors during decryption"),
+           IPW2100_ORD(STAT_PSP_SUSPENSION, "times adapter suspended"),
+           IPW2100_ORD(STAT_PSP_BCN_TIMEOUT, "beacon timeout"),
+           IPW2100_ORD(STAT_PSP_POLL_TIMEOUT,
+                               "poll response timeouts"),
+           IPW2100_ORD(STAT_PSP_NONDIR_TIMEOUT,
+                               "timeouts waiting for last {broad,multi}cast pkt"),
+           IPW2100_ORD(STAT_PSP_RX_DTIMS, "PSP DTIMs received"),
+           IPW2100_ORD(STAT_PSP_RX_TIMS, "PSP TIMs received"),
+           IPW2100_ORD(STAT_PSP_STATION_ID, "PSP Station ID"),
+           IPW2100_ORD(LAST_ASSN_TIME, "RTC time of last association"),
+           IPW2100_ORD(STAT_PERCENT_MISSED_BCNS,
+                               "current calculation of % missed beacons"),
+           IPW2100_ORD(STAT_PERCENT_RETRIES,
+                               "current calculation of % missed tx retries"),
+           IPW2100_ORD(ASSOCIATED_AP_PTR,
+                               "0 if not associated, else pointer to AP table entry"),
+           IPW2100_ORD(AVAILABLE_AP_CNT,
+                               "AP's decsribed in the AP table"),
+           IPW2100_ORD(AP_LIST_PTR, "Ptr to list of available APs"),
+           IPW2100_ORD(STAT_AP_ASSNS, "associations"),
+           IPW2100_ORD(STAT_ASSN_FAIL, "association failures"),
+           IPW2100_ORD(STAT_ASSN_RESP_FAIL,
+                               "failures due to response fail"),
+           IPW2100_ORD(STAT_FULL_SCANS, "full scans"),
+           IPW2100_ORD(CARD_DISABLED, "Card Disabled"),
+           IPW2100_ORD(STAT_ROAM_INHIBIT,
+                               "times roaming was inhibited due to activity"),
+           IPW2100_ORD(RSSI_AT_ASSN,
+                               "RSSI of associated AP at time of association"),
+           IPW2100_ORD(STAT_ASSN_CAUSE1,
+                               "reassociation: no probe response or TX on hop"),
+           IPW2100_ORD(STAT_ASSN_CAUSE2,
+                               "reassociation: poor tx/rx quality"),
+           IPW2100_ORD(STAT_ASSN_CAUSE3,
+                               "reassociation: tx/rx quality (excessive AP load"),
+           IPW2100_ORD(STAT_ASSN_CAUSE4,
+                               "reassociation: AP RSSI level"),
+           IPW2100_ORD(STAT_ASSN_CAUSE5,
+                               "reassociations due to load leveling"),
+           IPW2100_ORD(STAT_AUTH_FAIL, "times authentication failed"),
+           IPW2100_ORD(STAT_AUTH_RESP_FAIL,
+                               "times authentication response failed"),
+           IPW2100_ORD(STATION_TABLE_CNT,
+                               "entries in association table"),
+           IPW2100_ORD(RSSI_AVG_CURR, "Current avg RSSI"),
+           IPW2100_ORD(POWER_MGMT_MODE, "Power mode - 0=CAM, 1=PSP"),
+           IPW2100_ORD(COUNTRY_CODE,
+                               "IEEE country code as recv'd from beacon"),
+           IPW2100_ORD(COUNTRY_CHANNELS,
+                               "channels suported by country"),
+           IPW2100_ORD(RESET_CNT, "adapter resets (warm)"),
+           IPW2100_ORD(BEACON_INTERVAL, "Beacon interval"),
+           IPW2100_ORD(ANTENNA_DIVERSITY,
+                               "TRUE if antenna diversity is disabled"),
+           IPW2100_ORD(DTIM_PERIOD, "beacon intervals between DTIMs"),
+           IPW2100_ORD(OUR_FREQ,
+                               "current radio freq lower digits - channel ID"),
+           IPW2100_ORD(RTC_TIME, "current RTC time"),
+           IPW2100_ORD(PORT_TYPE, "operating mode"),
+           IPW2100_ORD(CURRENT_TX_RATE, "current tx rate"),
+           IPW2100_ORD(SUPPORTED_RATES, "supported tx rates"),
+           IPW2100_ORD(ATIM_WINDOW, "current ATIM Window"),
+           IPW2100_ORD(BASIC_RATES, "basic tx rates"),
+           IPW2100_ORD(NIC_HIGHEST_RATE, "NIC highest tx rate"),
+           IPW2100_ORD(AP_HIGHEST_RATE, "AP highest tx rate"),
+           IPW2100_ORD(CAPABILITIES,
+                               "Management frame capability field"),
+           IPW2100_ORD(AUTH_TYPE, "Type of authentication"),
+           IPW2100_ORD(RADIO_TYPE, "Adapter card platform type"),
+           IPW2100_ORD(RTS_THRESHOLD,
+                               "Min packet length for RTS handshaking"),
+           IPW2100_ORD(INT_MODE, "International mode"),
+           IPW2100_ORD(FRAGMENTATION_THRESHOLD,
+                               "protocol frag threshold"),
+           IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_START_ADDRESS,
+                               "EEPROM offset in SRAM"),
+           IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_SIZE,
+                               "EEPROM size in SRAM"),
+           IPW2100_ORD(EEPROM_SKU_CAPABILITY, "EEPROM SKU Capability"),
+           IPW2100_ORD(EEPROM_IBSS_11B_CHANNELS,
+                               "EEPROM IBSS 11b channel set"),
+           IPW2100_ORD(MAC_VERSION, "MAC Version"),
+           IPW2100_ORD(MAC_REVISION, "MAC Revision"),
+           IPW2100_ORD(RADIO_VERSION, "Radio Version"),
+           IPW2100_ORD(NIC_MANF_DATE_TIME, "MANF Date/Time STAMP"),
+           IPW2100_ORD(UCODE_VERSION, "Ucode Version"),};
 
 static ssize_t show_registers(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                             char *buf)
 {
        int i;
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        struct net_device *dev = priv->net_dev;
-       char * out = buf;
+       char *out = buf;
        u32 val = 0;
 
        out += sprintf(out, "%30s [Address ] : Hex\n", "Register");
@@ -3647,15 +3647,15 @@ static ssize_t show_registers(struct device *d, struct device_attribute *attr,
 
        return out - buf;
 }
-static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
 
+static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
 
 static ssize_t show_hardware(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                            char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        struct net_device *dev = priv->net_dev;
-       char * out = buf;
+       char *out = buf;
        int i;
 
        out += sprintf(out, "%30s [Address ] : Hex\n", "NIC entry");
@@ -3688,11 +3688,11 @@ static ssize_t show_hardware(struct device *d, struct device_attribute *attr,
        }
        return out - buf;
 }
-static DEVICE_ATTR(hardware, S_IRUGO, show_hardware, NULL);
 
+static DEVICE_ATTR(hardware, S_IRUGO, show_hardware, NULL);
 
 static ssize_t show_memory(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                          char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        struct net_device *dev = priv->net_dev;
@@ -3708,10 +3708,13 @@ static ssize_t show_memory(struct device *d, struct device_attribute *attr,
        /* sysfs provides us PAGE_SIZE buffer */
        while (len < PAGE_SIZE - 128 && loop < 0x30000) {
 
-               if (priv->snapshot[0]) for (i = 0; i < 4; i++)
-                       buffer[i] = *(u32 *)SNAPSHOT_ADDR(loop + i * 4);
-               else for (i = 0; i < 4; i++)
-                       read_nic_dword(dev, loop + i * 4, &buffer[i]);
+               if (priv->snapshot[0])
+                       for (i = 0; i < 4; i++)
+                               buffer[i] =
+                                   *(u32 *) SNAPSHOT_ADDR(loop + i * 4);
+               else
+                       for (i = 0; i < 4; i++)
+                               read_nic_dword(dev, loop + i * 4, &buffer[i]);
 
                if (priv->dump_raw)
                        len += sprintf(buf + len,
@@ -3719,26 +3722,26 @@ static ssize_t show_memory(struct device *d, struct device_attribute *attr,
                                       "%c%c%c%c"
                                       "%c%c%c%c"
                                       "%c%c%c%c",
-                                      ((u8*)buffer)[0x0],
-                                      ((u8*)buffer)[0x1],
-                                      ((u8*)buffer)[0x2],
-                                      ((u8*)buffer)[0x3],
-                                      ((u8*)buffer)[0x4],
-                                      ((u8*)buffer)[0x5],
-                                      ((u8*)buffer)[0x6],
-                                      ((u8*)buffer)[0x7],
-                                      ((u8*)buffer)[0x8],
-                                      ((u8*)buffer)[0x9],
-                                      ((u8*)buffer)[0xa],
-                                      ((u8*)buffer)[0xb],
-                                      ((u8*)buffer)[0xc],
-                                      ((u8*)buffer)[0xd],
-                                      ((u8*)buffer)[0xe],
-                                      ((u8*)buffer)[0xf]);
+                                      ((u8 *) buffer)[0x0],
+                                      ((u8 *) buffer)[0x1],
+                                      ((u8 *) buffer)[0x2],
+                                      ((u8 *) buffer)[0x3],
+                                      ((u8 *) buffer)[0x4],
+                                      ((u8 *) buffer)[0x5],
+                                      ((u8 *) buffer)[0x6],
+                                      ((u8 *) buffer)[0x7],
+                                      ((u8 *) buffer)[0x8],
+                                      ((u8 *) buffer)[0x9],
+                                      ((u8 *) buffer)[0xa],
+                                      ((u8 *) buffer)[0xb],
+                                      ((u8 *) buffer)[0xc],
+                                      ((u8 *) buffer)[0xd],
+                                      ((u8 *) buffer)[0xe],
+                                      ((u8 *) buffer)[0xf]);
                else
                        len += sprintf(buf + len, "%s\n",
                                       snprint_line(line, sizeof(line),
-                                                   (u8*)buffer, 16, loop));
+                                                   (u8 *) buffer, 16, loop));
                loop += 16;
        }
 
@@ -3746,7 +3749,7 @@ static ssize_t show_memory(struct device *d, struct device_attribute *attr,
 }
 
 static ssize_t store_memory(struct device *d, struct device_attribute *attr,
-                               const char *buf, size_t count)
+                           const char *buf, size_t count)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        struct net_device *dev = priv->net_dev;
@@ -3758,32 +3761,30 @@ static ssize_t store_memory(struct device *d, struct device_attribute *attr,
        if (p[0] == '1' ||
            (count >= 2 && tolower(p[0]) == 'o' && tolower(p[1]) == 'n')) {
                IPW_DEBUG_INFO("%s: Setting memory dump to RAW mode.\n",
-                      dev->name);
+                              dev->name);
                priv->dump_raw = 1;
 
        } else if (p[0] == '0' || (count >= 2 && tolower(p[0]) == 'o' &&
-                                 tolower(p[1]) == 'f')) {
+                                  tolower(p[1]) == 'f')) {
                IPW_DEBUG_INFO("%s: Setting memory dump to HEX mode.\n",
-                      dev->name);
+                              dev->name);
                priv->dump_raw = 0;
 
        } else if (tolower(p[0]) == 'r') {
-               IPW_DEBUG_INFO("%s: Resetting firmware snapshot.\n",
-                      dev->name);
+               IPW_DEBUG_INFO("%s: Resetting firmware snapshot.\n", dev->name);
                ipw2100_snapshot_free(priv);
 
        } else
                IPW_DEBUG_INFO("%s: Usage: 0|on = HEX, 1|off = RAW, "
-                      "reset = clear memory snapshot\n",
-                      dev->name);
+                              "reset = clear memory snapshot\n", dev->name);
 
        return count;
 }
-static DEVICE_ATTR(memory, S_IWUSR|S_IRUGO, show_memory, store_memory);
 
+static DEVICE_ATTR(memory, S_IWUSR | S_IRUGO, show_memory, store_memory);
 
 static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                            char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        u32 val = 0;
@@ -3814,14 +3815,14 @@ static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,
 
        return len;
 }
-static DEVICE_ATTR(ordinals, S_IRUGO, show_ordinals, NULL);
 
+static DEVICE_ATTR(ordinals, S_IRUGO, show_ordinals, NULL);
 
 static ssize_t show_stats(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                         char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
-       char * out = buf;
+       char *out = buf;
 
        out += sprintf(out, "interrupts: %d {tx: %d, rx: %d, other: %d}\n",
                       priv->interrupts, priv->tx_interrupts,
@@ -3835,8 +3836,8 @@ static ssize_t show_stats(struct device *d, struct device_attribute *attr,
 
        return out - buf;
 }
-static DEVICE_ATTR(stats, S_IRUGO, show_stats, NULL);
 
+static DEVICE_ATTR(stats, S_IRUGO, show_stats, NULL);
 
 static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
 {
@@ -3864,19 +3865,18 @@ static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
                priv->last_mode = priv->ieee->iw_mode;
                priv->net_dev->type = ARPHRD_IEEE80211;
                break;
-#endif /* CONFIG_IPW2100_MONITOR */
+#endif                         /* CONFIG_IPW2100_MONITOR */
        }
 
        priv->ieee->iw_mode = mode;
 
 #ifdef CONFIG_PM
-        /* Indicate ipw2100_download_firmware download firmware
+       /* Indicate ipw2100_download_firmware download firmware
         * from disk instead of memory. */
        ipw2100_firmware.version = 0;
 #endif
 
-       printk(KERN_INFO "%s: Reseting on mode change.\n",
-               priv->net_dev->name);
+       printk(KERN_INFO "%s: Reseting on mode change.\n", priv->net_dev->name);
        priv->reset_backoff = 0;
        schedule_reset(priv);
 
@@ -3884,12 +3884,12 @@ static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
 }
 
 static ssize_t show_internals(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                             char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        int len = 0;
 
-#define DUMP_VAR(x,y) len += sprintf(buf + len, # x ": %" y "\n", priv-> x)
+#define DUMP_VAR(x,y) len += sprintf(buf + len, # x ": %" y "\n", priv-> x)
 
        if (priv->status & STATUS_ASSOCIATED)
                len += sprintf(buf + len, "connected: %lu\n",
@@ -3897,52 +3897,54 @@ static ssize_t show_internals(struct device *d, struct device_attribute *attr,
        else
                len += sprintf(buf + len, "not connected\n");
 
-       DUMP_VAR(ieee->crypt[priv->ieee->tx_keyidx], p);
-       DUMP_VAR(status, 08lx);
-       DUMP_VAR(config, 08lx);
-       DUMP_VAR(capability, 08lx);
+       DUMP_VAR(ieee->crypt[priv->ieee->tx_keyidx], "p");
+       DUMP_VAR(status, "08lx");
+       DUMP_VAR(config, "08lx");
+       DUMP_VAR(capability, "08lx");
 
-       len += sprintf(buf + len, "last_rtc: %lu\n", (unsigned long)priv->last_rtc);
+       len +=
+           sprintf(buf + len, "last_rtc: %lu\n",
+                   (unsigned long)priv->last_rtc);
 
-       DUMP_VAR(fatal_error, d);
-       DUMP_VAR(stop_hang_check, d);
-       DUMP_VAR(stop_rf_kill, d);
-       DUMP_VAR(messages_sent, d);
+       DUMP_VAR(fatal_error, "d");
+       DUMP_VAR(stop_hang_check, "d");
+       DUMP_VAR(stop_rf_kill, "d");
+       DUMP_VAR(messages_sent, "d");
 
-       DUMP_VAR(tx_pend_stat.value, d);
-       DUMP_VAR(tx_pend_stat.hi, d);
+       DUMP_VAR(tx_pend_stat.value, "d");
+       DUMP_VAR(tx_pend_stat.hi, "d");
 
-       DUMP_VAR(tx_free_stat.value, d);
-       DUMP_VAR(tx_free_stat.lo, d);
+       DUMP_VAR(tx_free_stat.value, "d");
+       DUMP_VAR(tx_free_stat.lo, "d");
 
-       DUMP_VAR(msg_free_stat.value, d);
-       DUMP_VAR(msg_free_stat.lo, d);
+       DUMP_VAR(msg_free_stat.value, "d");
+       DUMP_VAR(msg_free_stat.lo, "d");
 
-       DUMP_VAR(msg_pend_stat.value, d);
-       DUMP_VAR(msg_pend_stat.hi, d);
+       DUMP_VAR(msg_pend_stat.value, "d");
+       DUMP_VAR(msg_pend_stat.hi, "d");
 
-       DUMP_VAR(fw_pend_stat.value, d);
-       DUMP_VAR(fw_pend_stat.hi, d);
+       DUMP_VAR(fw_pend_stat.value, "d");
+       DUMP_VAR(fw_pend_stat.hi, "d");
 
-       DUMP_VAR(txq_stat.value, d);
-       DUMP_VAR(txq_stat.lo, d);
+       DUMP_VAR(txq_stat.value, "d");
+       DUMP_VAR(txq_stat.lo, "d");
 
-       DUMP_VAR(ieee->scans, d);
-       DUMP_VAR(reset_backoff, d);
+       DUMP_VAR(ieee->scans, "d");
+       DUMP_VAR(reset_backoff, "d");
 
        return len;
 }
-static DEVICE_ATTR(internals, S_IRUGO, show_internals, NULL);
 
+static DEVICE_ATTR(internals, S_IRUGO, show_internals, NULL);
 
 static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                           char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        char essid[IW_ESSID_MAX_SIZE + 1];
        u8 bssid[ETH_ALEN];
        u32 chan = 0;
-       char * out = buf;
+       char *out = buf;
        int length;
        int ret;
 
@@ -3976,8 +3978,8 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
 
        return out - buf;
 }
-static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);
 
+static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);
 
 #ifdef CONFIG_IPW_DEBUG
 static ssize_t show_debug_level(struct device_driver *d, char *buf)
@@ -4000,27 +4002,26 @@ static ssize_t store_debug_level(struct device_driver *d, const char *buf,
                val = simple_strtoul(p, &p, 10);
        if (p == buf)
                IPW_DEBUG_INFO(DRV_NAME
-                      ": %s is not in hex or decimal form.\n", buf);
+                              ": %s is not in hex or decimal form.\n", buf);
        else
                ipw2100_debug_level = val;
 
        return strnlen(buf, count);
 }
+
 static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, show_debug_level,
                   store_debug_level);
-#endif /* CONFIG_IPW_DEBUG */
-
+#endif                         /* CONFIG_IPW_DEBUG */
 
 static ssize_t show_fatal_error(struct device *d,
-                       struct device_attribute *attr, char *buf)
+                               struct device_attribute *attr, char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        char *out = buf;
        int i;
 
        if (priv->fatal_error)
-               out += sprintf(out, "0x%08X\n",
-                              priv->fatal_error);
+               out += sprintf(out, "0x%08X\n", priv->fatal_error);
        else
                out += sprintf(out, "0\n");
 
@@ -4038,24 +4039,26 @@ static ssize_t show_fatal_error(struct device *d,
 }
 
 static ssize_t store_fatal_error(struct device *d,
-               struct device_attribute *attr, const char *buf, size_t count)
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        schedule_reset(priv);
        return count;
 }
-static DEVICE_ATTR(fatal_error, S_IWUSR|S_IRUGO, show_fatal_error, store_fatal_error);
 
+static DEVICE_ATTR(fatal_error, S_IWUSR | S_IRUGO, show_fatal_error,
+                  store_fatal_error);
 
 static ssize_t show_scan_age(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                            char *buf)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        return sprintf(buf, "%d\n", priv->ieee->scan_age);
 }
 
 static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
-                               const char *buf, size_t count)
+                             const char *buf, size_t count)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        struct net_device *dev = priv->net_dev;
@@ -4078,8 +4081,7 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
        } else
                val = simple_strtoul(p, &p, 10);
        if (p == buffer) {
-               IPW_DEBUG_INFO("%s: user supplied invalid value.\n",
-                      dev->name);
+               IPW_DEBUG_INFO("%s: user supplied invalid value.\n", dev->name);
        } else {
                priv->ieee->scan_age = val;
                IPW_DEBUG_INFO("set scan_age = %u\n", priv->ieee->scan_age);
@@ -4088,11 +4090,11 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
        IPW_DEBUG_INFO("exit\n");
        return len;
 }
-static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age);
 
+static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age);
 
 static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
-                               char *buf)
+                           char *buf)
 {
        /* 0 - RF kill not enabled
           1 - SW based RF kill active (sysfs)
@@ -4100,7 +4102,7 @@ static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
           3 - Both HW and SW baed RF kill active */
        struct ipw2100_priv *priv = (struct ipw2100_priv *)d->driver_data;
        int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
-               (rf_kill_active(priv) ? 0x2 : 0x0);
+           (rf_kill_active(priv) ? 0x2 : 0x0);
        return sprintf(buf, "%i\n", val);
 }
 
@@ -4108,7 +4110,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
 {
        if ((disable_radio ? 1 : 0) ==
            (priv->status & STATUS_RF_KILL_SW ? 1 : 0))
-               return 0 ;
+               return 0;
 
        IPW_DEBUG_RF_KILL("Manual SW RF Kill set to: RADIO  %s\n",
                          disable_radio ? "OFF" : "ON");
@@ -4126,8 +4128,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
                        /* Make sure the RF_KILL check timer is running */
                        priv->stop_rf_kill = 0;
                        cancel_delayed_work(&priv->rf_kill);
-                       queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                                          HZ);
+                       queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
                } else
                        schedule_reset(priv);
        }
@@ -4137,14 +4138,14 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
 }
 
 static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,
-                               const char *buf, size_t count)
+                            const char *buf, size_t count)
 {
        struct ipw2100_priv *priv = dev_get_drvdata(d);
        ipw_radio_kill_sw(priv, buf[0] == '1');
        return count;
 }
-static DEVICE_ATTR(rf_kill, S_IWUSR|S_IRUGO, show_rf_kill, store_rf_kill);
 
+static DEVICE_ATTR(rf_kill, S_IWUSR | S_IRUGO, show_rf_kill, store_rf_kill);
 
 static struct attribute *ipw2100_sysfs_entries[] = {
        &dev_attr_hardware.attr,
@@ -4168,7 +4169,6 @@ static struct attribute_group ipw2100_attribute_group = {
        .attrs = ipw2100_sysfs_entries,
 };
 
-
 static int status_queue_allocate(struct ipw2100_priv *priv, int entries)
 {
        struct ipw2100_status_queue *q = &priv->status_queue;
@@ -4176,11 +4176,11 @@ static int status_queue_allocate(struct ipw2100_priv *priv, int entries)
        IPW_DEBUG_INFO("enter\n");
 
        q->size = entries * sizeof(struct ipw2100_status);
-       q->drv = (struct ipw2100_status *)pci_alloc_consistent(
-               priv->pci_dev, q->size, &q->nic);
+       q->drv =
+           (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev,
+                                                         q->size, &q->nic);
        if (!q->drv) {
-               IPW_DEBUG_WARNING(
-                      "Can not allocate status queue.\n");
+               IPW_DEBUG_WARNING("Can not allocate status queue.\n");
                return -ENOMEM;
        }
 
@@ -4196,9 +4196,9 @@ static void status_queue_free(struct ipw2100_priv *priv)
        IPW_DEBUG_INFO("enter\n");
 
        if (priv->status_queue.drv) {
-               pci_free_consistent(
-                       priv->pci_dev, priv->status_queue.size,
-                       priv->status_queue.drv, priv->status_queue.nic);
+               pci_free_consistent(priv->pci_dev, priv->status_queue.size,
+                                   priv->status_queue.drv,
+                                   priv->status_queue.nic);
                priv->status_queue.drv = NULL;
        }
 
@@ -4216,7 +4216,8 @@ static int bd_queue_allocate(struct ipw2100_priv *priv,
        q->size = entries * sizeof(struct ipw2100_bd);
        q->drv = pci_alloc_consistent(priv->pci_dev, q->size, &q->nic);
        if (!q->drv) {
-               IPW_DEBUG_INFO("can't allocate shared memory for buffer descriptors\n");
+               IPW_DEBUG_INFO
+                   ("can't allocate shared memory for buffer descriptors\n");
                return -ENOMEM;
        }
        memset(q->drv, 0, q->size);
@@ -4226,8 +4227,7 @@ static int bd_queue_allocate(struct ipw2100_priv *priv,
        return 0;
 }
 
-static void bd_queue_free(struct ipw2100_priv *priv,
-                         struct ipw2100_bd_queue *q)
+static void bd_queue_free(struct ipw2100_priv *priv, struct ipw2100_bd_queue *q)
 {
        IPW_DEBUG_INFO("enter\n");
 
@@ -4235,21 +4235,21 @@ static void bd_queue_free(struct ipw2100_priv *priv,
                return;
 
        if (q->drv) {
-               pci_free_consistent(priv->pci_dev,
-                                   q->size, q->drv, q->nic);
+               pci_free_consistent(priv->pci_dev, q->size, q->drv, q->nic);
                q->drv = NULL;
        }
 
        IPW_DEBUG_INFO("exit\n");
 }
 
-static void bd_queue_initialize(
-       struct ipw2100_priv *priv, struct ipw2100_bd_queue * q,
-       u32 base, u32 size, u32 r, u32 w)
+static void bd_queue_initialize(struct ipw2100_priv *priv,
+                               struct ipw2100_bd_queue *q, u32 base, u32 size,
+                               u32 r, u32 w)
 {
        IPW_DEBUG_INFO("enter\n");
 
-       IPW_DEBUG_INFO("initializing bd queue at virt=%p, phys=%08x\n", q->drv, (u32)q->nic);
+       IPW_DEBUG_INFO("initializing bd queue at virt=%p, phys=%08x\n", q->drv,
+                      (u32) q->nic);
 
        write_register(priv->net_dev, base, q->nic);
        write_register(priv->net_dev, size, q->entries);
@@ -4285,32 +4285,38 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
        err = bd_queue_allocate(priv, &priv->tx_queue, TX_QUEUE_LENGTH);
        if (err) {
                IPW_DEBUG_ERROR("%s: failed bd_queue_allocate\n",
-                      priv->net_dev->name);
+                               priv->net_dev->name);
                return err;
        }
 
-       priv->tx_buffers = (struct ipw2100_tx_packet *)kmalloc(
-               TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
-               GFP_ATOMIC);
+       priv->tx_buffers =
+           (struct ipw2100_tx_packet *)kmalloc(TX_PENDED_QUEUE_LENGTH *
+                                               sizeof(struct
+                                                      ipw2100_tx_packet),
+                                               GFP_ATOMIC);
        if (!priv->tx_buffers) {
-               printk(KERN_ERR DRV_NAME ": %s: alloc failed form tx buffers.\n",
+               printk(KERN_ERR DRV_NAME
+                      ": %s: alloc failed form tx buffers.\n",
                       priv->net_dev->name);
                bd_queue_free(priv, &priv->tx_queue);
                return -ENOMEM;
        }
 
        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
-               v = pci_alloc_consistent(
-                       priv->pci_dev, sizeof(struct ipw2100_data_header), &p);
+               v = pci_alloc_consistent(priv->pci_dev,
+                                        sizeof(struct ipw2100_data_header),
+                                        &p);
                if (!v) {
-                       printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for tx "
-                              "buffers.\n", priv->net_dev->name);
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: PCI alloc failed for tx " "buffers.\n",
+                              priv->net_dev->name);
                        err = -ENOMEM;
                        break;
                }
 
                priv->tx_buffers[i].type = DATA;
-               priv->tx_buffers[i].info.d_struct.data = (struct ipw2100_data_header*)v;
+               priv->tx_buffers[i].info.d_struct.data =
+                   (struct ipw2100_data_header *)v;
                priv->tx_buffers[i].info.d_struct.data_phys = p;
                priv->tx_buffers[i].info.d_struct.txb = NULL;
        }
@@ -4319,11 +4325,11 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
                return 0;
 
        for (j = 0; j < i; j++) {
-               pci_free_consistent(
-                       priv->pci_dev,
-                       sizeof(struct ipw2100_data_header),
-                       priv->tx_buffers[j].info.d_struct.data,
-                       priv->tx_buffers[j].info.d_struct.data_phys);
+               pci_free_consistent(priv->pci_dev,
+                                   sizeof(struct ipw2100_data_header),
+                                   priv->tx_buffers[j].info.d_struct.data,
+                                   priv->tx_buffers[j].info.d_struct.
+                                   data_phys);
        }
 
        kfree(priv->tx_buffers);
@@ -4356,7 +4362,8 @@ static void ipw2100_tx_initialize(struct ipw2100_priv *priv)
                /* We simply drop any SKBs that have been queued for
                 * transmit */
                if (priv->tx_buffers[i].info.d_struct.txb) {
-                       ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.txb);
+                       ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.
+                                          txb);
                        priv->tx_buffers[i].info.d_struct.txb = NULL;
                }
 
@@ -4394,15 +4401,17 @@ static void ipw2100_tx_free(struct ipw2100_priv *priv)
 
        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
                if (priv->tx_buffers[i].info.d_struct.txb) {
-                       ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.txb);
+                       ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.
+                                          txb);
                        priv->tx_buffers[i].info.d_struct.txb = NULL;
                }
                if (priv->tx_buffers[i].info.d_struct.data)
-                       pci_free_consistent(
-                               priv->pci_dev,
-                               sizeof(struct ipw2100_data_header),
-                               priv->tx_buffers[i].info.d_struct.data,
-                               priv->tx_buffers[i].info.d_struct.data_phys);
+                       pci_free_consistent(priv->pci_dev,
+                                           sizeof(struct ipw2100_data_header),
+                                           priv->tx_buffers[i].info.d_struct.
+                                           data,
+                                           priv->tx_buffers[i].info.d_struct.
+                                           data_phys);
        }
 
        kfree(priv->tx_buffers);
@@ -4411,8 +4420,6 @@ static void ipw2100_tx_free(struct ipw2100_priv *priv)
        IPW_DEBUG_INFO("exit\n");
 }
 
-
-
 static int ipw2100_rx_allocate(struct ipw2100_priv *priv)
 {
        int i, j, err = -EINVAL;
@@ -4542,14 +4549,13 @@ static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
 
        int err;
 
-       err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC,
-                                 mac, &length);
+       err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC, mac, &length);
        if (err) {
                IPW_DEBUG_INFO("MAC address read failed\n");
                return -EIO;
        }
        IPW_DEBUG_INFO("card MAC is %02X:%02X:%02X:%02X:%02X:%02X\n",
-              mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+                      mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
        memcpy(priv->net_dev->dev_addr, mac, ETH_ALEN);
 
@@ -4576,8 +4582,7 @@ static int ipw2100_set_mac_address(struct ipw2100_priv *priv, int batch_mode)
        IPW_DEBUG_INFO("enter\n");
 
        if (priv->config & CFG_CUSTOM_MAC) {
-               memcpy(cmd.host_command_parameters, priv->mac_addr,
-                      ETH_ALEN);
+               memcpy(cmd.host_command_parameters, priv->mac_addr, ETH_ALEN);
                memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
        } else
                memcpy(cmd.host_command_parameters, priv->net_dev->dev_addr,
@@ -4614,7 +4619,8 @@ static int ipw2100_set_port_type(struct ipw2100_priv *priv, u32 port_type,
        if (!batch_mode) {
                err = ipw2100_disable_adapter(priv);
                if (err) {
-                       printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: Could not disable adapter %d\n",
                               priv->net_dev->name, err);
                        return err;
                }
@@ -4629,7 +4635,6 @@ static int ipw2100_set_port_type(struct ipw2100_priv *priv, u32 port_type,
        return err;
 }
 
-
 static int ipw2100_set_channel(struct ipw2100_priv *priv, u32 channel,
                               int batch_mode)
 {
@@ -4660,8 +4665,7 @@ static int ipw2100_set_channel(struct ipw2100_priv *priv, u32 channel,
 
        err = ipw2100_hw_send_command(priv, &cmd);
        if (err) {
-               IPW_DEBUG_INFO("Failed to set channel to %d",
-                              channel);
+               IPW_DEBUG_INFO("Failed to set channel to %d", channel);
                return err;
        }
 
@@ -4703,15 +4707,14 @@ static int ipw2100_system_config(struct ipw2100_priv *priv, int batch_mode)
                cmd.host_command_parameters[0] |= IPW_CFG_IBSS_AUTO_START;
 
        cmd.host_command_parameters[0] |= IPW_CFG_IBSS_MASK |
-               IPW_CFG_BSS_MASK |
-               IPW_CFG_802_1x_ENABLE;
+           IPW_CFG_BSS_MASK | IPW_CFG_802_1x_ENABLE;
 
        if (!(priv->config & CFG_LONG_PREAMBLE))
                cmd.host_command_parameters[0] |= IPW_CFG_PREAMBLE_AUTO;
 
        err = ipw2100_get_ordinal(priv,
                                  IPW_ORD_EEPROM_IBSS_11B_CHANNELS,
-                                 &ibss_mask,  &len);
+                                 &ibss_mask, &len);
        if (err)
                ibss_mask = IPW_IBSS_11B_DEFAULT_MASK;
 
@@ -4719,7 +4722,7 @@ static int ipw2100_system_config(struct ipw2100_priv *priv, int batch_mode)
        cmd.host_command_parameters[2] = REG_CHANNEL_MASK & ibss_mask;
 
        /* 11b only */
-       /*cmd.host_command_parameters[0] |= DIVERSITY_ANTENNA_A;*/
+       /*cmd.host_command_parameters[0] |= DIVERSITY_ANTENNA_A; */
 
        err = ipw2100_hw_send_command(priv, &cmd);
        if (err)
@@ -4783,8 +4786,7 @@ static int ipw2100_set_tx_rates(struct ipw2100_priv *priv, u32 rate,
        return 0;
 }
 
-static int ipw2100_set_power_mode(struct ipw2100_priv *priv,
-                                 int power_level)
+static int ipw2100_set_power_mode(struct ipw2100_priv *priv, int power_level)
 {
        struct host_command cmd = {
                .host_command = POWER_MODE,
@@ -4805,11 +4807,10 @@ static int ipw2100_set_power_mode(struct ipw2100_priv *priv,
                priv->power_mode = IPW_POWER_ENABLED | power_level;
 
 #ifdef CONFIG_IPW2100_TX_POWER
-       if (priv->port_type == IBSS &&
-           priv->adhoc_power != DFTL_IBSS_TX_POWER) {
+       if (priv->port_type == IBSS && priv->adhoc_power != DFTL_IBSS_TX_POWER) {
                /* Set beacon interval */
                cmd.host_command = TX_POWER_INDEX;
-               cmd.host_command_parameters[0] = (u32)priv->adhoc_power;
+               cmd.host_command_parameters[0] = (u32) priv->adhoc_power;
 
                err = ipw2100_hw_send_command(priv, &cmd);
                if (err)
@@ -4820,7 +4821,6 @@ static int ipw2100_set_power_mode(struct ipw2100_priv *priv,
        return 0;
 }
 
-
 static int ipw2100_set_rts_threshold(struct ipw2100_priv *priv, u32 threshold)
 {
        struct host_command cmd = {
@@ -4925,8 +4925,7 @@ static int ipw2100_set_long_retry(struct ipw2100_priv *priv, u32 retry)
        return 0;
 }
 
-
-static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 *bssid,
+static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 * bssid,
                                       int batch_mode)
 {
        struct host_command cmd = {
@@ -4938,16 +4937,15 @@ static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 *bssid,
 
 #ifdef CONFIG_IPW_DEBUG
        if (bssid != NULL)
-               IPW_DEBUG_HC(
-                       "MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                       bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
-                       bssid[5]);
+               IPW_DEBUG_HC("MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
+                            bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
+                            bssid[5]);
        else
                IPW_DEBUG_HC("MANDATORY_BSSID: <clear>\n");
 #endif
        /* if BSSID is empty then we disable mandatory bssid mode */
        if (bssid != NULL)
-               memcpy((u8 *)cmd.host_command_parameters, bssid, ETH_ALEN);
+               memcpy((u8 *) cmd.host_command_parameters, bssid, ETH_ALEN);
 
        if (!batch_mode) {
                err = ipw2100_disable_adapter(priv);
@@ -4997,8 +4995,7 @@ void x(struct ieee80211_assoc_frame *wpa_assoc)
 {
        struct ipw2100_wpa_assoc_frame frame;
        frame->fixed_ie_mask = IPW_WPA_CAPABILTIES |
-               IPW_WPA_LISTENINTERVAL |
-               IPW_WPA_AP_ADDRESS;
+           IPW_WPA_LISTENINTERVAL | IPW_WPA_AP_ADDRESS;
        frame->capab_info = wpa_assoc->capab_info;
        frame->lisen_interval = wpa_assoc->listent_interval;
        memcpy(frame->current_ap, wpa_assoc->current_ap, ETH_ALEN);
@@ -5011,18 +5008,15 @@ void x(struct ieee80211_assoc_frame *wpa_assoc)
         * the IEs from wpa_frame into frame.
         */
        frame->var_ie_len = calculate_ie_len(wpa_assoc);
-       memcpy(frame->var_ie,  wpa_assoc->variable, frame->var_ie_len);
+       memcpy(frame->var_ie, wpa_assoc->variable, frame->var_ie_len);
 
        ipw2100_set_wpa_ie(priv, &frame, 0);
 }
 #endif
 
-
-
-
 static int ipw2100_set_wpa_ie(struct ipw2100_priv *,
                              struct ipw2100_wpa_assoc_frame *, int)
-__attribute__ ((unused));
+    __attribute__ ((unused));
 
 static int ipw2100_set_wpa_ie(struct ipw2100_priv *priv,
                              struct ipw2100_wpa_assoc_frame *wpa_frame,
@@ -5076,7 +5070,7 @@ static int ipw2100_set_security_information(struct ipw2100_priv *priv,
                .host_command_length = sizeof(struct security_info_params)
        };
        struct security_info_params *security =
-               (struct security_info_params *)&cmd.host_command_parameters;
+           (struct security_info_params *)&cmd.host_command_parameters;
        int err;
        memset(security, 0, sizeof(*security));
 
@@ -5094,25 +5088,25 @@ static int ipw2100_set_security_information(struct ipw2100_priv *priv,
                break;
        case SEC_LEVEL_1:
                security->allowed_ciphers = IPW_WEP40_CIPHER |
-                       IPW_WEP104_CIPHER;
+                   IPW_WEP104_CIPHER;
                break;
        case SEC_LEVEL_2:
                security->allowed_ciphers = IPW_WEP40_CIPHER |
-                       IPW_WEP104_CIPHER | IPW_TKIP_CIPHER;
+                   IPW_WEP104_CIPHER | IPW_TKIP_CIPHER;
                break;
        case SEC_LEVEL_2_CKIP:
                security->allowed_ciphers = IPW_WEP40_CIPHER |
-                       IPW_WEP104_CIPHER | IPW_CKIP_CIPHER;
+                   IPW_WEP104_CIPHER | IPW_CKIP_CIPHER;
                break;
        case SEC_LEVEL_3:
                security->allowed_ciphers = IPW_WEP40_CIPHER |
-                       IPW_WEP104_CIPHER | IPW_TKIP_CIPHER | IPW_CCMP_CIPHER;
+                   IPW_WEP104_CIPHER | IPW_TKIP_CIPHER | IPW_CCMP_CIPHER;
                break;
        }
 
-       IPW_DEBUG_HC(
-               "SET_SECURITY_INFORMATION: auth:%d cipher:0x%02X (level %d)\n",
-               security->auth_mode, security->allowed_ciphers, security_level);
+       IPW_DEBUG_HC
+           ("SET_SECURITY_INFORMATION: auth:%d cipher:0x%02X (level %d)\n",
+            security->auth_mode, security->allowed_ciphers, security_level);
 
        security->replay_counters_number = 0;
 
@@ -5130,8 +5124,7 @@ static int ipw2100_set_security_information(struct ipw2100_priv *priv,
        return err;
 }
 
-static int ipw2100_set_tx_power(struct ipw2100_priv *priv,
-                               u32 tx_power)
+static int ipw2100_set_tx_power(struct ipw2100_priv *priv, u32 tx_power)
 {
        struct host_command cmd = {
                .host_command = TX_POWER_INDEX,
@@ -5185,7 +5178,6 @@ static int ipw2100_set_ibss_beacon_interval(struct ipw2100_priv *priv,
        return 0;
 }
 
-
 void ipw2100_queues_initialize(struct ipw2100_priv *priv)
 {
        ipw2100_tx_initialize(priv);
@@ -5203,13 +5195,12 @@ void ipw2100_queues_free(struct ipw2100_priv *priv)
 int ipw2100_queues_allocate(struct ipw2100_priv *priv)
 {
        if (ipw2100_tx_allocate(priv) ||
-           ipw2100_rx_allocate(priv) ||
-           ipw2100_msg_allocate(priv))
+           ipw2100_rx_allocate(priv) || ipw2100_msg_allocate(priv))
                goto fail;
 
        return 0;
 
- fail:
     fail:
        ipw2100_tx_free(priv);
        ipw2100_rx_free(priv);
        ipw2100_msg_free(priv);
@@ -5235,7 +5226,8 @@ static int ipw2100_set_wep_flags(struct ipw2100_priv *priv, u32 flags,
        if (!batch_mode) {
                err = ipw2100_disable_adapter(priv);
                if (err) {
-                       printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: Could not disable adapter %d\n",
                               priv->net_dev->name, err);
                        return err;
                }
@@ -5262,7 +5254,6 @@ struct ipw2100_wep_key {
 #define WEP_STR_64(x) x[0],x[1],x[2],x[3],x[4]
 #define WEP_STR_128(x) x[0],x[1],x[2],x[3],x[4],x[5],x[6],x[7],x[8],x[9],x[10]
 
-
 /**
  * Set a the wep key
  *
@@ -5287,11 +5278,11 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
                .host_command_sequence = 0,
                .host_command_length = sizeof(struct ipw2100_wep_key),
        };
-       struct ipw2100_wep_key *wep_key = (void*)cmd.host_command_parameters;
+       struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
        int err;
 
        IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
-                                idx, keylen, len);
+                    idx, keylen, len);
 
        /* NOTE: We don't check cached values in case the firmware was reset
         * or some other problem is occuring.  If the user is setting the key,
@@ -5308,22 +5299,23 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
        /* Will be optimized out on debug not being configured in */
        if (keylen == 0)
                IPW_DEBUG_WEP("%s: Clearing key %d\n",
-                                 priv->net_dev->name, wep_key->idx);
+                             priv->net_dev->name, wep_key->idx);
        else if (keylen == 5)
                IPW_DEBUG_WEP("%s: idx: %d, len: %d key: " WEP_FMT_64 "\n",
-                                 priv->net_dev->name, wep_key->idx, wep_key->len,
-                                 WEP_STR_64(wep_key->key));
+                             priv->net_dev->name, wep_key->idx, wep_key->len,
+                             WEP_STR_64(wep_key->key));
        else
                IPW_DEBUG_WEP("%s: idx: %d, len: %d key: " WEP_FMT_128
-                                 "\n",
-                                 priv->net_dev->name, wep_key->idx, wep_key->len,
-                                 WEP_STR_128(wep_key->key));
+                             "\n",
+                             priv->net_dev->name, wep_key->idx, wep_key->len,
+                             WEP_STR_128(wep_key->key));
 
        if (!batch_mode) {
                err = ipw2100_disable_adapter(priv);
                /* FIXME: IPG: shouldn't this prink be in _disable_adapter()? */
                if (err) {
-                       printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: Could not disable adapter %d\n",
                               priv->net_dev->name, err);
                        return err;
                }
@@ -5347,7 +5339,7 @@ static int ipw2100_set_key_index(struct ipw2100_priv *priv,
                .host_command = WEP_KEY_INDEX,
                .host_command_sequence = 0,
                .host_command_length = 4,
-               .host_command_parameters = { idx },
+               .host_command_parameters = {idx},
        };
        int err;
 
@@ -5359,7 +5351,8 @@ static int ipw2100_set_key_index(struct ipw2100_priv *priv,
        if (!batch_mode) {
                err = ipw2100_disable_adapter(priv);
                if (err) {
-                       printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                       printk(KERN_ERR DRV_NAME
+                              ": %s: Could not disable adapter %d\n",
                               priv->net_dev->name, err);
                        return err;
                }
@@ -5374,9 +5367,7 @@ static int ipw2100_set_key_index(struct ipw2100_priv *priv,
        return err;
 }
 
-
-static int ipw2100_configure_security(struct ipw2100_priv *priv,
-                                     int batch_mode)
+static int ipw2100_configure_security(struct ipw2100_priv *priv, int batch_mode)
 {
        int i, err, auth_mode, sec_level, use_group;
 
@@ -5390,8 +5381,9 @@ static int ipw2100_configure_security(struct ipw2100_priv *priv,
        }
 
        if (!priv->sec.enabled) {
-               err = ipw2100_set_security_information(
-                       priv, IPW_AUTH_OPEN, SEC_LEVEL_0, 0, 1);
+               err =
+                   ipw2100_set_security_information(priv, IPW_AUTH_OPEN,
+                                                    SEC_LEVEL_0, 0, 1);
        } else {
                auth_mode = IPW_AUTH_OPEN;
                if ((priv->sec.flags & SEC_AUTH_MODE) &&
@@ -5406,8 +5398,9 @@ static int ipw2100_configure_security(struct ipw2100_priv *priv,
                if (priv->sec.flags & SEC_UNICAST_GROUP)
                        use_group = priv->sec.unicast_uses_group;
 
-               err = ipw2100_set_security_information(
-                           priv, auth_mode, sec_level, use_group, 1);
+               err =
+                   ipw2100_set_security_information(priv, auth_mode, sec_level,
+                                                    use_group, 1);
        }
 
        if (err)
@@ -5433,14 +5426,16 @@ static int ipw2100_configure_security(struct ipw2100_priv *priv,
 
        /* Always enable privacy so the Host can filter WEP packets if
         * encrypted data is sent up */
-       err = ipw2100_set_wep_flags(
-               priv, priv->sec.enabled ? IPW_PRIVACY_CAPABLE : 0, 1);
+       err =
+           ipw2100_set_wep_flags(priv,
+                                 priv->sec.enabled ? IPW_PRIVACY_CAPABLE : 0,
+                                 1);
        if (err)
                goto exit;
 
        priv->status &= ~STATUS_SECURITY_UPDATED;
 
- exit:
     exit:
        if (!batch_mode)
                ipw2100_enable_adapter(priv);
 
@@ -5498,31 +5493,29 @@ static void shim__set_security(struct net_device *dev,
                priv->status |= STATUS_SECURITY_UPDATED;
        }
 
-       if (sec->flags & SEC_ENABLED &&
-           priv->sec.enabled != sec->enabled) {
+       if (sec->flags & SEC_ENABLED && priv->sec.enabled != sec->enabled) {
                priv->sec.flags |= SEC_ENABLED;
                priv->sec.enabled = sec->enabled;
                priv->status |= STATUS_SECURITY_UPDATED;
                force_update = 1;
        }
 
-       if (sec->flags & SEC_LEVEL &&
-           priv->sec.level != sec->level) {
+       if (sec->flags & SEC_LEVEL && priv->sec.level != sec->level) {
                priv->sec.level = sec->level;
                priv->sec.flags |= SEC_LEVEL;
                priv->status |= STATUS_SECURITY_UPDATED;
        }
 
        IPW_DEBUG_WEP("Security flags: %c %c%c%c%c %c%c%c%c\n",
-                         priv->sec.flags & (1<<8) ? '1' : '0',
-                         priv->sec.flags & (1<<7) ? '1' : '0',
-                         priv->sec.flags & (1<<6) ? '1' : '0',
-                         priv->sec.flags & (1<<5) ? '1' : '0',
-                         priv->sec.flags & (1<<4) ? '1' : '0',
-                         priv->sec.flags & (1<<3) ? '1' : '0',
-                         priv->sec.flags & (1<<2) ? '1' : '0',
-                         priv->sec.flags & (1<<1) ? '1' : '0',
-                         priv->sec.flags & (1<<0) ? '1' : '0');
+                     priv->sec.flags & (1 << 8) ? '1' : '0',
+                     priv->sec.flags & (1 << 7) ? '1' : '0',
+                     priv->sec.flags & (1 << 6) ? '1' : '0',
+                     priv->sec.flags & (1 << 5) ? '1' : '0',
+                     priv->sec.flags & (1 << 4) ? '1' : '0',
+                     priv->sec.flags & (1 << 3) ? '1' : '0',
+                     priv->sec.flags & (1 << 2) ? '1' : '0',
+                     priv->sec.flags & (1 << 1) ? '1' : '0',
+                     priv->sec.flags & (1 << 0) ? '1' : '0');
 
 /* As a temporary work around to enable WPA until we figure out why
  * wpa_supplicant toggles the security capability of the driver, which
@@ -5531,7 +5524,7 @@ static void shim__set_security(struct net_device *dev,
  *     if (force_update || !(priv->status & STATUS_ASSOCIATED))*/
        if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))
                ipw2100_configure_security(priv, 0);
-done:
+      done:
        up(&priv->action_sem);
 }
 
@@ -5556,7 +5549,7 @@ static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
 
                return 0;
        }
-#endif /* CONFIG_IPW2100_MONITOR */
+#endif                         /* CONFIG_IPW2100_MONITOR */
 
        err = ipw2100_read_mac_address(priv);
        if (err)
@@ -5576,7 +5569,7 @@ static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
                        return err;
        }
 
-       err  = ipw2100_system_config(priv, batch_mode);
+       err = ipw2100_system_config(priv, batch_mode);
        if (err)
                return err;
 
@@ -5614,8 +5607,10 @@ static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
                return err;
 
        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
-               err = ipw2100_set_ibss_beacon_interval(
-                       priv, priv->beacon_interval, batch_mode);
+               err =
+                   ipw2100_set_ibss_beacon_interval(priv,
+                                                    priv->beacon_interval,
+                                                    batch_mode);
                if (err)
                        return err;
 
@@ -5625,18 +5620,17 @@ static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
        }
 
        /*
-         err = ipw2100_set_fragmentation_threshold(
-         priv, priv->frag_threshold, batch_mode);
-         if (err)
-         return err;
-       */
+          err = ipw2100_set_fragmentation_threshold(
+          priv, priv->frag_threshold, batch_mode);
+          if (err)
+          return err;
+        */
 
        IPW_DEBUG_INFO("exit\n");
 
        return 0;
 }
 
-
 /*************************************************************************
  *
  * EXTERNALLY CALLED METHODS
@@ -5669,7 +5663,7 @@ static int ipw2100_set_address(struct net_device *dev, void *p)
        ipw2100_reset_adapter(priv);
        return 0;
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -5708,7 +5702,7 @@ static int ipw2100_close(struct net_device *dev)
        /* Flush the TX queue ... */
        while (!list_empty(&priv->tx_pend_list)) {
                element = priv->tx_pend_list.next;
-                packet = list_entry(element, struct ipw2100_tx_packet, list);
+               packet = list_entry(element, struct ipw2100_tx_packet, list);
 
                list_del(element);
                DEC_STAT(&priv->tx_pend_stat);
@@ -5726,8 +5720,6 @@ static int ipw2100_close(struct net_device *dev)
        return 0;
 }
 
-
-
 /*
  * TODO:  Fix this function... its just wrong
  */
@@ -5747,7 +5739,6 @@ static void ipw2100_tx_timeout(struct net_device *dev)
        schedule_reset(priv);
 }
 
-
 /*
  * TODO: reimplement it so that it reads statistics
  *       from the adapter using ordinal tables
@@ -5796,7 +5787,7 @@ static struct net_device_stats *ipw2100_stats(struct net_device *dev)
 struct ipw2100_param {
        u32 cmd;
        u8 sta_addr[ETH_ALEN];
-        union {
+       union {
                struct {
                        u8 name;
                        u32 value;
@@ -5805,16 +5796,16 @@ struct ipw2100_param {
                        u32 len;
                        u8 *data;
                } wpa_ie;
-               struct{
+               struct {
                        int command;
-                       int reason_code;
+                       int reason_code;
                } mlme;
                struct {
                        u8 alg[IPW2100_CRYPT_ALG_NAME_LEN];
                        u8 set_tx;
                        u32 err;
                        u8 idx;
-                       u8 seq[8]; /* sequence counter (set: RX, get: TX) */
+                       u8 seq[8];      /* sequence counter (set: RX, get: TX) */
                        u16 key_len;
                        u8 key[0];
                } crypt;
@@ -5824,7 +5815,8 @@ struct ipw2100_param {
 
 /* end of driver_ipw2100.c code */
 
-static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value){
+static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value)
+{
 
        struct ieee80211_device *ieee = priv->ieee;
        struct ieee80211_security sec = {
@@ -5834,7 +5826,7 @@ static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value){
 
        ieee->wpa_enabled = value;
 
-       if (value){
+       if (value) {
                sec.level = SEC_LEVEL_3;
                sec.enabled = 1;
        } else {
@@ -5853,7 +5845,8 @@ static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value){
 #define AUTH_ALG_OPEN_SYSTEM                   0x1
 #define AUTH_ALG_SHARED_KEY                    0x2
 
-static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value){
+static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value)
+{
 
        struct ieee80211_device *ieee = priv->ieee;
        struct ieee80211_security sec = {
@@ -5861,7 +5854,7 @@ static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value){
        };
        int ret = 0;
 
-       if (value & AUTH_ALG_SHARED_KEY){
+       if (value & AUTH_ALG_SHARED_KEY) {
                sec.auth_mode = WLAN_AUTH_SHARED_KEY;
                ieee->open_wep = 0;
        } else {
@@ -5877,72 +5870,73 @@ static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value){
        return ret;
 }
 
-
-static int ipw2100_wpa_set_param(struct net_device *dev, u8 name, u32 value){
+static int ipw2100_wpa_set_param(struct net_device *dev, u8 name, u32 value)
+{
 
        struct ipw2100_priv *priv = ieee80211_priv(dev);
-       int ret=0;
+       int ret = 0;
 
-       switch(name){
-               case IPW2100_PARAM_WPA_ENABLED:
-                       ret = ipw2100_wpa_enable(priv, value);
-                       break;
+       switch (name) {
+       case IPW2100_PARAM_WPA_ENABLED:
+               ret = ipw2100_wpa_enable(priv, value);
+               break;
 
-               case IPW2100_PARAM_TKIP_COUNTERMEASURES:
-                       priv->ieee->tkip_countermeasures=value;
-                       break;
+       case IPW2100_PARAM_TKIP_COUNTERMEASURES:
+               priv->ieee->tkip_countermeasures = value;
+               break;
 
-               case IPW2100_PARAM_DROP_UNENCRYPTED:
-                       priv->ieee->drop_unencrypted=value;
-                       break;
+       case IPW2100_PARAM_DROP_UNENCRYPTED:
+               priv->ieee->drop_unencrypted = value;
+               break;
 
-               case IPW2100_PARAM_PRIVACY_INVOKED:
-                       priv->ieee->privacy_invoked=value;
-                       break;
+       case IPW2100_PARAM_PRIVACY_INVOKED:
+               priv->ieee->privacy_invoked = value;
+               break;
 
-               case IPW2100_PARAM_AUTH_ALGS:
-                       ret = ipw2100_wpa_set_auth_algs(priv, value);
-                       break;
+       case IPW2100_PARAM_AUTH_ALGS:
+               ret = ipw2100_wpa_set_auth_algs(priv, value);
+               break;
 
-               case IPW2100_PARAM_IEEE_802_1X:
-                       priv->ieee->ieee802_1x=value;
-                       break;
+       case IPW2100_PARAM_IEEE_802_1X:
+               priv->ieee->ieee802_1x = value;
+               break;
 
-               default:
-                       printk(KERN_ERR DRV_NAME ": %s: Unknown WPA param: %d\n",
-                                           dev->name, name);
-                       ret = -EOPNOTSUPP;
+       default:
+               printk(KERN_ERR DRV_NAME ": %s: Unknown WPA param: %d\n",
+                      dev->name, name);
+               ret = -EOPNOTSUPP;
        }
 
        return ret;
 }
 
-static int ipw2100_wpa_mlme(struct net_device *dev, int command, int reason){
+static int ipw2100_wpa_mlme(struct net_device *dev, int command, int reason)
+{
 
        struct ipw2100_priv *priv = ieee80211_priv(dev);
-       int ret=0;
+       int ret = 0;
 
-       switch(command){
-               case IPW2100_MLME_STA_DEAUTH:
-                       // silently ignore
-                       break;
+       switch (command) {
+       case IPW2100_MLME_STA_DEAUTH:
+               // silently ignore
+               break;
 
-               case IPW2100_MLME_STA_DISASSOC:
-                       ipw2100_disassociate_bssid(priv);
-                       break;
+       case IPW2100_MLME_STA_DISASSOC:
+               ipw2100_disassociate_bssid(priv);
+               break;
 
-               default:
-                       printk(KERN_ERR DRV_NAME ": %s: Unknown MLME request: %d\n",
-                                           dev->name, command);
-                       ret = -EOPNOTSUPP;
+       default:
+               printk(KERN_ERR DRV_NAME ": %s: Unknown MLME request: %d\n",
+                      dev->name, command);
+               ret = -EOPNOTSUPP;
        }
 
        return ret;
 }
 
-
 void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
-                            char *wpa_ie, int wpa_ie_len){
+                            char *wpa_ie, int wpa_ie_len)
+{
 
        struct ipw2100_wpa_assoc_frame frame;
 
@@ -5957,23 +5951,22 @@ void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
        ipw2100_set_wpa_ie(priv, &frame, 0);
 }
 
-
 static int ipw2100_wpa_set_wpa_ie(struct net_device *dev,
-                               struct ipw2100_param *param, int plen){
+                                 struct ipw2100_param *param, int plen)
+{
 
        struct ipw2100_priv *priv = ieee80211_priv(dev);
        struct ieee80211_device *ieee = priv->ieee;
        u8 *buf;
 
-       if (! ieee->wpa_enabled)
-           return -EOPNOTSUPP;
+       if (!ieee->wpa_enabled)
+               return -EOPNOTSUPP;
 
        if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
-          (param->u.wpa_ie.len &&
-               param->u.wpa_ie.data==NULL))
+           (param->u.wpa_ie.len && param->u.wpa_ie.data == NULL))
                return -EINVAL;
 
-       if (param->u.wpa_ie.len){
+       if (param->u.wpa_ie.len) {
                buf = kmalloc(param->u.wpa_ie.len, GFP_KERNEL);
                if (buf == NULL)
                        return -ENOMEM;
@@ -5998,7 +5991,9 @@ static int ipw2100_wpa_set_wpa_ie(struct net_device *dev,
 /* implementation borrowed from hostap driver */
 
 static int ipw2100_wpa_set_encryption(struct net_device *dev,
-                               struct ipw2100_param *param, int param_len){
+                                     struct ipw2100_param *param,
+                                     int param_len)
+{
 
        int ret = 0;
        struct ipw2100_priv *priv = ieee80211_priv(dev);
@@ -6014,9 +6009,10 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
        param->u.crypt.alg[IPW2100_CRYPT_ALG_NAME_LEN - 1] = '\0';
 
        if (param_len !=
-           (int) ((char *) param->u.crypt.key - (char *) param) +
-           param->u.crypt.key_len){
-               IPW_DEBUG_INFO("Len mismatch %d, %d\n", param_len, param->u.crypt.key_len);
+           (int)((char *)param->u.crypt.key - (char *)param) +
+           param->u.crypt.key_len) {
+               IPW_DEBUG_INFO("Len mismatch %d, %d\n", param_len,
+                              param->u.crypt.key_len);
                return -EINVAL;
        }
        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
@@ -6030,7 +6026,7 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
        }
 
        if (strcmp(param->u.crypt.alg, "none") == 0) {
-               if (crypt){
+               if (crypt) {
                        sec.enabled = 0;
                        sec.level = SEC_LEVEL_0;
                        sec.flags |= SEC_ENABLED | SEC_LEVEL;
@@ -6054,7 +6050,7 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
        }
        if (ops == NULL) {
                IPW_DEBUG_INFO("%s: unknown crypto alg '%s'\n",
-                      dev->name, param->u.crypt.alg);
+                              dev->name, param->u.crypt.alg);
                param->u.crypt.err = IPW2100_CRYPT_ERR_UNKNOWN_ALG;
                ret = -EINVAL;
                goto done;
@@ -6066,7 +6062,7 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
                ieee80211_crypt_delayed_deinit(ieee, crypt);
 
                new_crypt = (struct ieee80211_crypt_data *)
-                       kmalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL);
+                   kmalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL);
                if (new_crypt == NULL) {
                        ret = -ENOMEM;
                        goto done;
@@ -6074,12 +6070,13 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ops;
                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
-                       new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
+                       new_crypt->priv =
+                           new_crypt->ops->init(param->u.crypt.idx);
 
                if (new_crypt->priv == NULL) {
                        kfree(new_crypt);
                        param->u.crypt.err =
-                               IPW2100_CRYPT_ERR_CRYPT_INIT_FAILED;
+                           IPW2100_CRYPT_ERR_CRYPT_INIT_FAILED;
                        ret = -EINVAL;
                        goto done;
                }
@@ -6091,24 +6088,25 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
            (*crypt)->ops->set_key(param->u.crypt.key,
                                   param->u.crypt.key_len, param->u.crypt.seq,
                                   (*crypt)->priv) < 0) {
-               IPW_DEBUG_INFO("%s: key setting failed\n",
-                      dev->name);
+               IPW_DEBUG_INFO("%s: key setting failed\n", dev->name);
                param->u.crypt.err = IPW2100_CRYPT_ERR_KEY_SET_FAILED;
                ret = -EINVAL;
                goto done;
        }
 
-       if (param->u.crypt.set_tx){
+       if (param->u.crypt.set_tx) {
                ieee->tx_keyidx = param->u.crypt.idx;
                sec.active_key = param->u.crypt.idx;
                sec.flags |= SEC_ACTIVE_KEY;
        }
 
-       if (ops->name != NULL){
+       if (ops->name != NULL) {
 
                if (strcmp(ops->name, "WEP") == 0) {
-                       memcpy(sec.keys[param->u.crypt.idx], param->u.crypt.key, param->u.crypt.key_len);
-                       sec.key_sizes[param->u.crypt.idx] = param->u.crypt.key_len;
+                       memcpy(sec.keys[param->u.crypt.idx], param->u.crypt.key,
+                              param->u.crypt.key_len);
+                       sec.key_sizes[param->u.crypt.idx] =
+                           param->u.crypt.key_len;
                        sec.flags |= (1 << param->u.crypt.idx);
                        sec.flags |= SEC_LEVEL;
                        sec.level = SEC_LEVEL_1;
@@ -6120,7 +6118,7 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
                        sec.level = SEC_LEVEL_3;
                }
        }
- done:
     done:
        if (ieee->set_security)
                ieee->set_security(ieee->dev, &sec);
 
@@ -6131,8 +6129,7 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
         * the callbacks structures used to initialize the 802.11 stack. */
        if (ieee->reset_on_keychange &&
            ieee->iw_mode != IW_MODE_INFRA &&
-           ieee->reset_port &&
-           ieee->reset_port(dev)) {
+           ieee->reset_port && ieee->reset_port(dev)) {
                IPW_DEBUG_INFO("%s: reset_port failed\n", dev->name);
                param->u.crypt.err = IPW2100_CRYPT_ERR_CARD_CONF_FAILED;
                return -EINVAL;
@@ -6141,11 +6138,11 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
        return ret;
 }
 
-
-static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
+static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p)
+{
 
        struct ipw2100_param *param;
-       int ret=0;
+       int ret = 0;
 
        IPW_DEBUG_IOCTL("wpa_supplicant: len=%d\n", p->length);
 
@@ -6156,12 +6153,12 @@ static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
        if (param == NULL)
                return -ENOMEM;
 
-       if (copy_from_user(param, p->pointer, p->length)){
+       if (copy_from_user(param, p->pointer, p->length)) {
                kfree(param);
                return -EFAULT;
        }
 
-       switch (param->cmd){
+       switch (param->cmd) {
 
        case IPW2100_CMD_SET_WPA_PARAM:
                ret = ipw2100_wpa_set_param(dev, param->u.wpa_param.name,
@@ -6182,8 +6179,9 @@ static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
                break;
 
        default:
-               printk(KERN_ERR DRV_NAME ": %s: Unknown WPA supplicant request: %d\n",
-                               dev->name, param->cmd);
+               printk(KERN_ERR DRV_NAME
+                      ": %s: Unknown WPA supplicant request: %d\n", dev->name,
+                      param->cmd);
                ret = -EOPNOTSUPP;
 
        }
@@ -6194,28 +6192,27 @@ static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
        kfree(param);
        return ret;
 }
-#endif /* CONFIG_IEEE80211_WPA */
+#endif                         /* CONFIG_IEEE80211_WPA */
 
 static int ipw2100_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
 #ifdef CONFIG_IEEE80211_WPA
-       struct iwreq *wrq = (struct iwreq *) rq;
-       int ret=-1;
-       switch (cmd){
-           case IPW2100_IOCTL_WPA_SUPPLICANT:
+       struct iwreq *wrq = (struct iwreq *)rq;
+       int ret = -1;
+       switch (cmd) {
+       case IPW2100_IOCTL_WPA_SUPPLICANT:
                ret = ipw2100_wpa_supplicant(dev, &wrq->u.data);
                return ret;
 
-           default:
+       default:
                return -EOPNOTSUPP;
        }
 
-#endif /* CONFIG_IEEE80211_WPA */
+#endif                         /* CONFIG_IEEE80211_WPA */
 
        return -EOPNOTSUPP;
 }
 
-
 static void ipw_ethtool_get_drvinfo(struct net_device *dev,
                                    struct ethtool_drvinfo *info)
 {
@@ -6236,14 +6233,13 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,
 
 static u32 ipw2100_ethtool_get_link(struct net_device *dev)
 {
-    struct ipw2100_priv *priv = ieee80211_priv(dev);
-    return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;
+       struct ipw2100_priv *priv = ieee80211_priv(dev);
+       return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;
 }
 
-
 static struct ethtool_ops ipw2100_ethtool_ops = {
-    .get_link        = ipw2100_ethtool_get_link,
-    .get_drvinfo     = ipw_ethtool_get_drvinfo,
+       .get_link = ipw2100_ethtool_get_link,
+       .get_drvinfo = ipw_ethtool_get_drvinfo,
 };
 
 static void ipw2100_hang_check(void *adapter)
@@ -6288,7 +6284,6 @@ static void ipw2100_hang_check(void *adapter)
        spin_unlock_irqrestore(&priv->low_lock, flags);
 }
 
-
 static void ipw2100_rf_kill(void *adapter)
 {
        struct ipw2100_priv *priv = adapter;
@@ -6313,7 +6308,7 @@ static void ipw2100_rf_kill(void *adapter)
                IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
                                  "enabled\n");
 
- exit_unlock:
     exit_unlock:
        spin_unlock_irqrestore(&priv->low_lock, flags);
 }
 
@@ -6321,11 +6316,10 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
 
 /* Look into using netdev destructor to shutdown ieee80211? */
 
-static struct net_device *ipw2100_alloc_device(
-       struct pci_dev *pci_dev,
-       void __iomem *base_addr,
-       unsigned long mem_start,
-       unsigned long mem_len)
+static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
+                                              void __iomem * base_addr,
+                                              unsigned long mem_start,
+                                              unsigned long mem_len)
 {
        struct ipw2100_priv *priv;
        struct net_device *dev;
@@ -6351,7 +6345,7 @@ static struct net_device *ipw2100_alloc_device(
        dev->wireless_handlers = &ipw2100_wx_handler_def;
        dev->get_wireless_stats = ipw2100_wx_wireless_stats;
        dev->set_mac_address = ipw2100_set_address;
-       dev->watchdog_timeo = 3*HZ;
+       dev->watchdog_timeo = 3 * HZ;
        dev->irq = 0;
 
        dev->base_addr = (unsigned long)base_addr;
@@ -6364,22 +6358,19 @@ static struct net_device *ipw2100_alloc_device(
         * ends up causing problems.  So, we just handle
         * the WX extensions through the ipw2100_ioctl interface */
 
-
        /* memset() puts everything to 0, so we only have explicitely set
         * those values that need to be something else */
 
        /* If power management is turned on, default to AUTO mode */
        priv->power_mode = IPW_POWER_AUTO;
 
-
-
 #ifdef CONFIG_IEEE80211_WPA
        priv->ieee->wpa_enabled = 0;
        priv->ieee->tkip_countermeasures = 0;
        priv->ieee->drop_unencrypted = 0;
        priv->ieee->privacy_invoked = 0;
        priv->ieee->ieee802_1x = 1;
-#endif /* CONFIG_IEEE80211_WPA */
+#endif                         /* CONFIG_IEEE80211_WPA */
 
        /* Set module parameters */
        switch (mode) {
@@ -6401,8 +6392,7 @@ static struct net_device *ipw2100_alloc_device(
                priv->status |= STATUS_RF_KILL_SW;
 
        if (channel != 0 &&
-           ((channel >= REG_MIN_CHANNEL) &&
-            (channel <= REG_MAX_CHANNEL))) {
+           ((channel >= REG_MIN_CHANNEL) && (channel <= REG_MAX_CHANNEL))) {
                priv->config |= CFG_STATIC_CHANNEL;
                priv->channel = channel;
        }
@@ -6441,7 +6431,6 @@ static struct net_device *ipw2100_alloc_device(
        INIT_LIST_HEAD(&priv->fw_pend_list);
        INIT_STAT(&priv->fw_pend_stat);
 
-
 #ifdef CONFIG_SOFTWARE_SUSPEND2
        priv->workqueue = create_workqueue(DRV_NAME, 0);
 #else
@@ -6535,7 +6524,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                return err;
        }
 
-        /* We disable the RETRY_TIMEOUT register (0x41) to keep
+       /* We disable the RETRY_TIMEOUT register (0x41) to keep
         * PCI Tx retries from interfering with C3 CPU state */
        pci_read_config_dword(pci_dev, 0x40, &val);
        if ((val & 0x0000ff00) != 0)
@@ -6566,12 +6555,10 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
        ipw2100_queues_initialize(priv);
 
        err = request_irq(pci_dev->irq,
-                         ipw2100_interrupt, SA_SHIRQ,
-                         dev->name, priv);
+                         ipw2100_interrupt, SA_SHIRQ, dev->name, priv);
        if (err) {
                printk(KERN_WARNING DRV_NAME
-                      "Error calling request_irq: %d.\n",
-                      pci_dev->irq);
+                      "Error calling request_irq: %d.\n", pci_dev->irq);
                goto fail;
        }
        dev->irq = pci_dev->irq;
@@ -6634,10 +6621,10 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 
        return 0;
 
- fail_unlock:
     fail_unlock:
        up(&priv->action_sem);
 
- fail:
     fail:
        if (dev) {
                if (registered)
                        unregister_netdev(dev);
@@ -6653,7 +6640,8 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 
                /* These are safe to call even if they weren't allocated */
                ipw2100_queues_free(priv);
-               sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+               sysfs_remove_group(&pci_dev->dev.kobj,
+                                  &ipw2100_attribute_group);
 
                free_ieee80211(dev);
                pci_set_drvdata(pci_dev, NULL);
@@ -6679,7 +6667,8 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
                priv->status &= ~STATUS_INITIALIZED;
 
                dev = priv->net_dev;
-               sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+               sysfs_remove_group(&pci_dev->dev.kobj,
+                                  &ipw2100_attribute_group);
 
 #ifdef CONFIG_PM
                if (ipw2100_firmware.version)
@@ -6721,7 +6710,6 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
        IPW_DEBUG_INFO("exit\n");
 }
 
-
 #ifdef CONFIG_PM
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 static int ipw2100_suspend(struct pci_dev *pci_dev, u32 state)
@@ -6732,8 +6720,7 @@ static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
        struct net_device *dev = priv->net_dev;
 
-       IPW_DEBUG_INFO("%s: Going into suspend...\n",
-              dev->name);
+       IPW_DEBUG_INFO("%s: Going into suspend...\n", dev->name);
 
        down(&priv->action_sem);
        if (priv->status & STATUS_INITIALIZED) {
@@ -6745,7 +6732,7 @@ static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
        netif_device_detach(dev);
 
        pci_save_state(pci_dev);
-       pci_disable_device (pci_dev);
+       pci_disable_device(pci_dev);
        pci_set_power_state(pci_dev, PCI_D3hot);
 
        up(&priv->action_sem);
@@ -6764,8 +6751,7 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
 
        down(&priv->action_sem);
 
-       IPW_DEBUG_INFO("%s: Coming out of suspend...\n",
-              dev->name);
+       IPW_DEBUG_INFO("%s: Coming out of suspend...\n", dev->name);
 
        pci_set_power_state(pci_dev, PCI_D0);
        pci_enable_device(pci_dev);
@@ -6785,9 +6771,9 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
         * the queue of needed */
        netif_device_attach(dev);
 
-        /* Bring the device back up */
-        if (!(priv->status & STATUS_RF_KILL_SW))
-                ipw2100_up(priv, 0);
+       /* Bring the device back up */
+       if (!(priv->status & STATUS_RF_KILL_SW))
+               ipw2100_up(priv, 0);
 
        up(&priv->action_sem);
 
@@ -6795,56 +6781,55 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
 }
 #endif
 
-
 #define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x }
 
 static struct pci_device_id ipw2100_pci_id_table[] __devinitdata = {
-       IPW2100_DEV_ID(0x2520), /* IN 2100A mPCI 3A */
-       IPW2100_DEV_ID(0x2521), /* IN 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2524), /* IN 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2525), /* IN 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2526), /* IN 2100A mPCI Gen A3 */
-       IPW2100_DEV_ID(0x2522), /* IN 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2523), /* IN 2100 mPCI 3A */
-       IPW2100_DEV_ID(0x2527), /* IN 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2528), /* IN 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2529), /* IN 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x252B), /* IN 2100 mPCI 3A */
-       IPW2100_DEV_ID(0x252C), /* IN 2100 mPCI 3A */
-       IPW2100_DEV_ID(0x252D), /* IN 2100 mPCI 3A */
-
-       IPW2100_DEV_ID(0x2550), /* IB 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2551), /* IB 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2553), /* IB 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2554), /* IB 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2555), /* IB 2100 mPCI 3B */
-
-       IPW2100_DEV_ID(0x2560), /* DE 2100A mPCI 3A */
-       IPW2100_DEV_ID(0x2562), /* DE 2100A mPCI 3A */
-       IPW2100_DEV_ID(0x2563), /* DE 2100A mPCI 3A */
-       IPW2100_DEV_ID(0x2561), /* DE 2100 mPCI 3A */
-       IPW2100_DEV_ID(0x2565), /* DE 2100 mPCI 3A */
-       IPW2100_DEV_ID(0x2566), /* DE 2100 mPCI 3A */
-       IPW2100_DEV_ID(0x2567), /* DE 2100 mPCI 3A */
-
-       IPW2100_DEV_ID(0x2570), /* GA 2100 mPCI 3B */
-
-       IPW2100_DEV_ID(0x2580), /* TO 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2582), /* TO 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2583), /* TO 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2581), /* TO 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2585), /* TO 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2586), /* TO 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2587), /* TO 2100 mPCI 3B */
-
-       IPW2100_DEV_ID(0x2590), /* SO 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2592), /* SO 2100A mPCI 3B */
-       IPW2100_DEV_ID(0x2591), /* SO 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2593), /* SO 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2596), /* SO 2100 mPCI 3B */
-       IPW2100_DEV_ID(0x2598), /* SO 2100 mPCI 3B */
-
-       IPW2100_DEV_ID(0x25A0), /* HP 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2520), /* IN 2100A mPCI 3A */
+       IPW2100_DEV_ID(0x2521), /* IN 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2524), /* IN 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2525), /* IN 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2526), /* IN 2100A mPCI Gen A3 */
+       IPW2100_DEV_ID(0x2522), /* IN 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2523), /* IN 2100 mPCI 3A */
+       IPW2100_DEV_ID(0x2527), /* IN 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2528), /* IN 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2529), /* IN 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x252B), /* IN 2100 mPCI 3A */
+       IPW2100_DEV_ID(0x252C), /* IN 2100 mPCI 3A */
+       IPW2100_DEV_ID(0x252D), /* IN 2100 mPCI 3A */
+
+       IPW2100_DEV_ID(0x2550), /* IB 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2551), /* IB 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2553), /* IB 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2554), /* IB 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2555), /* IB 2100 mPCI 3B */
+
+       IPW2100_DEV_ID(0x2560), /* DE 2100A mPCI 3A */
+       IPW2100_DEV_ID(0x2562), /* DE 2100A mPCI 3A */
+       IPW2100_DEV_ID(0x2563), /* DE 2100A mPCI 3A */
+       IPW2100_DEV_ID(0x2561), /* DE 2100 mPCI 3A */
+       IPW2100_DEV_ID(0x2565), /* DE 2100 mPCI 3A */
+       IPW2100_DEV_ID(0x2566), /* DE 2100 mPCI 3A */
+       IPW2100_DEV_ID(0x2567), /* DE 2100 mPCI 3A */
+
+       IPW2100_DEV_ID(0x2570), /* GA 2100 mPCI 3B */
+
+       IPW2100_DEV_ID(0x2580), /* TO 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2582), /* TO 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2583), /* TO 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2581), /* TO 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2585), /* TO 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2586), /* TO 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2587), /* TO 2100 mPCI 3B */
+
+       IPW2100_DEV_ID(0x2590), /* SO 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2592), /* SO 2100A mPCI 3B */
+       IPW2100_DEV_ID(0x2591), /* SO 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2593), /* SO 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2596), /* SO 2100 mPCI 3B */
+       IPW2100_DEV_ID(0x2598), /* SO 2100 mPCI 3B */
+
+       IPW2100_DEV_ID(0x25A0), /* HP 2100 mPCI 3B */
        {0,},
 };
 
@@ -6861,7 +6846,6 @@ static struct pci_driver ipw2100_pci_driver = {
 #endif
 };
 
-
 /**
  * Initialize the ipw2100 driver/module
  *
@@ -6893,7 +6877,6 @@ static int __init ipw2100_init(void)
        return ret;
 }
 
-
 /**
  * Cleanup ipw2100 driver registration
  */
@@ -6949,7 +6932,6 @@ static int ipw2100_wx_get_name(struct net_device *dev,
        return 0;
 }
 
-
 static int ipw2100_wx_set_freq(struct net_device *dev,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)
@@ -6969,8 +6951,7 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
 
        /* if setting by freq convert to channel */
        if (fwrq->e == 1) {
-               if ((fwrq->m >= (int) 2.412e8 &&
-                    fwrq->m <= (int) 2.487e8)) {
+               if ((fwrq->m >= (int)2.412e8 && fwrq->m <= (int)2.487e8)) {
                        int f = fwrq->m / 100000;
                        int c = 0;
 
@@ -6986,17 +6967,16 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
 
        if (fwrq->e > 0 || fwrq->m > 1000)
                return -EOPNOTSUPP;
-       else { /* Set the channel */
+       else {                  /* Set the channel */
                IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
                err = ipw2100_set_channel(priv, fwrq->m, 0);
        }
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
 
-
 static int ipw2100_wx_get_freq(struct net_device *dev,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)
@@ -7045,7 +7025,7 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
        case IW_MODE_MONITOR:
                err = ipw2100_switch_mode(priv, IW_MODE_MONITOR);
                break;
-#endif /* CONFIG_IPW2100_MONITOR */
+#endif                         /* CONFIG_IPW2100_MONITOR */
        case IW_MODE_ADHOC:
                err = ipw2100_switch_mode(priv, IW_MODE_ADHOC);
                break;
@@ -7056,9 +7036,9 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
                break;
        }
 
-done:
+      done:
        up(&priv->action_sem);
-       return err;
+       return err;
 }
 
 static int ipw2100_wx_get_mode(struct net_device *dev,
@@ -7077,7 +7057,6 @@ static int ipw2100_wx_get_mode(struct net_device *dev,
        return 0;
 }
 
-
 #define POWER_MODES 5
 
 /* Values are in microsecond */
@@ -7124,19 +7103,19 @@ static int ipw2100_wx_get_range(struct net_device *dev,
        /* ~5 Mb/s real (802.11b) */
        range->throughput = 5 * 1000 * 1000;
 
-//     range->sensitivity;     /* signal level threshold range */
+//      range->sensitivity;     /* signal level threshold range */
 
        range->max_qual.qual = 100;
        /* TODO: Find real max RSSI and stick here */
        range->max_qual.level = 0;
        range->max_qual.noise = 0;
-       range->max_qual.updated = 7; /* Updated all three */
+       range->max_qual.updated = 7;    /* Updated all three */
 
-       range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */
+       range->avg_qual.qual = 70;      /* > 8% missed beacons is 'bad' */
        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
        range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM;
        range->avg_qual.noise = 0;
-       range->avg_qual.updated = 7; /* Updated all three */
+       range->avg_qual.updated = 7;    /* Updated all three */
 
        range->num_bitrates = RATE_COUNT;
 
@@ -7150,61 +7129,62 @@ static int ipw2100_wx_get_range(struct net_device *dev,
        range->max_frag = MAX_FRAG_THRESHOLD;
 
        range->min_pmp = period_duration[0];    /* Minimal PM period */
-       range->max_pmp = period_duration[POWER_MODES-1];/* Maximal PM period */
-       range->min_pmt = timeout_duration[POWER_MODES-1];       /* Minimal PM timeout */
-       range->max_pmt = timeout_duration[0];/* Maximal PM timeout */
+       range->max_pmp = period_duration[POWER_MODES - 1];      /* Maximal PM period */
+       range->min_pmt = timeout_duration[POWER_MODES - 1];     /* Minimal PM timeout */
+       range->max_pmt = timeout_duration[0];   /* Maximal PM timeout */
 
-        /* How to decode max/min PM period */
+       /* How to decode max/min PM period */
        range->pmp_flags = IW_POWER_PERIOD;
-        /* How to decode max/min PM period */
+       /* How to decode max/min PM period */
        range->pmt_flags = IW_POWER_TIMEOUT;
        /* What PM options are supported */
        range->pm_capa = IW_POWER_TIMEOUT | IW_POWER_PERIOD;
 
        range->encoding_size[0] = 5;
-       range->encoding_size[1] = 13;           /* Different token sizes */
-       range->num_encoding_sizes = 2;          /* Number of entry in the list */
-       range->max_encoding_tokens = WEP_KEYS;  /* Max number of tokens */
-//     range->encoding_login_index;            /* token index for login token */
+       range->encoding_size[1] = 13;   /* Different token sizes */
+       range->num_encoding_sizes = 2;  /* Number of entry in the list */
+       range->max_encoding_tokens = WEP_KEYS;  /* Max number of tokens */
+//      range->encoding_login_index;            /* token index for login token */
 
        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
                range->txpower_capa = IW_TXPOW_DBM;
                range->num_txpower = IW_MAX_TXPOWER;
-               for (i = 0, level = (IPW_TX_POWER_MAX_DBM * 16); i < IW_MAX_TXPOWER;
-                    i++, level -= ((IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM) * 16) /
-                            (IW_MAX_TXPOWER - 1))
+               for (i = 0, level = (IPW_TX_POWER_MAX_DBM * 16);
+                    i < IW_MAX_TXPOWER;
+                    i++, level -=
+                    ((IPW_TX_POWER_MAX_DBM -
+                      IPW_TX_POWER_MIN_DBM) * 16) / (IW_MAX_TXPOWER - 1))
                        range->txpower[i] = level / 16;
        } else {
                range->txpower_capa = 0;
                range->num_txpower = 0;
        }
 
-
        /* Set the Wireless Extension versions */
        range->we_version_compiled = WIRELESS_EXT;
        range->we_version_source = 16;
 
-//     range->retry_capa;      /* What retry options are supported */
-//     range->retry_flags;     /* How to decode max/min retry limit */
-//     range->r_time_flags;    /* How to decode max/min retry life */
-//     range->min_retry;       /* Minimal number of retries */
-//     range->max_retry;       /* Maximal number of retries */
-//     range->min_r_time;      /* Minimal retry lifetime */
-//     range->max_r_time;      /* Maximal retry lifetime */
+//      range->retry_capa;      /* What retry options are supported */
+//      range->retry_flags;     /* How to decode max/min retry limit */
+//      range->r_time_flags;    /* How to decode max/min retry life */
+//      range->min_retry;       /* Minimal number of retries */
+//      range->max_retry;       /* Maximal number of retries */
+//      range->min_r_time;      /* Minimal retry lifetime */
+//      range->max_r_time;      /* Maximal retry lifetime */
 
-        range->num_channels = FREQ_COUNT;
+       range->num_channels = FREQ_COUNT;
 
        val = 0;
        for (i = 0; i < FREQ_COUNT; i++) {
                // TODO: Include only legal frequencies for some countries
-//             if (local->channel_mask & (1 << i)) {
-                       range->freq[val].i = i + 1;
-                       range->freq[val].m = ipw2100_frequencies[i] * 100000;
-                       range->freq[val].e = 1;
-                       val++;
-//             }
+//              if (local->channel_mask & (1 << i)) {
+               range->freq[val].i = i + 1;
+               range->freq[val].m = ipw2100_frequencies[i] * 100000;
+               range->freq[val].e = 1;
+               val++;
+//              }
                if (val == IW_MAX_FREQUENCIES)
-               break;
+                       break;
        }
        range->num_frequency = val;
 
@@ -7259,7 +7239,7 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
                     wrqu->ap_addr.sa_data[4] & 0xff,
                     wrqu->ap_addr.sa_data[5] & 0xff);
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7276,8 +7256,7 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
 
        /* If we are associated, trying to associate, or have a statically
         * configured BSSID then return that; otherwise return ANY */
-       if (priv->config & CFG_STATIC_BSSID ||
-           priv->status & STATUS_ASSOCIATED) {
+       if (priv->config & CFG_STATIC_BSSID || priv->status & STATUS_ASSOCIATED) {
                wrqu->ap_addr.sa_family = ARPHRD_ETHER;
                memcpy(wrqu->ap_addr.sa_data, &priv->bssid, ETH_ALEN);
        } else
@@ -7293,7 +7272,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev,
                                union iwreq_data *wrqu, char *extra)
 {
        struct ipw2100_priv *priv = ieee80211_priv(dev);
-       char *essid = ""; /* ANY */
+       char *essid = "";       /* ANY */
        int length = 0;
        int err = 0;
 
@@ -7333,7 +7312,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev,
 
        err = ipw2100_set_essid(priv, essid, length, 0);
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7350,17 +7329,16 @@ static int ipw2100_wx_get_essid(struct net_device *dev,
 
        /* If we are associated, trying to associate, or have a statically
         * configured ESSID then return that; otherwise return ANY */
-       if (priv->config & CFG_STATIC_ESSID ||
-           priv->status & STATUS_ASSOCIATED) {
+       if (priv->config & CFG_STATIC_ESSID || priv->status & STATUS_ASSOCIATED) {
                IPW_DEBUG_WX("Getting essid: '%s'\n",
                             escape_essid(priv->essid, priv->essid_len));
                memcpy(extra, priv->essid, priv->essid_len);
                wrqu->essid.length = priv->essid_len;
-               wrqu->essid.flags = 1; /* active */
+               wrqu->essid.flags = 1;  /* active */
        } else {
                IPW_DEBUG_WX("Getting essid: ANY\n");
                wrqu->essid.length = 0;
-               wrqu->essid.flags = 0; /* active */
+               wrqu->essid.flags = 0;  /* active */
        }
 
        return 0;
@@ -7379,9 +7357,9 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
        if (wrqu->data.length > IW_ESSID_MAX_SIZE)
                return -E2BIG;
 
-       wrqu->data.length = min((size_t)wrqu->data.length, sizeof(priv->nick));
+       wrqu->data.length = min((size_t) wrqu->data.length, sizeof(priv->nick));
        memset(priv->nick, 0, sizeof(priv->nick));
-       memcpy(priv->nick, extra,  wrqu->data.length);
+       memcpy(priv->nick, extra, wrqu->data.length);
 
        IPW_DEBUG_WX("SET Nickname -> %s \n", priv->nick);
 
@@ -7400,7 +7378,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
 
        wrqu->data.length = strlen(priv->nick) + 1;
        memcpy(extra, priv->nick, wrqu->data.length);
-       wrqu->data.flags = 1; /* active */
+       wrqu->data.flags = 1;   /* active */
 
        IPW_DEBUG_WX("GET Nickname -> %s \n", extra);
 
@@ -7442,12 +7420,11 @@ static int ipw2100_wx_set_rate(struct net_device *dev,
        err = ipw2100_set_tx_rates(priv, rate, 0);
 
        IPW_DEBUG_WX("SET Rate -> %04X \n", rate);
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
 
-
 static int ipw2100_wx_get_rate(struct net_device *dev,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)
@@ -7495,7 +7472,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
 
        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7520,8 +7497,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,
        if (wrqu->rts.disabled)
                value = priv->rts_threshold | RTS_DISABLED;
        else {
-               if (wrqu->rts.value < 1 ||
-                   wrqu->rts.value > 2304) {
+               if (wrqu->rts.value < 1 || wrqu->rts.value > 2304) {
                        err = -EINVAL;
                        goto done;
                }
@@ -7531,7 +7507,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,
        err = ipw2100_set_rts_threshold(priv, value);
 
        IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X \n", value);
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7547,7 +7523,7 @@ static int ipw2100_wx_get_rts(struct net_device *dev,
        struct ipw2100_priv *priv = ieee80211_priv(dev);
 
        wrqu->rts.value = priv->rts_threshold & ~RTS_DISABLED;
-       wrqu->rts.fixed = 1; /* no auto select */
+       wrqu->rts.fixed = 1;    /* no auto select */
 
        /* If RTS is set to the default value, then it is disabled */
        wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0;
@@ -7575,7 +7551,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
                        return -EINVAL;
 
                value = (wrqu->txpower.value - IPW_TX_POWER_MIN_DBM) * 16 /
-                       (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
+                   (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
        }
 
        down(&priv->action_sem);
@@ -7588,7 +7564,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
 
        IPW_DEBUG_WX("SET TX Power -> %d \n", value);
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7616,10 +7592,10 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,
                wrqu->power.disabled = 0;
                wrqu->power.fixed = 1;
                wrqu->power.value =
-                       (priv->tx_power *
-                        (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM)) /
-                       (IPW_TX_POWER_MAX - IPW_TX_POWER_MIN) +
-                       IPW_TX_POWER_MIN_DBM;
+                   (priv->tx_power *
+                    (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM)) /
+                   (IPW_TX_POWER_MAX - IPW_TX_POWER_MIN) +
+                   IPW_TX_POWER_MIN_DBM;
        }
 
        wrqu->power.flags = IW_TXPOW_DBM;
@@ -7684,8 +7660,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
        struct ipw2100_priv *priv = ieee80211_priv(dev);
        int err = 0;
 
-       if (wrqu->retry.flags & IW_RETRY_LIFETIME ||
-           wrqu->retry.disabled)
+       if (wrqu->retry.flags & IW_RETRY_LIFETIME || wrqu->retry.disabled)
                return -EINVAL;
 
        if (!(wrqu->retry.flags & IW_RETRY_LIMIT))
@@ -7700,14 +7675,14 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
        if (wrqu->retry.flags & IW_RETRY_MIN) {
                err = ipw2100_set_short_retry(priv, wrqu->retry.value);
                IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",
-                      wrqu->retry.value);
+                            wrqu->retry.value);
                goto done;
        }
 
        if (wrqu->retry.flags & IW_RETRY_MAX) {
                err = ipw2100_set_long_retry(priv, wrqu->retry.value);
                IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",
-                      wrqu->retry.value);
+                            wrqu->retry.value);
                goto done;
        }
 
@@ -7717,7 +7692,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
 
        IPW_DEBUG_WX("SET Both Retry Limits -> %d \n", wrqu->retry.value);
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7732,10 +7707,9 @@ static int ipw2100_wx_get_retry(struct net_device *dev,
 
        struct ipw2100_priv *priv = ieee80211_priv(dev);
 
-       wrqu->retry.disabled = 0; /* can't be disabled */
+       wrqu->retry.disabled = 0;       /* can't be disabled */
 
-       if ((wrqu->retry.flags & IW_RETRY_TYPE) ==
-           IW_RETRY_LIFETIME)
+       if ((wrqu->retry.flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME)
                return -EINVAL;
 
        if (wrqu->retry.flags & IW_RETRY_MAX) {
@@ -7769,15 +7743,14 @@ static int ipw2100_wx_set_scan(struct net_device *dev,
        }
 
        IPW_DEBUG_WX("Initiating scan...\n");
-       if (ipw2100_set_scan_options(priv) ||
-           ipw2100_start_scan(priv)) {
+       if (ipw2100_set_scan_options(priv) || ipw2100_start_scan(priv)) {
                IPW_DEBUG_WX("Start scan failed.\n");
 
                /* TODO: Mark a scan as pending so when hardware initialized
                 *       a scan starts */
        }
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7794,7 +7767,6 @@ static int ipw2100_wx_get_scan(struct net_device *dev,
        return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);
 }
 
-
 /*
  * Implementation based on code in hostap-driver v0.1.3 hostap_ioctl.c
  */
@@ -7823,8 +7795,8 @@ static int ipw2100_wx_get_encode(struct net_device *dev,
 }
 
 static int ipw2100_wx_set_power(struct net_device *dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *wrqu, char *extra)
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
 {
        struct ipw2100_priv *priv = ieee80211_priv(dev);
        int err = 0;
@@ -7843,11 +7815,11 @@ static int ipw2100_wx_set_power(struct net_device *dev,
        }
 
        switch (wrqu->power.flags & IW_POWER_MODE) {
-       case IW_POWER_ON:    /* If not specified */
-       case IW_POWER_MODE:  /* If set all mask */
-       case IW_POWER_ALL_R: /* If explicitely state all */
+       case IW_POWER_ON:       /* If not specified */
+       case IW_POWER_MODE:     /* If set all mask */
+       case IW_POWER_ALL_R:    /* If explicitely state all */
                break;
-       default: /* Otherwise we don't support it */
+       default:                /* Otherwise we don't support it */
                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
                             wrqu->power.flags);
                err = -EOPNOTSUPP;
@@ -7859,18 +7831,17 @@ static int ipw2100_wx_set_power(struct net_device *dev,
        priv->power_mode = IPW_POWER_ENABLED | priv->power_mode;
        err = ipw2100_set_power_mode(priv, IPW_POWER_LEVEL(priv->power_mode));
 
-       IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n",
-                    priv->power_mode);
+       IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n", priv->power_mode);
 
- done:
     done:
        up(&priv->action_sem);
        return err;
 
 }
 
 static int ipw2100_wx_get_power(struct net_device *dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *wrqu, char *extra)
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
 {
        /*
         * This can be called at any time.  No action lock required
@@ -7890,7 +7861,6 @@ static int ipw2100_wx_get_power(struct net_device *dev,
        return 0;
 }
 
-
 /*
  *
  * IWPRIV handlers
@@ -7923,7 +7893,7 @@ static int ipw2100_wx_set_promisc(struct net_device *dev,
                if (priv->ieee->iw_mode == IW_MODE_MONITOR)
                        err = ipw2100_switch_mode(priv, priv->last_mode);
        }
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7958,7 +7928,7 @@ static int ipw2100_wx_set_powermode(struct net_device *dev,
 
        if (priv->power_mode != mode)
                err = ipw2100_set_power_mode(priv, mode);
- done:
     done:
        up(&priv->action_sem);
        return err;
 }
@@ -7986,8 +7956,8 @@ static int ipw2100_wx_get_powermode(struct net_device *dev,
                                 "Power save level: %d (None)", level);
                        break;
                case IPW_POWER_AUTO:
-               snprintf(extra, MAX_POWER_STRING,
-                        "Power save level: %d (Auto)", 0);
+                       snprintf(extra, MAX_POWER_STRING,
+                                "Power save level: %d (Auto)", 0);
                        break;
                default:
                        timeout = timeout_duration[level - 1] / 1000;
@@ -8004,7 +7974,6 @@ static int ipw2100_wx_get_powermode(struct net_device *dev,
        return 0;
 }
 
-
 static int ipw2100_wx_set_preamble(struct net_device *dev,
                                   struct iw_request_info *info,
                                   union iwreq_data *wrqu, char *extra)
@@ -8029,14 +7998,14 @@ static int ipw2100_wx_set_preamble(struct net_device *dev,
 
        err = ipw2100_system_config(priv, 0);
 
-done:
+      done:
        up(&priv->action_sem);
        return err;
 }
 
 static int ipw2100_wx_get_preamble(struct net_device *dev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *wrqu, char *extra)
+                                  struct iw_request_info *info,
+                                  union iwreq_data *wrqu, char *extra)
 {
        /*
         * This can be called at any time.  No action lock required
@@ -8052,54 +8021,53 @@ static int ipw2100_wx_get_preamble(struct net_device *dev,
        return 0;
 }
 
-static iw_handler ipw2100_wx_handlers[] =
-{
-        NULL,                     /* SIOCSIWCOMMIT */
-        ipw2100_wx_get_name,      /* SIOCGIWNAME */
-        NULL,                     /* SIOCSIWNWID */
-        NULL,                     /* SIOCGIWNWID */
-        ipw2100_wx_set_freq,      /* SIOCSIWFREQ */
-        ipw2100_wx_get_freq,      /* SIOCGIWFREQ */
-        ipw2100_wx_set_mode,      /* SIOCSIWMODE */
-        ipw2100_wx_get_mode,      /* SIOCGIWMODE */
-        NULL,                     /* SIOCSIWSENS */
-        NULL,                     /* SIOCGIWSENS */
-        NULL,                     /* SIOCSIWRANGE */
-        ipw2100_wx_get_range,     /* SIOCGIWRANGE */
-        NULL,                     /* SIOCSIWPRIV */
-        NULL,                     /* SIOCGIWPRIV */
-        NULL,                     /* SIOCSIWSTATS */
-        NULL,                     /* SIOCGIWSTATS */
-        NULL,                     /* SIOCSIWSPY */
-        NULL,                     /* SIOCGIWSPY */
-        NULL,                     /* SIOCGIWTHRSPY */
-        NULL,                     /* SIOCWIWTHRSPY */
-        ipw2100_wx_set_wap,       /* SIOCSIWAP */
-        ipw2100_wx_get_wap,       /* SIOCGIWAP */
-        NULL,                     /* -- hole -- */
-        NULL,                     /* SIOCGIWAPLIST -- deprecated */
-        ipw2100_wx_set_scan,      /* SIOCSIWSCAN */
-        ipw2100_wx_get_scan,      /* SIOCGIWSCAN */
-        ipw2100_wx_set_essid,     /* SIOCSIWESSID */
-        ipw2100_wx_get_essid,     /* SIOCGIWESSID */
-        ipw2100_wx_set_nick,      /* SIOCSIWNICKN */
-        ipw2100_wx_get_nick,      /* SIOCGIWNICKN */
-        NULL,                     /* -- hole -- */
-        NULL,                     /* -- hole -- */
-        ipw2100_wx_set_rate,      /* SIOCSIWRATE */
-        ipw2100_wx_get_rate,      /* SIOCGIWRATE */
-        ipw2100_wx_set_rts,       /* SIOCSIWRTS */
-        ipw2100_wx_get_rts,       /* SIOCGIWRTS */
-        ipw2100_wx_set_frag,      /* SIOCSIWFRAG */
-        ipw2100_wx_get_frag,      /* SIOCGIWFRAG */
-        ipw2100_wx_set_txpow,     /* SIOCSIWTXPOW */
-        ipw2100_wx_get_txpow,     /* SIOCGIWTXPOW */
-        ipw2100_wx_set_retry,     /* SIOCSIWRETRY */
-        ipw2100_wx_get_retry,     /* SIOCGIWRETRY */
-        ipw2100_wx_set_encode,    /* SIOCSIWENCODE */
-        ipw2100_wx_get_encode,    /* SIOCGIWENCODE */
-        ipw2100_wx_set_power,     /* SIOCSIWPOWER */
-        ipw2100_wx_get_power,     /* SIOCGIWPOWER */
+static iw_handler ipw2100_wx_handlers[] = {
+       NULL,                   /* SIOCSIWCOMMIT */
+       ipw2100_wx_get_name,    /* SIOCGIWNAME */
+       NULL,                   /* SIOCSIWNWID */
+       NULL,                   /* SIOCGIWNWID */
+       ipw2100_wx_set_freq,    /* SIOCSIWFREQ */
+       ipw2100_wx_get_freq,    /* SIOCGIWFREQ */
+       ipw2100_wx_set_mode,    /* SIOCSIWMODE */
+       ipw2100_wx_get_mode,    /* SIOCGIWMODE */
+       NULL,                   /* SIOCSIWSENS */
+       NULL,                   /* SIOCGIWSENS */
+       NULL,                   /* SIOCSIWRANGE */
+       ipw2100_wx_get_range,   /* SIOCGIWRANGE */
+       NULL,                   /* SIOCSIWPRIV */
+       NULL,                   /* SIOCGIWPRIV */
+       NULL,                   /* SIOCSIWSTATS */
+       NULL,                   /* SIOCGIWSTATS */
+       NULL,                   /* SIOCSIWSPY */
+       NULL,                   /* SIOCGIWSPY */
+       NULL,                   /* SIOCGIWTHRSPY */
+       NULL,                   /* SIOCWIWTHRSPY */
+       ipw2100_wx_set_wap,     /* SIOCSIWAP */
+       ipw2100_wx_get_wap,     /* SIOCGIWAP */
+       NULL,                   /* -- hole -- */
+       NULL,                   /* SIOCGIWAPLIST -- deprecated */
+       ipw2100_wx_set_scan,    /* SIOCSIWSCAN */
+       ipw2100_wx_get_scan,    /* SIOCGIWSCAN */
+       ipw2100_wx_set_essid,   /* SIOCSIWESSID */
+       ipw2100_wx_get_essid,   /* SIOCGIWESSID */
+       ipw2100_wx_set_nick,    /* SIOCSIWNICKN */
+       ipw2100_wx_get_nick,    /* SIOCGIWNICKN */
+       NULL,                   /* -- hole -- */
+       NULL,                   /* -- hole -- */
+       ipw2100_wx_set_rate,    /* SIOCSIWRATE */
+       ipw2100_wx_get_rate,    /* SIOCGIWRATE */
+       ipw2100_wx_set_rts,     /* SIOCSIWRTS */
+       ipw2100_wx_get_rts,     /* SIOCGIWRTS */
+       ipw2100_wx_set_frag,    /* SIOCSIWFRAG */
+       ipw2100_wx_get_frag,    /* SIOCGIWFRAG */
+       ipw2100_wx_set_txpow,   /* SIOCSIWTXPOW */
+       ipw2100_wx_get_txpow,   /* SIOCGIWTXPOW */
+       ipw2100_wx_set_retry,   /* SIOCSIWRETRY */
+       ipw2100_wx_get_retry,   /* SIOCGIWRETRY */
+       ipw2100_wx_set_encode,  /* SIOCSIWENCODE */
+       ipw2100_wx_get_encode,  /* SIOCGIWENCODE */
+       ipw2100_wx_set_power,   /* SIOCSIWPOWER */
+       ipw2100_wx_get_power,   /* SIOCGIWPOWER */
 };
 
 #define IPW2100_PRIV_SET_MONITOR       SIOCIWFIRSTPRIV
@@ -8113,55 +8081,49 @@ static const struct iw_priv_args ipw2100_private_args[] = {
 
 #ifdef CONFIG_IPW2100_MONITOR
        {
-               IPW2100_PRIV_SET_MONITOR,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"
-       },
+        IPW2100_PRIV_SET_MONITOR,
+        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"},
        {
-               IPW2100_PRIV_RESET,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"
-       },
-#endif /* CONFIG_IPW2100_MONITOR */
+        IPW2100_PRIV_RESET,
+        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"},
+#endif                         /* CONFIG_IPW2100_MONITOR */
 
        {
-               IPW2100_PRIV_SET_POWER,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_power"
-       },
+        IPW2100_PRIV_SET_POWER,
+        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_power"},
        {
-               IPW2100_PRIV_GET_POWER,
-               0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_POWER_STRING, "get_power"
-       },
+        IPW2100_PRIV_GET_POWER,
+        0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_POWER_STRING,
+        "get_power"},
        {
-               IPW2100_PRIV_SET_LONGPREAMBLE,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"
-       },
+        IPW2100_PRIV_SET_LONGPREAMBLE,
+        IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"},
        {
-               IPW2100_PRIV_GET_LONGPREAMBLE,
-               0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | IFNAMSIZ, "get_preamble"
-       },
+        IPW2100_PRIV_GET_LONGPREAMBLE,
+        0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | IFNAMSIZ, "get_preamble"},
 };
 
 static iw_handler ipw2100_private_handler[] = {
 #ifdef CONFIG_IPW2100_MONITOR
        ipw2100_wx_set_promisc,
        ipw2100_wx_reset,
-#else /* CONFIG_IPW2100_MONITOR */
+#else                          /* CONFIG_IPW2100_MONITOR */
        NULL,
        NULL,
-#endif /* CONFIG_IPW2100_MONITOR */
+#endif                         /* CONFIG_IPW2100_MONITOR */
        ipw2100_wx_set_powermode,
        ipw2100_wx_get_powermode,
        ipw2100_wx_set_preamble,
        ipw2100_wx_get_preamble,
 };
 
-static struct iw_handler_def ipw2100_wx_handler_def =
-{
+static struct iw_handler_def ipw2100_wx_handler_def = {
        .standard = ipw2100_wx_handlers,
        .num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
        .num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
-       .num_private_args = sizeof(ipw2100_private_args) /
-       sizeof(struct iw_priv_args),
-       .private = (iw_handler *)ipw2100_private_handler,
+       .num_private_args = sizeof(ipw2100_private_args) /
+           sizeof(struct iw_priv_args),
+       .private = (iw_handler *) ipw2100_private_handler,
        .private_args = (struct iw_priv_args *)ipw2100_private_args,
 };
 
@@ -8170,7 +8132,7 @@ static struct iw_handler_def ipw2100_wx_handler_def =
  * Called by /proc/net/wireless
  * Also called by SIOCGIWSTATS
  */
-static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
+static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev)
 {
        enum {
                POOR = 30,
@@ -8190,7 +8152,7 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
        u32 ord_len = sizeof(u32);
 
        if (!priv)
-               return (struct iw_statistics *) NULL;
+               return (struct iw_statistics *)NULL;
 
        wstats = &priv->wstats;
 
@@ -8207,7 +8169,7 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
                wstats->qual.noise = 0;
                wstats->qual.updated = 7;
                wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
-                       IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                   IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
                return wstats;
        }
 
@@ -8215,7 +8177,7 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
                                &missed_beacons, &ord_len))
                goto fail_get_ordinal;
 
-        /* If we don't have a connection the quality and level is 0*/
+       /* If we don't have a connection the quality and level is 0 */
        if (!(priv->status & STATUS_ASSOCIATED)) {
                wstats->qual.qual = 0;
                wstats->qual.level = 0;
@@ -8232,10 +8194,10 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
                        rssi_qual = (rssi - 15) * (GOOD - FAIR) / 5 + FAIR;
                else if (rssi < 30)
                        rssi_qual = (rssi - 20) * (VERY_GOOD - GOOD) /
-                               10 + GOOD;
+                           10 + GOOD;
                else
                        rssi_qual = (rssi - 30) * (PERFECT - VERY_GOOD) /
-                               10 + VERY_GOOD;
+                           10 + VERY_GOOD;
 
                if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_PERCENT_RETRIES,
                                        &tx_retries, &ord_len))
@@ -8249,25 +8211,25 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
                        tx_qual = (70 - tx_retries) * (GOOD - FAIR) / 5 + FAIR;
                else if (tx_retries > 50)
                        tx_qual = (65 - tx_retries) * (VERY_GOOD - GOOD) /
-                               15 + GOOD;
+                           15 + GOOD;
                else
                        tx_qual = (50 - tx_retries) *
-                               (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
+                           (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
 
                if (missed_beacons > 50)
                        beacon_qual = (60 - missed_beacons) * POOR / 10;
                else if (missed_beacons > 40)
                        beacon_qual = (50 - missed_beacons) * (FAIR - POOR) /
-                               10 + POOR;
+                           10 + POOR;
                else if (missed_beacons > 32)
                        beacon_qual = (40 - missed_beacons) * (GOOD - FAIR) /
-                               18 + FAIR;
+                           18 + FAIR;
                else if (missed_beacons > 20)
                        beacon_qual = (32 - missed_beacons) *
-                               (VERY_GOOD - GOOD) / 20 + GOOD;
+                           (VERY_GOOD - GOOD) / 20 + GOOD;
                else
                        beacon_qual = (20 - missed_beacons) *
-                               (PERFECT - VERY_GOOD) / 20 + VERY_GOOD;
+                           (PERFECT - VERY_GOOD) / 20 + VERY_GOOD;
 
                quality = min(beacon_qual, min(tx_qual, rssi_qual));
 
@@ -8290,7 +8252,7 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
        wstats->qual.updated = 7;
        wstats->qual.updated |= IW_QUAL_NOISE_INVALID;
 
-        /* FIXME: this is percent and not a # */
+       /* FIXME: this is percent and not a # */
        wstats->miss.beacon = missed_beacons;
 
        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURES,
@@ -8300,10 +8262,10 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
 
        return wstats;
 
- fail_get_ordinal:
     fail_get_ordinal:
        IPW_DEBUG_WX("failed querying ordinals.\n");
 
-       return (struct iw_statistics *) NULL;
+       return (struct iw_statistics *)NULL;
 }
 
 static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
@@ -8326,7 +8288,7 @@ static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
        if (!(priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED)) ||
            priv->status & STATUS_RF_KILL_MASK ||
            ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID,
-                               &priv->bssid,  &len)) {
+                               &priv->bssid, &len)) {
                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
        } else {
                /* We now have the BSSID, so can finish setting to the full
@@ -8351,7 +8313,8 @@ static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
                /* This is a disassociation event, so kick the firmware to
                 * look for another AP */
                if (priv->config & CFG_STATIC_ESSID)
-                       ipw2100_set_essid(priv, priv->essid, priv->essid_len, 0);
+                       ipw2100_set_essid(priv, priv->essid, priv->essid_len,
+                                         0);
                else
                        ipw2100_set_essid(priv, NULL, 0, 0);
                up(&priv->action_sem);
@@ -8374,7 +8337,6 @@ static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
 
 #define IPW2100_FW_NAME(x) IPW2100_FW_PREFIX "" x ".fw"
 
-
 /*
 
 BINARY FIRMWARE HEADER FORMAT
@@ -8396,12 +8358,10 @@ struct ipw2100_fw_header {
        unsigned int uc_size;
 } __attribute__ ((packed));
 
-
-
 static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
 {
        struct ipw2100_fw_header *h =
-               (struct ipw2100_fw_header *)fw->fw_entry->data;
+           (struct ipw2100_fw_header *)fw->fw_entry->data;
 
        if (IPW2100_FW_MAJOR(h->version) != IPW2100_FW_MAJOR_VERSION) {
                printk(KERN_WARNING DRV_NAME ": Firmware image not compatible "
@@ -8420,7 +8380,6 @@ static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
        return 0;
 }
 
-
 static int ipw2100_get_firmware(struct ipw2100_priv *priv,
                                struct ipw2100_fw *fw)
 {
@@ -8428,7 +8387,7 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv,
        int rc;
 
        IPW_DEBUG_INFO("%s: Using hotplug firmware load.\n",
-              priv->net_dev->name);
+                      priv->net_dev->name);
 
        switch (priv->ieee->iw_mode) {
        case IW_MODE_ADHOC:
@@ -8454,7 +8413,7 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv,
                return rc;
        }
        IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data,
-                          fw->fw_entry->size);
+                      fw->fw_entry->size);
 
        ipw2100_mod_firmware_load(fw);
 
@@ -8470,7 +8429,6 @@ static void ipw2100_release_firmware(struct ipw2100_priv *priv,
        fw->fw_entry = NULL;
 }
 
-
 static int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf,
                                 size_t max)
 {
@@ -8479,8 +8437,7 @@ static int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf,
        u32 tmp;
        int i;
        /* firmware version is an ascii string (max len of 14) */
-       if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_FW_VER_NUM,
-                               ver, &len))
+       if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_FW_VER_NUM, ver, &len))
                return -EIO;
        tmp = max;
        if (len >= max)
@@ -8497,8 +8454,7 @@ static int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf,
        u32 ver;
        u32 len = sizeof(ver);
        /* microcode version is a 32 bit integer */
-       if (ipw2100_get_ordinal(priv, IPW_ORD_UCODE_VERSION,
-                               &ver, &len))
+       if (ipw2100_get_ordinal(priv, IPW_ORD_UCODE_VERSION, &ver, &len))
                return -EIO;
        return snprintf(buf, max, "%08X", ver);
 }
@@ -8506,8 +8462,7 @@ static int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf,
 /*
  * On exit, the firmware will have been freed from the fw list
  */
-static int ipw2100_fw_download(struct ipw2100_priv *priv,
-                              struct ipw2100_fw *fw)
+static int ipw2100_fw_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
 {
        /* firmware is constructed of N contiguous entries, each entry is
         * structured as:
@@ -8515,7 +8470,7 @@ static int ipw2100_fw_download(struct ipw2100_priv *priv,
         * offset    sie         desc
         * 0         4           address to write to
         * 4         2           length of data run
-         * 6         length      data
+        * 6         length      data
         */
        unsigned int addr;
        unsigned short len;
@@ -8524,12 +8479,12 @@ static int ipw2100_fw_download(struct ipw2100_priv *priv,
        unsigned int firmware_data_left = fw->fw.size;
 
        while (firmware_data_left > 0) {
-               addr = *(u32 *)(firmware_data);
-               firmware_data      += 4;
+               addr = *(u32 *) (firmware_data);
+               firmware_data += 4;
                firmware_data_left -= 4;
 
-               len = *(u16 *)(firmware_data);
-               firmware_data      += 2;
+               len = *(u16 *) (firmware_data);
+               firmware_data += 2;
                firmware_data_left -= 2;
 
                if (len > 32) {
@@ -8540,7 +8495,7 @@ static int ipw2100_fw_download(struct ipw2100_priv *priv,
                }
 
                write_nic_memory(priv->net_dev, addr, len, firmware_data);
-               firmware_data      += len;
+               firmware_data += len;
                firmware_data_left -= len;
        }
 
@@ -8654,21 +8609,19 @@ static int ipw2100_ucode_download(struct ipw2100_priv *priv,
        for (i = 0; i < 30; i++) {
                /* Read alive response structure */
                for (j = 0;
-                    j < (sizeof(struct symbol_alive_response) >> 1);
-                    j++)
-                       read_nic_word(dev, 0x210004,
-                                     ((u16 *)&response) + j);
+                    j < (sizeof(struct symbol_alive_response) >> 1); j++)
+                       read_nic_word(dev, 0x210004, ((u16 *) & response) + j);
 
-               if ((response.cmd_id == 1) &&
-                   (response.ucode_valid == 0x1))
+               if ((response.cmd_id == 1) && (response.ucode_valid == 0x1))
                        break;
                udelay(10);
        }
 
        if (i == 30) {
-               printk(KERN_ERR DRV_NAME ": %s: No response from Symbol - hw not alive\n",
+               printk(KERN_ERR DRV_NAME
+                      ": %s: No response from Symbol - hw not alive\n",
                       dev->name);
-               printk_buf(IPW_DL_ERROR, (u8*)&response, sizeof(response));
+               printk_buf(IPW_DL_ERROR, (u8 *) & response, sizeof(response));
                return -EIO;
        }
 
index c9e99ce15d66f45b107845baae368292f3b4f86d..3eb5c384eaab7eaaca12205170c62f62688a3a81 100644 (file)
@@ -93,7 +93,6 @@ struct ipw2100_rx_packet;
 #define IPW_DL_IOCTL         (1<<14)
 #define IPW_DL_RF_KILL       (1<<17)
 
-
 #define IPW_DL_MANAGE        (1<<15)
 #define IPW_DL_FW            (1<<16)
 
@@ -156,7 +155,9 @@ extern const char *band_str[];
 
 struct bd_status {
        union {
-               struct { u8 nlf:1, txType:2, intEnabled:1, reserved:4;} fields;
+               struct {
+                       u8 nlf:1, txType:2, intEnabled:1, reserved:4;
+               } fields;
                u8 field;
        } info;
 } __attribute__ ((packed));
@@ -165,7 +166,7 @@ struct ipw2100_bd {
        u32 host_addr;
        u32 buf_length;
        struct bd_status status;
-        /* number of fragments for frame (should be set only for
+       /* number of fragments for frame (should be set only for
         * 1st TBD) */
        u8 num_fragments;
        u8 reserved[6];
@@ -293,10 +294,10 @@ struct ipw2100_cmd_header {
 struct ipw2100_data_header {
        u32 host_command_reg;
        u32 host_command_reg1;
-       u8 encrypted;   // BOOLEAN in win! TRUE if frame is enc by driver
+       u8 encrypted;           // BOOLEAN in win! TRUE if frame is enc by driver
        u8 needs_encryption;    // BOOLEAN in win! TRUE if frma need to be enc in NIC
        u8 wep_index;           // 0 no key, 1-4 key index, 0xff immediate key
-       u8 key_size;    // 0 no imm key, 0x5 64bit encr, 0xd 128bit encr, 0x10 128bit encr and 128bit IV
+       u8 key_size;            // 0 no imm key, 0x5 64bit encr, 0xd 128bit encr, 0x10 128bit encr and 128bit IV
        u8 key[16];
        u8 reserved[10];        // f/w reserved
        u8 src_addr[ETH_ALEN];
@@ -306,14 +307,13 @@ struct ipw2100_data_header {
 
 /* Host command data structure */
 struct host_command {
-       u32 host_command;               // COMMAND ID
-       u32 host_command1;              // COMMAND ID
+       u32 host_command;       // COMMAND ID
+       u32 host_command1;      // COMMAND ID
        u32 host_command_sequence;      // UNIQUE COMMAND NUMBER (ID)
        u32 host_command_length;        // LENGTH
        u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN];       // COMMAND PARAMETERS
 } __attribute__ ((packed));
 
-
 typedef enum {
        POWER_ON_RESET,
        EXIT_POWER_DOWN_RESET,
@@ -328,17 +328,16 @@ enum {
        RX
 };
 
-
 struct ipw2100_tx_packet {
        int type;
        int index;
        union {
-               struct { /* COMMAND */
-                       struct ipw2100_cmd_headercmd;
+               struct {        /* COMMAND */
+                       struct ipw2100_cmd_header *cmd;
                        dma_addr_t cmd_phys;
                } c_struct;
-               struct { /* DATA */
-                       struct ipw2100_data_headerdata;
+               struct {        /* DATA */
+                       struct ipw2100_data_header *data;
                        dma_addr_t data_phys;
                        struct ieee80211_txb *txb;
                } d_struct;
@@ -348,7 +347,6 @@ struct ipw2100_tx_packet {
        struct list_head list;
 };
 
-
 struct ipw2100_rx_packet {
        struct ipw2100_rx *rxp;
        dma_addr_t dma_addr;
@@ -432,13 +430,13 @@ enum {
 };
 
 #define STATUS_POWERED          (1<<0)
-#define STATUS_CMD_ACTIVE       (1<<1)  /**< host command in progress */
-#define STATUS_RUNNING          (1<<2)  /* Card initialized, but not enabled */
-#define STATUS_ENABLED          (1<<3)  /* Card enabled -- can scan,Tx,Rx */
-#define STATUS_STOPPING         (1<<4)  /* Card is in shutdown phase */
-#define STATUS_INITIALIZED      (1<<5)  /* Card is ready for external calls */
-#define STATUS_ASSOCIATING      (1<<9)  /* Associated, but no BSSID yet */
-#define STATUS_ASSOCIATED       (1<<10) /* Associated and BSSID valid */
+#define STATUS_CMD_ACTIVE       (1<<1) /**< host command in progress */
+#define STATUS_RUNNING          (1<<2) /* Card initialized, but not enabled */
+#define STATUS_ENABLED          (1<<3) /* Card enabled -- can scan,Tx,Rx */
+#define STATUS_STOPPING         (1<<4) /* Card is in shutdown phase */
+#define STATUS_INITIALIZED      (1<<5) /* Card is ready for external calls */
+#define STATUS_ASSOCIATING      (1<<9) /* Associated, but no BSSID yet */
+#define STATUS_ASSOCIATED       (1<<10)        /* Associated and BSSID valid */
 #define STATUS_INT_ENABLED      (1<<11)
 #define STATUS_RF_KILL_HW       (1<<12)
 #define STATUS_RF_KILL_SW       (1<<13)
@@ -451,9 +449,7 @@ enum {
 #define STATUS_SCAN_COMPLETE    (1<<26)
 #define STATUS_WX_EVENT_PENDING (1<<27)
 #define STATUS_RESET_PENDING    (1<<29)
-#define STATUS_SECURITY_UPDATED (1<<30) /* Security sync needed */
-
-
+#define STATUS_SECURITY_UPDATED (1<<30)        /* Security sync needed */
 
 /* Internal NIC states */
 #define IPW_STATE_INITIALIZED  (1<<0)
@@ -469,11 +465,9 @@ enum {
 #define IPW_STATE_POWER_DOWN   (1<<10)
 #define IPW_STATE_SCANNING      (1<<11)
 
-
-
-#define CFG_STATIC_CHANNEL      (1<<0) /* Restrict assoc. to single channel */
-#define CFG_STATIC_ESSID        (1<<1) /* Restrict assoc. to single SSID */
-#define CFG_STATIC_BSSID        (1<<2) /* Restrict assoc. to single BSSID */
+#define CFG_STATIC_CHANNEL      (1<<0) /* Restrict assoc. to single channel */
+#define CFG_STATIC_ESSID        (1<<1) /* Restrict assoc. to single SSID */
+#define CFG_STATIC_BSSID        (1<<2) /* Restrict assoc. to single BSSID */
 #define CFG_CUSTOM_MAC          (1<<3)
 #define CFG_LONG_PREAMBLE       (1<<4)
 #define CFG_ASSOCIATE           (1<<6)
@@ -482,13 +476,13 @@ enum {
 #define CFG_C3_DISABLED         (1<<9)
 #define CFG_PASSIVE_SCAN        (1<<10)
 
-#define CAP_SHARED_KEY          (1<<0) /* Off = OPEN */
-#define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
+#define CAP_SHARED_KEY          (1<<0) /* Off = OPEN */
+#define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
 
 struct ipw2100_priv {
 
-       int stop_hang_check; /* Set 1 when shutting down to kill hang_check */
-       int stop_rf_kill; /* Set 1 when shutting down to kill rf_kill */
+       int stop_hang_check;    /* Set 1 when shutting down to kill hang_check */
+       int stop_rf_kill;       /* Set 1 when shutting down to kill rf_kill */
 
        struct ieee80211_device *ieee;
        unsigned long status;
@@ -519,8 +513,8 @@ struct ipw2100_priv {
        unsigned long hw_features;
        int hangs;
        u32 last_rtc;
-       int dump_raw; /* 1 to dump raw bytes in /sys/.../memory */
-       u8snapshot[0x30];
+       int dump_raw;           /* 1 to dump raw bytes in /sys/.../memory */
+       u8 *snapshot[0x30];
 
        u8 mandatory_bssid_mac[ETH_ALEN];
        u8 mac_addr[ETH_ALEN];
@@ -531,7 +525,6 @@ struct ipw2100_priv {
        struct ieee80211_security sec;
        int messages_sent;
 
-
        int short_retry_limit;
        int long_retry_limit;
 
@@ -599,7 +592,6 @@ struct ipw2100_priv {
        wait_queue_head_t wait_command_queue;
 };
 
-
 /*********************************************************
  * Host Command -> From Driver to FW
  *********************************************************/
@@ -646,7 +638,6 @@ struct ipw2100_priv {
 #define CARD_DISABLE_PHY_OFF   61
 #define MSDU_TX_RATES          62
 
-
 /* Rogue AP Detection */
 #define SET_STATION_STAT_BITS      64
 #define CLEAR_STATIONS_STAT_BITS   65
@@ -655,8 +646,6 @@ struct ipw2100_priv {
 #define DISASSOCIATION_BSSID      68
 #define SET_WPA_IE                 69
 
-
-
 /* system configuration bit mask: */
 #define IPW_CFG_MONITOR               0x00004
 #define IPW_CFG_PREAMBLE_AUTO        0x00010
@@ -704,7 +693,7 @@ struct ipw2100_priv {
 #define IPW2100_INTA_TX_TRANSFER               (0x00000001)    // Bit 0 (LSB)
 #define IPW2100_INTA_RX_TRANSFER               (0x00000002)    // Bit 1
 #define IPW2100_INTA_TX_COMPLETE              (0x00000004)     // Bit 2
-#define IPW2100_INTA_EVENT_INTERRUPT           (0x00000008)     // Bit 3
+#define IPW2100_INTA_EVENT_INTERRUPT           (0x00000008)    // Bit 3
 #define IPW2100_INTA_STATUS_CHANGE             (0x00000010)    // Bit 4
 #define IPW2100_INTA_BEACON_PERIOD_EXPIRED     (0x00000020)    // Bit 5
 #define IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE  (0x00010000)        // Bit 16
@@ -784,9 +773,6 @@ struct ipw2100_priv {
 #define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT     100 // 100 milli
 #define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT       100 // 100 milli
 
-
-
-
 #define IPW_HEADER_802_11_SIZE          sizeof(struct ieee80211_hdr_3addr)
 #define IPW_MAX_80211_PAYLOAD_SIZE              2304U
 #define IPW_MAX_802_11_PAYLOAD_LENGTH          2312
@@ -843,8 +829,8 @@ struct ipw2100_rx {
 #define IPW_TX_POWER_MIN_DBM         (-12)
 #define IPW_TX_POWER_MAX_DBM         16
 
-#define FW_SCAN_DONOT_ASSOCIATE     0x0001 // Dont Attempt to Associate after Scan
-#define FW_SCAN_PASSIVE             0x0008 // Force PASSSIVE Scan
+#define FW_SCAN_DONOT_ASSOCIATE     0x0001     // Dont Attempt to Associate after Scan
+#define FW_SCAN_PASSIVE             0x0008     // Force PASSSIVE Scan
 
 #define REG_MIN_CHANNEL             0
 #define REG_MAX_CHANNEL             14
@@ -856,7 +842,6 @@ struct ipw2100_rx {
 #define DIVERSITY_ANTENNA_A         1  // Use antenna A
 #define DIVERSITY_ANTENNA_B         2  // Use antenna B
 
-
 #define HOST_COMMAND_WAIT 0
 #define HOST_COMMAND_NO_WAIT 1
 
@@ -873,7 +858,6 @@ struct ipw2100_rx {
 #define TYPE_ASSOCIATION_REQUEST       0x0013
 #define TYPE_REASSOCIATION_REQUEST     0x0014
 
-
 #define HW_FEATURE_RFKILL (0x0001)
 #define RF_KILLSWITCH_OFF (1)
 #define RF_KILLSWITCH_ON  (0)
@@ -895,7 +879,7 @@ struct ipw2100_rx {
 // Fixed size data: Ordinal Table 1
 typedef enum _ORDINAL_TABLE_1 {        // NS - means Not Supported by FW
 // Transmit statistics
-       IPW_ORD_STAT_TX_HOST_REQUESTS = 1,// # of requested Host Tx's (MSDU)
+       IPW_ORD_STAT_TX_HOST_REQUESTS = 1,      // # of requested Host Tx's (MSDU)
        IPW_ORD_STAT_TX_HOST_COMPLETE,  // # of successful Host Tx's (MSDU)
        IPW_ORD_STAT_TX_DIR_DATA,       // # of successful Directed Tx's (MSDU)
 
@@ -905,42 +889,42 @@ typedef enum _ORDINAL_TABLE_1 {   // NS - means Not Supported by FW
        IPW_ORD_STAT_TX_DIR_DATA11,     // # of successful Directed Tx's (MSDU) @ 11MB
        IPW_ORD_STAT_TX_DIR_DATA22,     // # of successful Directed Tx's (MSDU) @ 22MB
 
-       IPW_ORD_STAT_TX_NODIR_DATA1 = 13,// # of successful Non_Directed Tx's (MSDU) @ 1MB
+       IPW_ORD_STAT_TX_NODIR_DATA1 = 13,       // # of successful Non_Directed Tx's (MSDU) @ 1MB
        IPW_ORD_STAT_TX_NODIR_DATA2,    // # of successful Non_Directed Tx's (MSDU) @ 2MB
        IPW_ORD_STAT_TX_NODIR_DATA5_5,  // # of successful Non_Directed Tx's (MSDU) @ 5.5MB
        IPW_ORD_STAT_TX_NODIR_DATA11,   // # of successful Non_Directed Tx's (MSDU) @ 11MB
 
        IPW_ORD_STAT_NULL_DATA = 21,    // # of successful NULL data Tx's
-       IPW_ORD_STAT_TX_RTS,            // # of successful Tx RTS
-       IPW_ORD_STAT_TX_CTS,            // # of successful Tx CTS
-       IPW_ORD_STAT_TX_ACK,            // # of successful Tx ACK
-       IPW_ORD_STAT_TX_ASSN,           // # of successful Association Tx's
+       IPW_ORD_STAT_TX_RTS,    // # of successful Tx RTS
+       IPW_ORD_STAT_TX_CTS,    // # of successful Tx CTS
+       IPW_ORD_STAT_TX_ACK,    // # of successful Tx ACK
+       IPW_ORD_STAT_TX_ASSN,   // # of successful Association Tx's
        IPW_ORD_STAT_TX_ASSN_RESP,      // # of successful Association response Tx's
-       IPW_ORD_STAT_TX_REASSN,         // # of successful Reassociation Tx's
+       IPW_ORD_STAT_TX_REASSN, // # of successful Reassociation Tx's
        IPW_ORD_STAT_TX_REASSN_RESP,    // # of successful Reassociation response Tx's
-       IPW_ORD_STAT_TX_PROBE,          // # of probes successfully transmitted
+       IPW_ORD_STAT_TX_PROBE,  // # of probes successfully transmitted
        IPW_ORD_STAT_TX_PROBE_RESP,     // # of probe responses successfully transmitted
-       IPW_ORD_STAT_TX_BEACON,         // # of tx beacon
-       IPW_ORD_STAT_TX_ATIM,           // # of Tx ATIM
+       IPW_ORD_STAT_TX_BEACON, // # of tx beacon
+       IPW_ORD_STAT_TX_ATIM,   // # of Tx ATIM
        IPW_ORD_STAT_TX_DISASSN,        // # of successful Disassociation TX
-       IPW_ORD_STAT_TX_AUTH,           // # of successful Authentication Tx
-       IPW_ORD_STAT_TX_DEAUTH,         // # of successful Deauthentication TX
+       IPW_ORD_STAT_TX_AUTH,   // # of successful Authentication Tx
+       IPW_ORD_STAT_TX_DEAUTH, // # of successful Deauthentication TX
 
-       IPW_ORD_STAT_TX_TOTAL_BYTES = 41,// Total successful Tx data bytes
-       IPW_ORD_STAT_TX_RETRIES,         // # of Tx retries
-       IPW_ORD_STAT_TX_RETRY1,          // # of Tx retries at 1MBPS
-       IPW_ORD_STAT_TX_RETRY2,          // # of Tx retries at 2MBPS
-       IPW_ORD_STAT_TX_RETRY5_5,        // # of Tx retries at 5.5MBPS
-       IPW_ORD_STAT_TX_RETRY11,         // # of Tx retries at 11MBPS
+       IPW_ORD_STAT_TX_TOTAL_BYTES = 41,       // Total successful Tx data bytes
+       IPW_ORD_STAT_TX_RETRIES,        // # of Tx retries
+       IPW_ORD_STAT_TX_RETRY1, // # of Tx retries at 1MBPS
+       IPW_ORD_STAT_TX_RETRY2, // # of Tx retries at 2MBPS
+       IPW_ORD_STAT_TX_RETRY5_5,       // # of Tx retries at 5.5MBPS
+       IPW_ORD_STAT_TX_RETRY11,        // # of Tx retries at 11MBPS
 
        IPW_ORD_STAT_TX_FAILURES = 51,  // # of Tx Failures
        IPW_ORD_STAT_TX_ABORT_AT_HOP,   //NS // # of Tx's aborted at hop time
-       IPW_ORD_STAT_TX_MAX_TRIES_IN_HOP,// # of times max tries in a hop failed
+       IPW_ORD_STAT_TX_MAX_TRIES_IN_HOP,       // # of times max tries in a hop failed
        IPW_ORD_STAT_TX_ABORT_LATE_DMA, //NS // # of times tx aborted due to late dma setup
        IPW_ORD_STAT_TX_ABORT_STX,      //NS // # of times backoff aborted
        IPW_ORD_STAT_TX_DISASSN_FAIL,   // # of times disassociation failed
-       IPW_ORD_STAT_TX_ERR_CTS,         // # of missed/bad CTS frames
-       IPW_ORD_STAT_TX_BPDU,           //NS // # of spanning tree BPDUs sent
+       IPW_ORD_STAT_TX_ERR_CTS,        // # of missed/bad CTS frames
+       IPW_ORD_STAT_TX_BPDU,   //NS // # of spanning tree BPDUs sent
        IPW_ORD_STAT_TX_ERR_ACK,        // # of tx err due to acks
 
        // Receive statistics
@@ -952,7 +936,7 @@ typedef enum _ORDINAL_TABLE_1 {     // NS - means Not Supported by FW
        IPW_ORD_STAT_RX_DIR_DATA11,     // # of directed packets at 11MB
        IPW_ORD_STAT_RX_DIR_DATA22,     // # of directed packets at 22MB
 
-       IPW_ORD_STAT_RX_NODIR_DATA = 71,// # of nondirected packets
+       IPW_ORD_STAT_RX_NODIR_DATA = 71,        // # of nondirected packets
        IPW_ORD_STAT_RX_NODIR_DATA1,    // # of nondirected packets at 1MB
        IPW_ORD_STAT_RX_NODIR_DATA2,    // # of nondirected packets at 2MB
        IPW_ORD_STAT_RX_NODIR_DATA5_5,  // # of nondirected packets at 5.5MB
@@ -977,18 +961,18 @@ typedef enum _ORDINAL_TABLE_1 {   // NS - means Not Supported by FW
        IPW_ORD_STAT_RX_AUTH,   // # of authentication Rx
        IPW_ORD_STAT_RX_DEAUTH, // # of deauthentication Rx
 
-       IPW_ORD_STAT_RX_TOTAL_BYTES = 101,// Total rx data bytes received
-       IPW_ORD_STAT_RX_ERR_CRC,         // # of packets with Rx CRC error
-       IPW_ORD_STAT_RX_ERR_CRC1,        // # of Rx CRC errors at 1MB
-       IPW_ORD_STAT_RX_ERR_CRC2,        // # of Rx CRC errors at 2MB
-       IPW_ORD_STAT_RX_ERR_CRC5_5,      // # of Rx CRC errors at 5.5MB
-       IPW_ORD_STAT_RX_ERR_CRC11,       // # of Rx CRC errors at 11MB
+       IPW_ORD_STAT_RX_TOTAL_BYTES = 101,      // Total rx data bytes received
+       IPW_ORD_STAT_RX_ERR_CRC,        // # of packets with Rx CRC error
+       IPW_ORD_STAT_RX_ERR_CRC1,       // # of Rx CRC errors at 1MB
+       IPW_ORD_STAT_RX_ERR_CRC2,       // # of Rx CRC errors at 2MB
+       IPW_ORD_STAT_RX_ERR_CRC5_5,     // # of Rx CRC errors at 5.5MB
+       IPW_ORD_STAT_RX_ERR_CRC11,      // # of Rx CRC errors at 11MB
 
-       IPW_ORD_STAT_RX_DUPLICATE1 = 112, // # of duplicate rx packets at 1MB
-       IPW_ORD_STAT_RX_DUPLICATE2,      // # of duplicate rx packets at 2MB
-       IPW_ORD_STAT_RX_DUPLICATE5_5,    // # of duplicate rx packets at 5.5MB
-       IPW_ORD_STAT_RX_DUPLICATE11,     // # of duplicate rx packets at 11MB
-       IPW_ORD_STAT_RX_DUPLICATE = 119, // # of duplicate rx packets
+       IPW_ORD_STAT_RX_DUPLICATE1 = 112,       // # of duplicate rx packets at 1MB
+       IPW_ORD_STAT_RX_DUPLICATE2,     // # of duplicate rx packets at 2MB
+       IPW_ORD_STAT_RX_DUPLICATE5_5,   // # of duplicate rx packets at 5.5MB
+       IPW_ORD_STAT_RX_DUPLICATE11,    // # of duplicate rx packets at 11MB
+       IPW_ORD_STAT_RX_DUPLICATE = 119,        // # of duplicate rx packets
 
        IPW_ORD_PERS_DB_LOCK = 120,     // # locking fw permanent  db
        IPW_ORD_PERS_DB_SIZE,   // # size of fw permanent  db
@@ -1006,17 +990,17 @@ typedef enum _ORDINAL_TABLE_1 {  // NS - means Not Supported by FW
        IPW_ORD_STAT_RX_ICV_ERRORS,     // # of ICV errors during decryption
 
 // PSP Statistics
-       IPW_ORD_STAT_PSP_SUSPENSION = 137,// # of times adapter suspended
+       IPW_ORD_STAT_PSP_SUSPENSION = 137,      // # of times adapter suspended
        IPW_ORD_STAT_PSP_BCN_TIMEOUT,   // # of beacon timeout
        IPW_ORD_STAT_PSP_POLL_TIMEOUT,  // # of poll response timeouts
-       IPW_ORD_STAT_PSP_NONDIR_TIMEOUT,// # of timeouts waiting for last broadcast/muticast pkt
+       IPW_ORD_STAT_PSP_NONDIR_TIMEOUT,        // # of timeouts waiting for last broadcast/muticast pkt
        IPW_ORD_STAT_PSP_RX_DTIMS,      // # of PSP DTIMs received
        IPW_ORD_STAT_PSP_RX_TIMS,       // # of PSP TIMs received
        IPW_ORD_STAT_PSP_STATION_ID,    // PSP Station ID
 
 // Association and roaming
        IPW_ORD_LAST_ASSN_TIME = 147,   // RTC time of last association
-       IPW_ORD_STAT_PERCENT_MISSED_BCNS,// current calculation of % missed beacons
+       IPW_ORD_STAT_PERCENT_MISSED_BCNS,       // current calculation of % missed beacons
        IPW_ORD_STAT_PERCENT_RETRIES,   // current calculation of % missed tx retries
        IPW_ORD_ASSOCIATED_AP_PTR,      // If associated, this is ptr to the associated
        // AP table entry. set to 0 if not associated
@@ -1151,7 +1135,7 @@ struct ipw2100_fw_chunk {
 };
 
 struct ipw2100_fw_chunk_set {
-       const void *data;
+       const void *data;
        unsigned long size;
 };
 
@@ -1164,4 +1148,4 @@ struct ipw2100_fw {
 
 #define MAX_FW_VERSION_LEN 14
 
-#endif /* _IPW2100_H */
+#endif                         /* _IPW2100_H */