Skip to content

L
linux-davinci
Commit b1de9675 authored by Moritz Muehlenhoff's avatar Moritz Muehlenhoff Committed by Greg Kroah-Hartman
Browse files
Options

Staging: wlan-ng: p80211req.c: Coding style cleanups 

Signed-off-by: default avatarMoritz Muehlenhoff <jmm@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4793a5e2
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 102 deletions
drivers/staging/wlan-ng/p80211req.c
View file @ b1de9675
...@@ -50,9 +50,6 @@ ...@@ -50,9 +50,6 @@
* -------------------------------------------------------------------- * --------------------------------------------------------------------
*/ */
/*================================================================*/
/* System Includes */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -67,9 +64,6 @@ ...@@ -67,9 +64,6 @@
#include "wlan_compat.h" #include "wlan_compat.h"
/*================================================================*/
/* Project Includes */
#include "p80211types.h" #include "p80211types.h"
#include "p80211hdr.h" #include "p80211hdr.h"
#include "p80211mgmt.h" #include "p80211mgmt.h"
...@@ -81,15 +75,10 @@ ...@@ -81,15 +75,10 @@
#include "p80211metastruct.h" #include "p80211metastruct.h"
#include "p80211req.h" #include "p80211req.h"
/*================================================================*/ static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg);
/* Local Function Declarations */ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
p80211msg_dot11req_mibget_t *mib_msg,
static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg); int isget);
static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mibget_t *mib_msg, int isget);
/*================================================================*/
/* Function Definitions */
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* p80211req_dorequest * p80211req_dorequest
...@@ -107,31 +96,30 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mib ...@@ -107,31 +96,30 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mib
* Potentially blocks the caller, so it's a good idea to * Potentially blocks the caller, so it's a good idea to
* not call this function from an interrupt context. * not call this function from an interrupt context.
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf) int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
{ {
int result = 0; int result = 0;
p80211msg_t *msg = (p80211msg_t*)msgbuf; p80211msg_t *msg = (p80211msg_t *) msgbuf;
/* Check to make sure the MSD is running */ /* Check to make sure the MSD is running */
if ( if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
msg->msgcode == DIDmsg_lnxreq_ifstate) || msg->msgcode == DIDmsg_lnxreq_ifstate) ||
wlandev->msdstate == WLAN_MSD_RUNNING || wlandev->msdstate == WLAN_MSD_RUNNING ||
wlandev->msdstate == WLAN_MSD_FWLOAD) ) { wlandev->msdstate == WLAN_MSD_FWLOAD)) {
return -ENODEV; return -ENODEV;
} }
/* Check Permissions */ /* Check Permissions */
if (!capable(CAP_NET_ADMIN) && if (!capable(CAP_NET_ADMIN) && (msg->msgcode != DIDmsg_dot11req_mibget)) {
(msg->msgcode != DIDmsg_dot11req_mibget)) { printk(KERN_ERR
printk(KERN_ERR "%s: only dot11req_mibget allowed for non-root.\n", wlandev->name); "%s: only dot11req_mibget allowed for non-root.\n",
wlandev->name);
return -EPERM; return -EPERM;
} }
/* Check for busy status */ /* Check for busy status */
if ( test_and_set_bit(1, &(wlandev->request_pending))) { if (test_and_set_bit(1, &(wlandev->request_pending)))
return -EBUSY; return -EBUSY;
}
/* Allow p80211 to look at msg and handle if desired. */ /* Allow p80211 to look at msg and handle if desired. */
/* So far, all p80211 msgs are immediate, no waitq/timer necessary */ /* So far, all p80211 msgs are immediate, no waitq/timer necessary */
...@@ -139,10 +127,10 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf) ...@@ -139,10 +127,10 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
p80211req_handlemsg(wlandev, msg); p80211req_handlemsg(wlandev, msg);
/* Pass it down to wlandev via wlandev->mlmerequest */ /* Pass it down to wlandev via wlandev->mlmerequest */
if ( wlandev->mlmerequest != NULL ) if (wlandev->mlmerequest != NULL)
wlandev->mlmerequest(wlandev, msg); wlandev->mlmerequest(wlandev, msg);
clear_bit( 1, &(wlandev->request_pending)); clear_bit(1, &(wlandev->request_pending));
return result; /* if result==0, msg->status still may contain an err */ return result; /* if result==0, msg->status still may contain an err */
} }
...@@ -164,13 +152,15 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf) ...@@ -164,13 +152,15 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
* Call context: * Call context:
* Process thread * Process thread
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg) static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg)
{ {
switch (msg->msgcode) { switch (msg->msgcode) {
case DIDmsg_lnxreq_hostwep: { case DIDmsg_lnxreq_hostwep:{
p80211msg_lnxreq_hostwep_t *req = (p80211msg_lnxreq_hostwep_t*) msg; p80211msg_lnxreq_hostwep_t *req =
wlandev->hostwep &= ~(HOSTWEP_DECRYPT|HOSTWEP_ENCRYPT); (p80211msg_lnxreq_hostwep_t *) msg;
wlandev->hostwep &=
~(HOSTWEP_DECRYPT | HOSTWEP_ENCRYPT);
if (req->decrypt.data == P80211ENUM_truth_true) if (req->decrypt.data == P80211ENUM_truth_true)
wlandev->hostwep |= HOSTWEP_DECRYPT; wlandev->hostwep |= HOSTWEP_DECRYPT;
if (req->encrypt.data == P80211ENUM_truth_true) if (req->encrypt.data == P80211ENUM_truth_true)
...@@ -179,13 +169,13 @@ static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg) ...@@ -179,13 +169,13 @@ static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg)
break; break;
} }
case DIDmsg_dot11req_mibget: case DIDmsg_dot11req_mibget:
case DIDmsg_dot11req_mibset: { case DIDmsg_dot11req_mibset:{
int isget = (msg->msgcode == DIDmsg_dot11req_mibget); int isget = (msg->msgcode == DIDmsg_dot11req_mibget);
p80211msg_dot11req_mibget_t *mib_msg = (p80211msg_dot11req_mibget_t *) msg; p80211msg_dot11req_mibget_t *mib_msg =
p80211req_mibset_mibget (wlandev, mib_msg, isget); (p80211msg_dot11req_mibget_t *) msg;
p80211req_mibset_mibget(wlandev, mib_msg, isget);
} }
default: default:
// XXX do nothing!
; ;
} /* switch msg->msgcode */ } /* switch msg->msgcode */
...@@ -197,43 +187,45 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -197,43 +187,45 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
int isget) int isget)
{ {
p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data; p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;
p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data; p80211pstrd_t *pstr = (p80211pstrd_t *) mibitem->data;
u8 *key = mibitem->data + sizeof(p80211pstrd_t); u8 *key = mibitem->data + sizeof(p80211pstrd_t);
switch (mibitem->did) { switch (mibitem->did) {
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0: { case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0:{
if (!isget) if (!isget)
wep_change_key(wlandev, 0, key, pstr->len); wep_change_key(wlandev, 0, key, pstr->len);
break; break;
} }
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1: { case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1:{
if (!isget) if (!isget)
wep_change_key(wlandev, 1, key, pstr->len); wep_change_key(wlandev, 1, key, pstr->len);
break; break;
} }
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2: { case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2:{
if (!isget) if (!isget)
wep_change_key(wlandev, 2, key, pstr->len); wep_change_key(wlandev, 2, key, pstr->len);
break; break;
} }
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3: { case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:{
if (!isget) if (!isget)
wep_change_key(wlandev, 3, key, pstr->len); wep_change_key(wlandev, 3, key, pstr->len);
break; break;
} }
case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: { case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID:{
u32 *data = (u32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) { if (isget) {
*data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK; *data =
wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
} else { } else {
wlandev->hostwep &= ~(HOSTWEP_DEFAULTKEY_MASK); wlandev->hostwep &= ~(HOSTWEP_DEFAULTKEY_MASK);
wlandev->hostwep |= (*data & HOSTWEP_DEFAULTKEY_MASK); wlandev->hostwep |=
(*data & HOSTWEP_DEFAULTKEY_MASK);
} }
break; break;
} }
case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: { case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked:{
u32 *data = (u32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) { if (isget) {
...@@ -244,27 +236,30 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -244,27 +236,30 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
} else { } else {
wlandev->hostwep &= ~(HOSTWEP_PRIVACYINVOKED); wlandev->hostwep &= ~(HOSTWEP_PRIVACYINVOKED);
if (*data == P80211ENUM_truth_true) if (*data == P80211ENUM_truth_true)
wlandev->hostwep |= HOSTWEP_PRIVACYINVOKED; wlandev->hostwep |=
HOSTWEP_PRIVACYINVOKED;
} }
break; break;
} }
case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: { case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted:{
u32 *data = (u32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) { if (isget) {
if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED) if (wlandev->
hostwep & HOSTWEP_EXCLUDEUNENCRYPTED)
*data = P80211ENUM_truth_true; *data = P80211ENUM_truth_true;
else else
*data = P80211ENUM_truth_false; *data = P80211ENUM_truth_false;
} else { } else {
wlandev->hostwep &= ~(HOSTWEP_EXCLUDEUNENCRYPTED); wlandev->hostwep &=
~(HOSTWEP_EXCLUDEUNENCRYPTED);
if (*data == P80211ENUM_truth_true) if (*data == P80211ENUM_truth_true)
wlandev->hostwep |= HOSTWEP_EXCLUDEUNENCRYPTED; wlandev->hostwep |=
HOSTWEP_EXCLUDEUNENCRYPTED;
} }
break; break;
} }
default: default:
// XXXX do nothing!
; ;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment