From: Cody Harmon <harmonco@xxxxxxxxxxxxxxxxxxxxxxxxx>
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 387194d..d8d3db9 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -232,9 +232,12 @@ struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t *dev)
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 */
- wstats->qual.noise = quality.noise.data; /* instant noise level */
+ /* overall link quality */
+ wstats->qual.qual = qual_as_percent(quality.link.data);
+ /* instant signal level */
+ wstats->qual.level = quality.level.data;
+ /* instant noise level */
+ wstats->qual.noise = quality.noise.data;
wstats->qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
wstats->discard.code = wlandev->rx.decrypt_err;
@@ -287,8 +290,7 @@ static int p80211wext_giwfreq(netdevice_t *dev,
unsigned int value;
result = p80211wext_getmib(wlandev,
- DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,
- &value);
+ DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel, &value);
if (result) {
err = -EFAULT;
goto exit;
@@ -327,8 +329,7 @@ static int p80211wext_siwfreq(netdevice_t *dev,
value = p80211_mhz_to_channel(freq->m);
result = p80211wext_setmib(wlandev,
- DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,
- value);
+ DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel, value);
if (result) {
err = -EFAULT;
@@ -419,7 +420,8 @@ static int p80211wext_giwrange(netdevice_t *dev,
struct iw_range *range = (struct iw_range *)extra;
int i, val;
- /* for backward compatability set size and zero everything we don't understand */
+ /* for backward compatability set size
+ and zero everything we don't understand */
data->length = sizeof(*range);
memset(range, 0, sizeof(*range));
@@ -564,9 +566,9 @@ static int p80211wext_siwencode(netdevice_t *dev,
/* Set current key number only if no keys are given */
if (erq->flags & IW_ENCODE_NOKEY) {
result =
- p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
- i);
+ p80211wext_setmib(wlandev,
+ Dmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+ i);
if (result) {
err = -EFAULT;
@@ -588,7 +590,8 @@ static int p80211wext_siwencode(netdevice_t *dev,
-------------------------------------------------------------*/
if (erq->length > 0) {
- /* copy the key from the driver cache as the keys are read-only MIBs */
+ /* copy the key from the driver
+ cache as the keys are read-only MIBs */
wlandev->wep_keylens[i] = erq->length;
memcpy(wlandev->wep_keys[i], key, erq->length);
@@ -599,22 +602,22 @@ static int p80211wext_siwencode(netdevice_t *dev,
switch (i) {
case 0:
pstr.did =
- DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0;
+ IDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0;
break;
case 1:
pstr.did =
- DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1;
+ IDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1;
break;
case 2:
pstr.did =
- DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2;
+ IDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2;
break;
case 3:
pstr.did =
- DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3;
+ IDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3;
break;
default:
@@ -638,8 +641,8 @@ static int p80211wext_siwencode(netdevice_t *dev,
if (erq->flags & IW_ENCODE_DISABLED) {
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
- P80211ENUM_truth_false);
+ IDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+ P80211ENUM_truth_false);
} else {
result =
p80211wext_setmib(wlandev,
@@ -662,13 +665,13 @@ static int p80211wext_siwencode(netdevice_t *dev,
if (erq->flags & IW_ENCODE_RESTRICTED) {
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
- P80211ENUM_truth_true);
+ Dmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+ 0211ENUM_truth_true);
} else if (erq->flags & IW_ENCODE_OPEN) {
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
- P80211ENUM_truth_false);
+ IDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+ P80211ENUM_truth_false);
}
if (result) {
@@ -731,7 +734,7 @@ static int p80211wext_siwessid(netdevice_t *dev,
memcpy(msg.ssid.data.data, essid, length);
msg.ssid.data.len = length;
- pr_debug("autojoin_ssid for %s \n", essid);
+ pr_debug("autojoin_ssid for %s\n", essid);
result = p80211req_dorequest(wlandev, (u8 *) &msg);
pr_debug("autojoin_ssid %d\n", result);
@@ -1017,8 +1020,8 @@ static int p80211wext_siwretry(netdevice_t *dev,
value = rrq->value /= 1024;
result = p80211wext_setmib(wlandev,
- DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,
- value);
+ DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,
+ value);
if (result) {
err = -EFAULT;
goto exit;
@@ -1026,8 +1029,8 @@ static int p80211wext_siwretry(netdevice_t *dev,
} else {
if (rrq->flags & IW_RETRY_LONG) {
result = p80211wext_setmib(wlandev,
- DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit,
- rrq->value);
+ DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit,
+ rrq->value);
if (result) {
err = -EFAULT;
@@ -1095,8 +1098,8 @@ static int p80211wext_giwtxpow(netdevice_t *dev,
unsigned int value;
result = p80211wext_getmib(wlandev,
- DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
- &value);
+ DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
+ &value);
if (result) {
err = -EFAULT;
@@ -1268,7 +1271,8 @@ static char *wext_translate_bss(struct iw_request_info *info, char *current_ev,
iwe_stream_add_event(info, current_ev, end_buf, &iwe,
IW_EV_ADDR_LEN);
- /* The following entries will be displayed in the same order we give them */
+ /* The following entries will be
+ displayed in the same order we give them */
/* The ESSID. */
if (bss->ssid.data.len > 0) {
@@ -1403,7 +1407,8 @@ static int p80211wext_set_encodeext(struct net_device *dev,
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 */
+ /* set default key ? I'm not sure
+ if this the the correct thing to do here */
if (idx) {
if (idx < 1 || idx > NUM_WEPKEYS)
@@ -1414,8 +1419,8 @@ static int p80211wext_set_encodeext(struct net_device *dev,
pr_debug("setting default key (%d)\n", idx);
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
- idx);
+ DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+ idx);
if (result)
return -EFAULT;
}
@@ -1534,13 +1539,13 @@ static int p80211_wext_set_iwauth(struct net_device *dev,
if (param->value)
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
- P80211ENUM_truth_true);
+ DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+ P80211ENUM_truth_true);
else
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
- P80211ENUM_truth_false);
+ DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+ P80211ENUM_truth_false);
break;
case IW_AUTH_PRIVACY_INVOKED:
@@ -1548,13 +1553,13 @@ static int p80211_wext_set_iwauth(struct net_device *dev,
if (param->value)
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
- P80211ENUM_truth_true);
+ DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+ P80211ENUM_truth_true);
else
result =
p80211wext_setmib(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
- P80211ENUM_truth_false);
+ DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+ P80211ENUM_truth_false);
break;
@@ -1614,7 +1619,7 @@ static int p80211_wext_get_iwauth(struct net_device *dev,
return result;
}
-#define IW_IOCTL(x) [(x)-SIOCSIWCOMMIT]
+#define IW_IOCTL(x)[(x)-SIOCSIWCOMMIT]
static iw_handler p80211wext_handlers[] = {
IW_IOCTL(SIOCSIWCOMMIT) = (iw_handler) p80211wext_siwcommit,
@@ -1653,10 +1658,14 @@ static iw_handler p80211wext_handlers[] = {
/* SIOCSIWPOWER,SIOCGIWPOWER */
/* WPA operations */
/* SIOCSIWGENIE,SIOCGIWGENIE generic IE */
- IW_IOCTL(SIOCSIWAUTH) = (iw_handler) p80211_wext_set_iwauth, /*set authentication mode params */
- IW_IOCTL(SIOCGIWAUTH) = (iw_handler) p80211_wext_get_iwauth, /*get authentication mode params */
- IW_IOCTL(SIOCSIWENCODEEXT) = (iw_handler) p80211wext_set_encodeext, /*set encoding token & mode */
- IW_IOCTL(SIOCGIWENCODEEXT) = (iw_handler) p80211wext_get_encodeext, /*get encoding token & mode */
+ /*set authentication mode params */
+ IW_IOCTL(SIOCSIWAUTH) = (iw_handler) p80211_wext_set_iwauth,
+ /*get authentication mode params */
+ IW_IOCTL(SIOCGIWAUTH) = (iw_handler) p80211_wext_get_iwauth,
+ /*set encoding token & mode */
+ IW_IOCTL(SIOCSIWENCODEEXT) = (iw_handler) p80211wext_set_encodeext,
+ /*get encoding token & mode */
+ IW_IOCTL(SIOCGIWENCODEEXT) = (iw_handler) p80211wext_get_encodeext,
/* SIOCSIWPMKSA PMKSA cache operation */
};
--
1.5.2.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
