Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / drivers / staging / wlan-ng / prism2mgmt.c

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 9f7d96cae8e3dc71f507bb9161b83a0608193940..4d1cdfc3542098054518aa12b10aa0a10afe5c44 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -63,11 +63,10 @@
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/types.h>
-#include <linux/slab.h>
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/byteorder.h>
 #include <linux/random.h>
 #include <linux/usb.h>
@@ -541,7 +540,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
        /*** STATION ***/
        /* Set the REQUIRED config items */
        /* SSID */
-       pstr = (p80211pstrd_t *) & (msg->ssid.data);
+       pstr = (p80211pstrd_t *) &(msg->ssid.data);
        prism2mgmt_pstr2bytestr(p2bytestr, pstr);
        result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFOWNSSID,
                                        bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
@@ -1034,7 +1033,7 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
 
        /* Set the ssid */
        memset(bytebuf, 0, 256);
-       pstr = (p80211pstrd_t *) & (msg->ssid.data);
+       pstr = (p80211pstrd_t *) &(msg->ssid.data);
        prism2mgmt_pstr2bytestr(p2bytestr, pstr);
        result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID,
                                        bytebuf,
@@ -1123,8 +1122,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                if (hw->presniff_port_type != 0) {
                        word = hw->presniff_port_type;
                        result = hfa384x_drvr_setconfig16(hw,
-                                                         HFA384x_RID_CNFPORTTYPE,
-                                                         word);
+                                                 HFA384x_RID_CNFPORTTYPE,
+                                                 word);
                        if (result) {
                                pr_debug
                                    ("failed to restore porttype, result=%d\n",
@@ -1156,10 +1155,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                        if (wlandev->netdev->type == ARPHRD_ETHER) {
                                /* Save macport 0 state */
                                result = hfa384x_drvr_getconfig16(hw,
-                                                                 HFA384x_RID_CNFPORTTYPE,
-                                                                 &
-                                                                 (hw->
-                                                                  presniff_port_type));
+                                                 HFA384x_RID_CNFPORTTYPE,
+                                                 &(hw->presniff_port_type));
                                if (result) {
                                        pr_debug
                                            ("failed to read porttype, result=%d\n",
@@ -1168,10 +1165,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                                }
                                /* Save the wepflags state */
                                result = hfa384x_drvr_getconfig16(hw,
-                                                                 HFA384x_RID_CNFWEPFLAGS,
-                                                                 &
-                                                                 (hw->
-                                                                  presniff_wepflags));
+                                                 HFA384x_RID_CNFWEPFLAGS,
+                                                 &(hw->presniff_wepflags));
                                if (result) {
                                        pr_debug
                                            ("failed to read wepflags, result=%d\n",
@@ -1218,8 +1213,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                        /* Set the port type to pIbss */
                        word = HFA384x_PORTTYPE_PSUEDOIBSS;
                        result = hfa384x_drvr_setconfig16(hw,
-                                                         HFA384x_RID_CNFPORTTYPE,
-                                                         word);
+                                                 HFA384x_RID_CNFPORTTYPE,
+                                                 word);
                        if (result) {
                                pr_debug
                                    ("failed to set porttype %d, result=%d\n",
@@ -1235,8 +1230,8 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
                                    HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
                                result =
                                    hfa384x_drvr_setconfig16(hw,
-                                                            HFA384x_RID_CNFWEPFLAGS,
-                                                            word);
+                                                    HFA384x_RID_CNFWEPFLAGS,
+                                                    word);
                        }
 
                        if (result) {