Staging: Merge two branches of coding style fixes together

[safe/jmp/linux-2.6] / drivers / staging / wlan-ng / p80211wext.c

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 3a96fce..2fa1dfa 100644 (file)
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -37,8 +37,6 @@
 /*================================================================*/
 /* System Includes */
 
-
-
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
@@ -48,15 +46,12 @@
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <linux/if_arp.h>
-#include <asm/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/bitops.h>
+#include <linux/uaccess.h>
 #include <asm/byteorder.h>
 #include <linux/if_ether.h>
 #include <linux/bitops.h>
 
-/*================================================================*/
-/* Project Includes */
-
 #include "p80211types.h"
 #include "p80211hdr.h"
 #include "p80211conv.h"
@@ -139,10 +134,11 @@ static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data)
        int result;
 
        msg.msgcode = DIDmsg_dot11req_mibset;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = did;
        mibitem.data = data;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        return result;
 }
@@ -179,7 +175,7 @@ static int p80211wext_autojoin(wlandevice_t *wlandev)
        memcpy(msg.ssid.data.data, ssid, data.length);
        msg.ssid.data.len = data.length;
 
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -193,7 +189,7 @@ exit:
 }
 
 /* called by /proc/net/wireless */
-struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev)
+struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t *dev)
 {
        p80211msg_lnxreq_commsquality_t quality;
        wlandevice_t *wlandev = dev->ml_priv;
@@ -216,7 +212,7 @@ struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev)
        if (wlandev->mlmerequest == NULL)
                return NULL;
 
-       retval = wlandev->mlmerequest(wlandev, (p80211msg_t *)&quality);
+       retval = wlandev->mlmerequest(wlandev, (p80211msg_t *) &quality);
 
        wstats->qual.qual = qual_as_percent(quality.link.data); /* overall link quality */
        wstats->qual.level = quality.level.data;        /* instant signal level */
