aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng/hfa384x_usb.c
diff options
context:
space:
mode:
authorAndrew Elwell <andrew.elwell@gmail.com>2010-02-18 17:56:12 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-04 10:59:02 -0500
commitef1a0ed7f1793531e5fb3ee489cb1e2b627f76fd (patch)
tree9ca95ba410f8ab6737abfd1f172f85727bd7f984 /drivers/staging/wlan-ng/hfa384x_usb.c
parent6705b68d0be284e2f9949f3657ea65d426d0f988 (diff)
Staging: wlan-ng - checkpatch.pl fixups
Basic fixups in the staging/wlan-ng directory. (First kernel patch - thanks to FOSDEM talk) Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/hfa384x_usb.c')
-rw-r--r--drivers/staging/wlan-ng/hfa384x_usb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 925678babd9..730d085c3f8 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -118,15 +118,15 @@
118#include <linux/wireless.h> 118#include <linux/wireless.h>
119#include <linux/netdevice.h> 119#include <linux/netdevice.h>
120#include <linux/timer.h> 120#include <linux/timer.h>
121#include <asm/io.h> 121#include <linux/io.h>
122#include <linux/delay.h> 122#include <linux/delay.h>
123#include <asm/byteorder.h> 123#include <asm/byteorder.h>
124#include <asm/bitops.h> 124#include <linux/bitops.h>
125#include <linux/list.h> 125#include <linux/list.h>
126#include <linux/usb.h> 126#include <linux/usb.h>
127#include <linux/byteorder/generic.h> 127#include <linux/byteorder/generic.h>
128 128
129#define SUBMIT_URB(u,f) usb_submit_urb(u,f) 129#define SUBMIT_URB(u, f) usb_submit_urb(u, f)
130 130
131#include "p80211types.h" 131#include "p80211types.h"
132#include "p80211hdr.h" 132#include "p80211hdr.h"
@@ -627,7 +627,7 @@ static hfa384x_usbctlx_t *usbctlx_alloc(void)
627{ 627{
628 hfa384x_usbctlx_t *ctlx; 628 hfa384x_usbctlx_t *ctlx;
629 629
630 ctlx = kmalloc(sizeof(*ctlx), in_interrupt()? GFP_ATOMIC : GFP_KERNEL); 630 ctlx = kmalloc(sizeof(*ctlx), in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
631 if (ctlx != NULL) { 631 if (ctlx != NULL) {
632 memset(ctlx, 0, sizeof(*ctlx)); 632 memset(ctlx, 0, sizeof(*ctlx));
633 init_completion(&ctlx->done); 633 init_completion(&ctlx->done);
@@ -675,7 +675,7 @@ struct usbctlx_cmd_completor {
675}; 675};
676typedef struct usbctlx_cmd_completor usbctlx_cmd_completor_t; 676typedef struct usbctlx_cmd_completor usbctlx_cmd_completor_t;
677 677
678static int usbctlx_cmd_completor_fn(usbctlx_completor_t * head) 678static int usbctlx_cmd_completor_fn(usbctlx_completor_t *head)
679{ 679{
680 usbctlx_cmd_completor_t *complete = (usbctlx_cmd_completor_t *) head; 680 usbctlx_cmd_completor_t *complete = (usbctlx_cmd_completor_t *) head;
681 return usbctlx_get_status(complete->cmdresp, complete->result); 681 return usbctlx_get_status(complete->cmdresp, complete->result);
@@ -3642,7 +3642,7 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,
3642 /* check for unencrypted stuff if WEP bit set. */ 3642 /* check for unencrypted stuff if WEP bit set. */
3643 if (*(datap - hdrlen + 1) & 0x40) /* wep set */ 3643 if (*(datap - hdrlen + 1) & 0x40) /* wep set */
3644 if ((*(datap) == 0xaa) && (*(datap + 1) == 0xaa)) 3644 if ((*(datap) == 0xaa) && (*(datap + 1) == 0xaa))
3645 *(datap - hdrlen + 1) &= 0xbf; // clear wep; it's the 802.2 header! 3645 *(datap - hdrlen + 1) &= 0xbf; /* clear wep; it's the 802.2 header! */
3646 } 3646 }
3647 3647
3648 if (hw->sniff_fcs) { 3648 if (hw->sniff_fcs) {