Staging: wlan-ng: prism2mib.c: Coding style cleanups
authorMoritz Muehlenhoff <jmm@debian.org>
Sun, 8 Feb 2009 01:21:03 +0000 (02:21 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Apr 2009 21:53:22 +0000 (14:53 -0700)
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/wlan-ng/prism2mib.c

index 8d89268b78c91e16cb78f180c43744b777496896..1bb91b2064370b4f52fa70e64ee34928754eae4e 100644 (file)
 * --------------------------------------------------------------------
 */
 
-/*================================================================*/
-/* System Includes */
-
 #include <linux/version.h>
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <asm/byteorder.h>
 #include <linux/usb.h>
 #include <linux/bitops.h>
 
-/*================================================================*/
-/* Project Includes */
-
 #include "p80211types.h"
 #include "p80211hdr.h"
 #include "p80211mgmt.h"
 #include "hfa384x.h"
 #include "prism2mgmt.h"
 
-/*================================================================*/
-/* Local Constants */
-
-#define MIB_TMP_MAXLEN    200    /* Max length of RID record (in bytes). */
-
-/*================================================================*/
-/* Local Types */
-
-#define  F_STA        0x1        /* MIB is supported on stations. */
-#define  F_READ       0x2        /* MIB may be read. */
-#define  F_WRITE      0x4        /* MIB may be written. */
-
-typedef struct mibrec
-{
-    u32   did;
-    u16   flag;
-    u16   parm1;
-    u16   parm2;
-    u16   parm3;
-    int      (*func)(struct mibrec                *mib,
-                     int                          isget,
-                     wlandevice_t                 *wlandev,
-                     hfa384x_t                    *hw,
-                     p80211msg_dot11req_mibset_t  *msg,
-                     void                         *data);
+#define MIB_TMP_MAXLEN    200  /* Max length of RID record (in bytes). */
+
+#define  F_STA        0x1      /* MIB is supported on stations. */
+#define  F_READ       0x2      /* MIB may be read. */
+#define  F_WRITE      0x4      /* MIB may be written. */
+
+typedef struct mibrec {
+       u32 did;
+       u16 flag;
+       u16 parm1;
+       u16 parm2;
+       u16 parm3;
+       int (*func) (struct mibrec *mib,
+                    int isget,
+                    wlandevice_t *wlandev,
+                    hfa384x_t *hw,
+                    p80211msg_dot11req_mibset_t *msg, void *data);
 } mibrec_t;
 
-/*================================================================*/
-/* Local Function Declarations */
-
-static int prism2mib_bytearea2pstr(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_uint32(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_flag(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_wepdefaultkey(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_privacyinvoked(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_excludeunencrypted(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_fragmentationthreshold(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-static int prism2mib_priv(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data);
-
-/*================================================================*/
-/* Local Static Definitions */
+static int prism2mib_bytearea2pstr(mibrec_t *mib,
+                                  int isget,
+                                  wlandevice_t *wlandev,
+                                  hfa384x_t *hw,
+                                  p80211msg_dot11req_mibset_t *msg,
+                                  void *data);
+
+static int prism2mib_uint32(mibrec_t *mib,
+                           int isget,
+                           wlandevice_t *wlandev,
+                           hfa384x_t *hw,
+                           p80211msg_dot11req_mibset_t *msg, void *data);
+
+static int prism2mib_flag(mibrec_t *mib,
+                         int isget,
+                         wlandevice_t *wlandev,
+                         hfa384x_t *hw,
+                         p80211msg_dot11req_mibset_t *msg, void *data);
+
+static int prism2mib_wepdefaultkey(mibrec_t *mib,
+                                  int isget,
+                                  wlandevice_t *wlandev,
+                                  hfa384x_t *hw,
+                                  p80211msg_dot11req_mibset_t *msg,
+                                  void *data);
+
+static int prism2mib_privacyinvoked(mibrec_t *mib,
+                                   int isget,
+                                   wlandevice_t *wlandev,
+                                   hfa384x_t *hw,
+                                   p80211msg_dot11req_mibset_t *msg,
+                                   void *data);
+
+static int prism2mib_excludeunencrypted(mibrec_t *mib,
+                                       int isget,
+                                       wlandevice_t *wlandev,
+                                       hfa384x_t *hw,
+                                       p80211msg_dot11req_mibset_t *msg,
+                                       void *data);
+
+static int prism2mib_fragmentationthreshold(mibrec_t *mib,
+                                           int isget,
+                                           wlandevice_t *wlandev,
+                                           hfa384x_t *hw,
+                                           p80211msg_dot11req_mibset_t *msg,
+                                           void *data);
+
+static int prism2mib_priv(mibrec_t *mib,
+                         int isget,
+                         wlandevice_t *wlandev,
+                         hfa384x_t *hw,
+                         p80211msg_dot11req_mibset_t *msg, void *data);
 
 static mibrec_t mibtab[] = {
 
-    /* dot11smt MIB's */
-    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0,
-          F_STA | F_WRITE,
-          HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,
-          prism2mib_wepdefaultkey },
-    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1,
-          F_STA | F_WRITE,
-          HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,
-          prism2mib_wepdefaultkey },
-    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2,
-          F_STA | F_WRITE,
-          HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,
-          prism2mib_wepdefaultkey },
-    { DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3,
-          F_STA | F_WRITE,
-          HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,
-          prism2mib_wepdefaultkey },
-    { DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,
-          prism2mib_privacyinvoked },
-    { DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,
-          prism2mib_uint32 },
-    { DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_EXCLUDE, 0,
-          prism2mib_excludeunencrypted },
-
-    /* dot11mac MIB's */
-
-    { DIDmib_dot11mac_dot11OperationTable_dot11MACAddress,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,
-          prism2mib_bytearea2pstr },
-    { DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_RTSTHRESH, 0, 0,
-          prism2mib_uint32 },
-    { DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit,
-          F_STA | F_READ,
-          HFA384x_RID_SHORTRETRYLIMIT, 0, 0,
-          prism2mib_uint32 },
-    { DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit,
-          F_STA | F_READ,
-          HFA384x_RID_LONGRETRYLIMIT, 0, 0,
-          prism2mib_uint32 },
-    { DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_FRAGTHRESH, 0, 0,
-          prism2mib_fragmentationthreshold },
-    { DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,
-          F_STA | F_READ,
-          HFA384x_RID_MAXTXLIFETIME, 0, 0,
-          prism2mib_uint32 },
-
-    /* dot11phy MIB's */
-
-    { DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,
-          F_STA | F_READ,
-          HFA384x_RID_CURRENTCHANNEL, 0, 0,
-          prism2mib_uint32 },
-    { DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_TXPOWERMAX, 0, 0,
-          prism2mib_uint32 },
-
-    /* p2Static MIB's */
-
-    { DIDmib_p2_p2Static_p2CnfPortType,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_CNFPORTTYPE, 0, 0,
-          prism2mib_uint32 },
-
-    /* p2MAC MIB's */
-
-    { DIDmib_p2_p2MAC_p2CurrentTxRate,
-          F_STA | F_READ,
-          HFA384x_RID_CURRENTTXRATE, 0, 0,
-          prism2mib_uint32 },
-
-    /* And finally, lnx mibs */
-    { DIDmib_lnx_lnxConfigTable_lnxRSNAIE,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_CNFWPADATA, 0, 0,
-          prism2mib_priv },
-    { 0, 0, 0, 0, 0, NULL}};
-
-/*================================================================*/
-/* Function Definitions */
+       /* dot11smt MIB's */
+       {DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0,
+        F_STA | F_WRITE,
+        HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,
+        prism2mib_wepdefaultkey},
+       {DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1,
+        F_STA | F_WRITE,
+        HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,
+        prism2mib_wepdefaultkey},
+       {DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2,
+        F_STA | F_WRITE,
+        HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,
+        prism2mib_wepdefaultkey},
+       {DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3,
+        F_STA | F_WRITE,
+        HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,
+        prism2mib_wepdefaultkey},
+       {DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,
+        prism2mib_privacyinvoked},
+       {DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,
+        prism2mib_uint32},
+       {DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_EXCLUDE, 0,
+        prism2mib_excludeunencrypted},
+
+       /* dot11mac MIB's */
+
+       {DIDmib_dot11mac_dot11OperationTable_dot11MACAddress,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,
+        prism2mib_bytearea2pstr},
+       {DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_RTSTHRESH, 0, 0,
+        prism2mib_uint32},
+       {DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit,
+        F_STA | F_READ,
+        HFA384x_RID_SHORTRETRYLIMIT, 0, 0,
+        prism2mib_uint32},
+       {DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit,
+        F_STA | F_READ,
+        HFA384x_RID_LONGRETRYLIMIT, 0, 0,
+        prism2mib_uint32},
+       {DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_FRAGTHRESH, 0, 0,
+        prism2mib_fragmentationthreshold},
+       {DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,
+        F_STA | F_READ,
+        HFA384x_RID_MAXTXLIFETIME, 0, 0,
+        prism2mib_uint32},
+
+       /* dot11phy MIB's */
+
+       {DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,
+        F_STA | F_READ,
+        HFA384x_RID_CURRENTCHANNEL, 0, 0,
+        prism2mib_uint32},
+       {DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_TXPOWERMAX, 0, 0,
+        prism2mib_uint32},
+
+       /* p2Static MIB's */
+
+       {DIDmib_p2_p2Static_p2CnfPortType,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_CNFPORTTYPE, 0, 0,
+        prism2mib_uint32},
+
+       /* p2MAC MIB's */
+
+       {DIDmib_p2_p2MAC_p2CurrentTxRate,
+        F_STA | F_READ,
+        HFA384x_RID_CURRENTTXRATE, 0, 0,
+        prism2mib_uint32},
+
+       /* And finally, lnx mibs */
+       {DIDmib_lnx_lnxConfigTable_lnxRSNAIE,
+        F_STA | F_READ | F_WRITE,
+        HFA384x_RID_CNFWPADATA, 0, 0,
+        prism2mib_priv},
+       {0, 0, 0, 0, 0, NULL}
+};
 
 /*----------------------------------------------------------------
 * prism2mgmt_mibset_mibget
@@ -295,30 +261,30 @@ static mibrec_t mibtab[] = {
 
 int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
 {
-       hfa384x_t               *hw = wlandev->priv;
-       int                     result, isget;
-       mibrec_t                *mib;
+       hfa384x_t *hw = wlandev->priv;
+       int result, isget;
+       mibrec_t *mib;
 
-       u16                     which;
+       u16 which;
 
-       p80211msg_dot11req_mibset_t     *msg = msgp;
-       p80211itemd_t                   *mibitem;
+       p80211msg_dot11req_mibset_t *msg = msgp;
+       p80211itemd_t *mibitem;
 
        msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
        msg->resultcode.data = P80211ENUM_resultcode_success;
 
        /*
-       ** Determine if this is an Access Point or a station.
-       */
+        ** Determine if this is an Access Point or a station.
+        */
 
        which = F_STA;
 
        /*
-       ** Find the MIB in the MIB table.  Note that a MIB may be in the
-       ** table twice...once for an AP and once for a station.  Make sure
-       ** to get the correct one.  Note that DID=0 marks the end of the
-       ** MIB table.
-       */
+        ** Find the MIB in the MIB table.  Note that a MIB may be in the
+        ** table twice...once for an AP and once for a station.  Make sure
+        ** to get the correct one.  Note that DID=0 marks the end of the
+        ** MIB table.
+        */
 
        mibitem = (p80211itemd_t *) msg->mibattribute.data;
 
@@ -332,56 +298,55 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
        }
 
        /*
-       ** Determine if this is a "mibget" or a "mibset".  If this is a
-       ** "mibget", then make sure that the MIB may be read.  Otherwise,
-       ** this is a "mibset" so make make sure that the MIB may be written.
-       */
+        ** Determine if this is a "mibget" or a "mibset".  If this is a
+        ** "mibget", then make sure that the MIB may be read.  Otherwise,
+        ** this is a "mibset" so make make sure that the MIB may be written.
+        */
 
        isget = (msg->msgcode == DIDmsg_dot11req_mibget);
 
        if (isget) {
                if (!(mib->flag & F_READ)) {
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_cant_get_writeonly_mib;
+                           P80211ENUM_resultcode_cant_get_writeonly_mib;
                        goto done;
                }
        } else {
                if (!(mib->flag & F_WRITE)) {
                        msg->resultcode.data =
-                               P80211ENUM_resultcode_cant_set_readonly_mib;
+                           P80211ENUM_resultcode_cant_set_readonly_mib;
                        goto done;
                }
        }
 
        /*
-       ** Execute the MIB function.  If things worked okay, then make
-       ** sure that the MIB function also worked okay.  If so, and this
-       ** is a "mibget", then the status value must be set for both the
-       ** "mibattribute" parameter and the mib item within the data
-       ** portion of the "mibattribute".
-       */
+        ** Execute the MIB function.  If things worked okay, then make
+        ** sure that the MIB function also worked okay.  If so, and this
+        ** is a "mibget", then the status value must be set for both the
+        ** "mibattribute" parameter and the mib item within the data
+        ** portion of the "mibattribute".
+        */
 
-       result = mib->func(mib, isget, wlandev, hw, msg,
-                          (void *) mibitem->data);
+       result = mib->func(mib, isget, wlandev, hw, msg, (void *)mibitem->data);
 
        if (msg->resultcode.data == P80211ENUM_resultcode_success) {
                if (result != 0) {
                        pr_debug("get/set failure, result=%d\n",
-                                       result);
+                              result);
                        msg->resultcode.data =
-                                P80211ENUM_resultcode_implementation_failure;
+                           P80211ENUM_resultcode_implementation_failure;
                } else {
                        if (isget) {
                                msg->mibattribute.status =
-                                       P80211ENUM_msgitem_status_data_ok;
+                                   P80211ENUM_msgitem_status_data_ok;
                                mibitem->status =
-                                       P80211ENUM_msgitem_status_data_ok;
+                                   P80211ENUM_msgitem_status_data_ok;
                        }
                }
        }
 
 done:
-       return(0);
+       return 0;
 }
 
 /*----------------------------------------------------------------
@@ -409,28 +374,29 @@ done:
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_bytearea2pstr(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_bytearea2pstr(mibrec_t *mib,
+                                  int isget,
+                                  wlandevice_t *wlandev,
+                                  hfa384x_t *hw,
+                                  p80211msg_dot11req_mibset_t *msg,
+                                  void *data)
 {
-       int            result;
-       p80211pstrd_t  *pstr = (p80211pstrd_t*) data;
-       u8          bytebuf[MIB_TMP_MAXLEN];
+       int result;
+       p80211pstrd_t *pstr = (p80211pstrd_t *) data;
+       u8 bytebuf[MIB_TMP_MAXLEN];
 
        if (isget) {
-               result = hfa384x_drvr_getconfig(hw, mib->parm1, bytebuf, mib->parm2);
+               result =
+                   hfa384x_drvr_getconfig(hw, mib->parm1, bytebuf, mib->parm2);
                prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2);
        } else {
                memset(bytebuf, 0, mib->parm2);
                prism2mgmt_pstr2bytearea(bytebuf, pstr);
-               result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2);
+               result =
+                   hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2);
        }
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -458,18 +424,16 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_uint32(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_uint32(mibrec_t *mib,
+                           int isget,
+                           wlandevice_t *wlandev,
+                           hfa384x_t *hw,
+                           p80211msg_dot11req_mibset_t *msg, void *data)
 {
-       int     result;
-       u32  *uint32 = (u32*) data;
-       u8   bytebuf[MIB_TMP_MAXLEN];
-       u16  *wordbuf = (u16*) bytebuf;
+       int result;
+       u32 *uint32 = (u32 *) data;
+       u8 bytebuf[MIB_TMP_MAXLEN];
+       u16 *wordbuf = (u16 *) bytebuf;
 
        if (isget) {
                result = hfa384x_drvr_getconfig16(hw, mib->parm1, wordbuf);
@@ -485,7 +449,7 @@ void                         *data)
                result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf);
        }
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -513,19 +477,17 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_flag(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_flag(mibrec_t *mib,
+                         int isget,
+                         wlandevice_t *wlandev,
+                         hfa384x_t *hw,
+                         p80211msg_dot11req_mibset_t *msg, void *data)
 {
-       int     result;
-       u32  *uint32 = (u32*) data;
-       u8   bytebuf[MIB_TMP_MAXLEN];
-       u16  *wordbuf = (u16*) bytebuf;
-       u32  flags;
+       int result;
+       u32 *uint32 = (u32 *) data;
+       u8 bytebuf[MIB_TMP_MAXLEN];
+       u16 *wordbuf = (u16 *) bytebuf;
+       u32 flags;
 
        result = hfa384x_drvr_getconfig16(hw, mib->parm1, wordbuf);
        if (result == 0) {
@@ -535,7 +497,7 @@ void                         *data)
                flags = *wordbuf;
                if (isget) {
                        *uint32 = (flags & mib->parm2) ?
-                               P80211ENUM_truth_true : P80211ENUM_truth_false;
+                           P80211ENUM_truth_true : P80211ENUM_truth_false;
                } else {
                        if ((*uint32) == P80211ENUM_truth_true)
                                flags |= mib->parm2;
@@ -545,11 +507,12 @@ void                         *data)
                         * prism2mgmt_p80211int2prism2int(wordbuf, &flags);
                         */
                        *wordbuf = flags;
-                       result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf);
+                       result =
+                           hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf);
                }
        }
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -577,30 +540,29 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_wepdefaultkey(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_wepdefaultkey(mibrec_t *mib,
+                                  int isget,
+                                  wlandevice_t *wlandev,
+                                  hfa384x_t *hw,
+                                  p80211msg_dot11req_mibset_t *msg,
+                                  void *data)
 {
-       int            result;
-       p80211pstrd_t  *pstr = (p80211pstrd_t*) data;
-       u8          bytebuf[MIB_TMP_MAXLEN];
-       u16         len;
+       int result;
+       p80211pstrd_t *pstr = (p80211pstrd_t *) data;
+       u8 bytebuf[MIB_TMP_MAXLEN];
+       u16 len;
 
        if (isget) {
-               result = 0;    /* Should never happen. */
+               result = 0;     /* Should never happen. */
        } else {
                len = (pstr->len > 5) ? HFA384x_RID_CNFWEP128DEFAULTKEY_LEN :
-                                       HFA384x_RID_CNFWEPDEFAULTKEY_LEN;
+                   HFA384x_RID_CNFWEPDEFAULTKEY_LEN;
                memset(bytebuf, 0, len);
                prism2mgmt_pstr2bytearea(bytebuf, pstr);
                result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len);
        }
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -628,15 +590,14 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_privacyinvoked(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_privacyinvoked(mibrec_t *mib,
+                                   int isget,
+                                   wlandevice_t *wlandev,
+                                   hfa384x_t *hw,
+                                   p80211msg_dot11req_mibset_t *msg,
+                                   void *data)
 {
-       int     result;
+       int result;
 
        if (wlandev->hostwep & HOSTWEP_DECRYPT) {
                if (wlandev->hostwep & HOSTWEP_DECRYPT)
@@ -647,7 +608,7 @@ void                         *data)
 
        result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -675,19 +636,18 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_excludeunencrypted(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_excludeunencrypted(mibrec_t *mib,
+                                       int isget,
+                                       wlandevice_t *wlandev,
+                                       hfa384x_t *hw,
+                                       p80211msg_dot11req_mibset_t *msg,
+                                       void *data)
 {
-       int     result;
+       int result;
 
        result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -715,28 +675,28 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_fragmentationthreshold(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_fragmentationthreshold(mibrec_t *mib,
+                                           int isget,
+                                           wlandevice_t *wlandev,
+                                           hfa384x_t *hw,
+                                           p80211msg_dot11req_mibset_t *msg,
+                                           void *data)
 {
-       int     result;
-       u32  *uint32 = (u32*) data;
+       int result;
+       u32 *uint32 = (u32 *) data;
 
        if (!isget)
                if ((*uint32) % 2) {
                        printk(KERN_WARNING "Attempt to set odd number "
-                                         "FragmentationThreshold\n");
-                       msg->resultcode.data = P80211ENUM_resultcode_not_supported;
-                       return(0);
+                              "FragmentationThreshold\n");
+                       msg->resultcode.data =
+                           P80211ENUM_resultcode_not_supported;
+                       return 0;
                }
 
        result = prism2mib_uint32(mib, isget, wlandev, hw, msg, data);
 
-       return(result);
+       return result;
 }
 
 /*----------------------------------------------------------------
@@ -764,40 +724,43 @@ void                         *data)
 *
 ----------------------------------------------------------------*/
 
-static int prism2mib_priv(
-mibrec_t                     *mib,
-int                          isget,
-wlandevice_t                 *wlandev,
-hfa384x_t                    *hw,
-p80211msg_dot11req_mibset_t  *msg,
-void                         *data)
+static int prism2mib_priv(mibrec_t *mib,
+                         int isget,
+                         wlandevice_t *wlandev,
+                         hfa384x_t *hw,
+                         p80211msg_dot11req_mibset_t *msg, void *data)
 {
-       p80211pstrd_t     *pstr = (p80211pstrd_t*) data;
+       p80211pstrd_t *pstr = (p80211pstrd_t *) data;
 
-       int  result;
+       int result;
 
        switch (mib->did) {
-       case DIDmib_lnx_lnxConfigTable_lnxRSNAIE: {
-               hfa384x_WPAData_t wpa;
-               if (isget) {
-                       hfa384x_drvr_getconfig( hw, HFA384x_RID_CNFWPADATA,
-                                               (u8 *) &wpa, sizeof(wpa));
-                       pstr->len = hfa384x2host_16(wpa.datalen);
-                       memcpy(pstr->data, wpa.data, pstr->len);
-               } else {
-                       wpa.datalen = host2hfa384x_16(pstr->len);
-                       memcpy(wpa.data, pstr->data, pstr->len);
-
-                       result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFWPADATA,
-                               (u8 *) &wpa, sizeof(wpa));
+       case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
+                       hfa384x_WPAData_t wpa;
+                       if (isget) {
+                               hfa384x_drvr_getconfig(hw,
+                                                      HFA384x_RID_CNFWPADATA,
+                                                      (u8 *)&wpa,
+                                                      sizeof(wpa));
+                               pstr->len = hfa384x2host_16(wpa.datalen);
+                               memcpy(pstr->data, wpa.data, pstr->len);
+                       } else {
+                               wpa.datalen = host2hfa384x_16(pstr->len);
+                               memcpy(wpa.data, pstr->data, pstr->len);
+
+                               result =
+                                   hfa384x_drvr_setconfig(hw,
+                                                          HFA384x_RID_CNFWPADATA,
+                                                          (u8 *)&wpa,
+                                                          sizeof(wpa));
+                       }
+                       break;
                }
-               break;
-       }
        default:
                printk(KERN_ERR "Unhandled DID 0x%08x\n", mib->did);
        }
 
-       return(0);
+       return 0;
 }
 
 /*----------------------------------------------------------------
@@ -817,11 +780,10 @@ void                         *data)
 
 void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 {
-       bytestr->len = host2hfa384x_16((u16)(pstr->len));
+       bytestr->len = host2hfa384x_16((u16) (pstr->len));
        memcpy(bytestr->data, pstr->data, pstr->len);
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_pstr2bytearea
 *
@@ -842,7 +804,6 @@ void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
        memcpy(bytearea, pstr->data, pstr->len);
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_bytestr2pstr
 *
@@ -860,11 +821,10 @@ void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
 
 void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 {
-       pstr->len = (u8)(hfa384x2host_16((u16)(bytestr->len)));
+       pstr->len = (u8) (hfa384x2host_16((u16) (bytestr->len)));
        memcpy(pstr->data, bytestr->data, pstr->len);
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_bytearea2pstr
 *
@@ -882,11 +842,10 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
 
 void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
 {
-       pstr->len = (u8)len;
+       pstr->len = (u8) len;
        memcpy(pstr->data, bytearea, len);
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_prism2int2p80211int
 *
@@ -903,10 +862,9 @@ void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
 
 void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
 {
-       *wlanint = (u32)hfa384x2host_16(*prism2int);
+       *wlanint = (u32) hfa384x2host_16(*prism2int);
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_p80211int2prism2int
 *
@@ -923,10 +881,9 @@ void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
 
 void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
 {
-       *prism2int = host2hfa384x_16((u16)(*wlanint));
+       *prism2int = host2hfa384x_16((u16) (*wlanint));
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_prism2enum2p80211enum
 *
@@ -944,12 +901,11 @@ void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
 void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
 {
        /* At the moment, the need for this functionality hasn't
-       presented itself. All the wlan enumerated values are
-       a 1-to-1 match against the Prism2 enumerated values*/
+          presented itself. All the wlan enumerated values are
+          a 1-to-1 match against the Prism2 enumerated values */
        return;
 }
 
-
 /*----------------------------------------------------------------
 * prism2mgmt_p80211enum2prism2enum
 *
@@ -967,13 +923,11 @@ void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
 void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
 {
        /* At the moment, the need for this functionality hasn't
-       presented itself. All the wlan enumerated values are
-       a 1-to-1 match against the Prism2 enumerated values*/
+          presented itself. All the wlan enumerated values are
+          a 1-to-1 match against the Prism2 enumerated values */
        return;
 }
 
-
-
 /*----------------------------------------------------------------
 * prism2mgmt_get_oprateset
 *
@@ -989,37 +943,37 @@ void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
 ----------------------------------------------------------------*/
 void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
 {
-       u8      len;
-       u8      *datarate;
+       u8 len;
+       u8 *datarate;
 
        len = 0;
        datarate = pstr->data;
 
-       /* 1 Mbps */
-       if ( BIT(0) & (*rate) ) {
-               len += (u8)1;
-               *datarate = (u8)2;
+       /* 1 Mbps */
+       if (BIT(0) & (*rate)) {
+               len += (u8) 1;
+               *datarate = (u8) 2;
                datarate++;
        }
 
-       /* 2 Mbps */
-       if ( BIT(1) & (*rate) ) {
-               len += (u8)1;
-               *datarate = (u8)4;
+       /* 2 Mbps */
+       if (BIT(1) & (*rate)) {
+               len += (u8) 1;
+               *datarate = (u8) 4;
                datarate++;
        }
 
-       /* 5.5 Mbps */
-       if ( BIT(2) & (*rate) ) {
-               len += (u8)1;
-               *datarate = (u8)11;
+       /* 5.5 Mbps */
+       if (BIT(2) & (*rate)) {
+               len += (u8) 1;
+               *datarate = (u8) 11;
                datarate++;
        }
 
-       /* 11 Mbps */
-       if ( BIT(3) & (*rate) ) {
-               len += (u8)1;
-               *datarate = (u8)22;
+       /* 11 Mbps */
+       if (BIT(3) & (*rate)) {
+               len += (u8) 1;
+               *datarate = (u8) 22;
                datarate++;
        }
 
@@ -1028,8 +982,6 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
        return;
 }
 
-
-
 /*----------------------------------------------------------------
 * prism2mgmt_set_oprateset
 *
@@ -1045,30 +997,30 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
 ----------------------------------------------------------------*/
 void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
 {
-       u8      *datarate;
-       int     i;
+       u8 *datarate;
+       int i;
 
        *rate = 0;
 
        datarate = pstr->data;
 
-       for ( i=0; i < pstr->len; i++, datarate++ ) {
+       for (i = 0; i < pstr->len; i++, datarate++) {
                switch (*datarate) {
-               case 2: /* 1 Mbps */
+               case 2: /* 1 Mbps */
                        *rate |= BIT(0);
                        break;
-               case 4: /* 2 Mbps */
+               case 4: /* 2 Mbps */
                        *rate |= BIT(1);
                        break;
-               case 11: /* 5.5 Mbps */
+               case 11:        /* 5.5 Mbps */
                        *rate |= BIT(2);
                        break;
-               case 22: /* 11 Mbps */
+               case 22:        /* 11 Mbps */
                        *rate |= BIT(3);
                        break;
                default:
                        pr_debug("Unrecoginzed Rate of %d\n",
-                               *datarate);
+                              *datarate);
                        break;
                }
        }