@@ -274,9 +270,10 @@ static int p80211wext_giwfreq(netdevice_t *dev,
        int err = 0;
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -314,6 +311,7 @@ static int p80211wext_siwfreq(netdevice_t *dev,
        }
 
        msg.msgcode = DIDmsg_dot11req_mibset;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;
        mibitem.status = P80211ENUM_msgitem_status_data_ok;
 
@@ -323,7 +321,7 @@ static int p80211wext_siwfreq(netdevice_t *dev,
                mibitem.data = p80211_mhz_to_channel(freq->m);
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -401,10 +399,11 @@ static int p80211wext_siwmode(netdevice_t *dev,
 
        /* Set Operation mode to the PORT TYPE RID */
        msg.msgcode = DIDmsg_dot11req_mibset;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_p2_p2Static_p2CnfPortType;
        mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result)
                err = -EFAULT;
@@ -554,14 +553,14 @@ static int p80211wext_siwencode(netdevice_t *dev,
        }
 
        /* Check the Key index first. */
-       if ((i = (erq->flags & IW_ENCODE_INDEX))) {
-
+       i = (erq->flags & IW_ENCODE_INDEX);
+       if (i) {
                if ((i < 1) || (i > NUM_WEPKEYS)) {
                        err = -EINVAL;
                        goto exit;
-               } else
+               } else {
                        i--;
-
+               }
                /* Set current key number only if no keys are given */
                if (erq->flags & IW_ENCODE_NOKEY) {
                        result =
@@ -626,7 +625,7 @@ static int p80211wext_siwencode(netdevice_t *dev,
 
                        msg.msgcode = DIDmsg_dot11req_mibset;
                        memcpy(&msg.mibattribute.data, &pstr, sizeof(pstr));
-                       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+                       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
                        if (result) {
                                err = -EFAULT;
@@ -694,9 +693,6 @@ static int p80211wext_giwessid(netdevice_t *dev,
                data->flags = 1;
                memcpy(essid, wlandev->ssid.data, data->length);
                essid[data->length] = 0;
-#if (WIRELESS_EXT < 21)
-               data->length++;
-#endif
        } else {
                memset(essid, 0, sizeof(wlandev->ssid.data));
                data->length = 0;
@@ -729,11 +725,6 @@ static int p80211wext_siwessid(netdevice_t *dev,
 
        msg.msgcode = DIDmsg_lnxreq_autojoin;
 
-#if (WIRELESS_EXT < 21)
-       if (length)
-               length--;
-#endif
-
        /* Trim the last '\0' to fit the SSID format */
        if (length && essid[length - 1] == '\0')
                length--;
@@ -742,7 +733,7 @@ static int p80211wext_siwessid(netdevice_t *dev,
        msg.ssid.data.len = length;
 
        pr_debug("autojoin_ssid for %s \n", essid);
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
        pr_debug("autojoin_ssid %d\n", result);
 
        if (result) {
@@ -784,9 +775,10 @@ static int p80211wext_giwrate(netdevice_t *dev,
        int err = 0;
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -835,9 +827,10 @@ static int p80211wext_giwrts(netdevice_t *dev,
        int err = 0;
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -870,6 +863,7 @@ static int p80211wext_siwrts(netdevice_t *dev,
        }
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;
        if (rts->disabled)
                mibitem.data = 2347;
@@ -877,7 +871,7 @@ static int p80211wext_siwrts(netdevice_t *dev,
                mibitem.data = rts->value;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -899,10 +893,11 @@ static int p80211wext_giwfrag(netdevice_t *dev,
        int err = 0;
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did =
            DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -935,6 +930,7 @@ static int p80211wext_siwfrag(netdevice_t *dev,
        }
 
        msg.msgcode = DIDmsg_dot11req_mibset;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did =
            DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;
 
@@ -944,7 +940,7 @@ static int p80211wext_siwfrag(netdevice_t *dev,
                mibitem.data = frag->value;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -975,10 +971,11 @@ static int p80211wext_giwretry(netdevice_t *dev,
        u16 shortretry, longretry, lifetime;
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -992,7 +989,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
        mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -1007,7 +1004,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
            DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -1050,6 +1047,8 @@ static int p80211wext_siwretry(netdevice_t *dev,
        int result;
        int err = 0;
 
+       memset(&mibitem, 0, sizeof(mibitem));
+
        if (!wlan_wext_write) {
                err = (-EOPNOTSUPP);
                goto exit;
@@ -1068,7 +1067,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
                mibitem.data = rrq->value /= 1024;
 
                memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-               result = p80211req_dorequest(wlandev, (u8 *)&msg);
+               result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
                if (result) {
                        err = -EFAULT;
@@ -1082,7 +1081,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
 
                        memcpy(&msg.mibattribute.data, &mibitem,
                               sizeof(mibitem));
-                       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+                       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
                        if (result) {
                                err = -EFAULT;
@@ -1097,7 +1096,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
 
                        memcpy(&msg.mibattribute.data, &mibitem,
                               sizeof(mibitem));
-                       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+                       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
                        if (result) {
                                err = -EFAULT;
@@ -1127,6 +1126,7 @@ static int p80211wext_siwtxpow(netdevice_t *dev,
        }
 
        msg.msgcode = DIDmsg_dot11req_mibset;
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did =
            DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
        if (rrq->fixed == 0)
@@ -1134,7 +1134,7 @@ static int p80211wext_siwtxpow(netdevice_t *dev,
        else
                mibitem.data = rrq->value;
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -1156,11 +1156,13 @@ static int p80211wext_giwtxpow(netdevice_t *dev,
        int err = 0;
 
        msg.msgcode = DIDmsg_dot11req_mibget;
+
+       memset(&mibitem, 0, sizeof(mibitem));
        mibitem.did =
            DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
 
        memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
        if (result) {
                err = -EFAULT;
@@ -1308,7 +1310,7 @@ static int p80211wext_siwscan(netdevice_t *dev,
        msg.maxchanneltime.data = 250;
        msg.minchanneltime.data = 200;
 
-       result = p80211req_dorequest(wlandev, (u8 *)&msg);
+       result = p80211req_dorequest(wlandev, (u8 *) &msg);
        if (result)
                err = prism2_result2err(msg.resultcode.data);
 
@@ -1427,7 +1429,7 @@ static int p80211wext_giwscan(netdevice_t *dev,
                msg.msgcode = DIDmsg_dot11req_scan_results;
                msg.bssindex.data = i;
 
-               result = p80211req_dorequest(wlandev, (u8 *)&msg);
+               result = p80211req_dorequest(wlandev, (u8 *) &msg);
                if ((result != 0) ||
                    (msg.resultcode.data != P80211ENUM_resultcode_success)) {
                        break;
@@ -1466,7 +1468,7 @@ static int p80211wext_set_encodeext(struct net_device *dev,
        int idx = encoding->flags & IW_ENCODE_INDEX;
 
        pr_debug("set_encode_ext flags[%d] alg[%d] keylen[%d]\n",
-              ext->ext_flags, (int)ext->alg, (int)ext->key_len);
+                ext->ext_flags, (int)ext->alg, (int)ext->key_len);
 
        if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
                /* set default key ? I'm not sure if this the the correct thing to do here */
@@ -1487,8 +1489,8 @@ static int p80211wext_set_encodeext(struct net_device *dev,
        }
 
        if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-               if (!(ext->alg & IW_ENCODE_ALG_WEP)) {
-                       pr_debug("asked to set a non wep key :(");
+               if (ext->alg != IW_ENCODE_ALG_WEP) {
+                       pr_debug("asked to set a non wep key :(\n");
                        return -EINVAL;
                }
                if (idx) {
@@ -1502,7 +1504,7 @@ static int p80211wext_set_encodeext(struct net_device *dev,
                memcpy(wlandev->wep_keys[idx], ext->key, ext->key_len);
 
                memset(&msg, 0, sizeof(msg));
-               pstr = (p80211item_pstr32_t *)&msg.mibattribute.data;
+               pstr = (p80211item_pstr32_t *) &msg.mibattribute.data;
                memcpy(pstr->data.data, ext->key, ext->key_len);
                pstr->data.len = ext->key_len;
                switch (idx) {
@@ -1526,7 +1528,7 @@ static int p80211wext_set_encodeext(struct net_device *dev,
                        break;
                }
                msg.msgcode = DIDmsg_dot11req_mibset;
-               result = p80211req_dorequest(wlandev, (u8 *)&msg);
+               result = p80211req_dorequest(wlandev, (u8 *) &msg);
                pr_debug("result (%d)\n", result);
        }
        return result;
@@ -1546,12 +1548,11 @@ static int p80211wext_get_encodeext(struct net_device *dev,
        int idx;
 
        pr_debug("get_encode_ext flags[%d] alg[%d] keylen[%d]\n",
-              ext->ext_flags, (int)ext->alg, (int)ext->key_len);
+                ext->ext_flags, (int)ext->alg, (int)ext->key_len);
 
        max_len = encoding->length - sizeof(*ext);
        if (max_len <= 0) {
-               pr_debug("get_encodeext max_len [%d] invalid\n",
-                      max_len);
+               pr_debug("get_encodeext max_len [%d] invalid\n", max_len);
                result = -EINVAL;
                goto exit;
        }
@@ -1561,8 +1562,8 @@ static int p80211wext_get_encodeext(struct net_device *dev,
 
        if (idx) {
                if (idx < 1 || idx > NUM_WEPKEYS) {
-                       pr_debug(
-                              "get_encode_ext invalid key index [%d]\n", idx);
+                       pr_debug("get_encode_ext invalid key index [%d]\n",
+                                idx);
                        result = -EINVAL;
                        goto exit;
                }
@@ -1593,8 +1594,7 @@ static int p80211_wext_set_iwauth(struct net_device *dev,
        struct iw_param *param = &wrqu->param;
        int result = 0;
 
-       pr_debug("set_iwauth flags[%d]\n",
-              (int)param->flags & IW_AUTH_INDEX);
+       pr_debug("set_iwauth flags[%d]\n", (int)param->flags & IW_AUTH_INDEX);
 
        switch (param->flags & IW_AUTH_INDEX) {
        case IW_AUTH_DROP_UNENCRYPTED:
@@ -1635,8 +1635,7 @@ static int p80211_wext_set_iwauth(struct net_device *dev,
                        wlandev->hostwep |= HOSTWEP_SHAREDKEY;
                } else {
                        /* don't know what to do know  */
-                       pr_debug("unknown AUTH_ALG (%d)\n",
-                              param->value);
+                       pr_debug("unknown AUTH_ALG (%d)\n", param->value);
                        result = -EINVAL;
                }
                break;
@@ -1657,8 +1656,7 @@ static int p80211_wext_get_iwauth(struct net_device *dev,
        struct iw_param *param = &wrqu->param;
        int result = 0;
 
-       pr_debug("get_iwauth flags[%d]\n",
-              (int)param->flags & IW_AUTH_INDEX);
+       pr_debug("get_iwauth flags[%d]\n", (int)param->flags & IW_AUTH_INDEX);
 
        switch (param->flags & IW_AUTH_INDEX) {
        case IW_AUTH_DROP_UNENCRYPTED:
@@ -1673,9 +1671,8 @@ static int p80211_wext_get_iwauth(struct net_device *dev,
 
        case IW_AUTH_80211_AUTH_ALG:
                param->value =
-                   wlandev->
-                   hostwep & HOSTWEP_SHAREDKEY ? IW_AUTH_ALG_SHARED_KEY :
-                   IW_AUTH_ALG_OPEN_SYSTEM;
+                   wlandev->hostwep & HOSTWEP_SHAREDKEY ?
+                   IW_AUTH_ALG_SHARED_KEY : IW_AUTH_ALG_OPEN_SYSTEM;
                break;
 
        default:
@@ -1747,11 +1744,7 @@ static iw_handler p80211wext_handlers[] = {
 
 struct iw_handler_def p80211wext_handler_def = {
        .num_standard = ARRAY_SIZE(p80211wext_handlers),
-       .num_private = 0,
-       .num_private_args = 0,
        .standard = p80211wext_handlers,
-       .private = NULL,
-       .private_args = NULL,
        .get_wireless_stats = p80211wext_get_wireless_stats
 };