diff options
Diffstat (limited to 'drivers/staging/wlan-ng')
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 7 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 8 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.h | 26 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211hdr.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211ioctl.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211metadef.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211metastruct.h | 90 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211mgmt.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211msg.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 8 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.h | 8 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211req.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211types.h | 33 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2mgmt.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 52 |
16 files changed, 108 insertions, 140 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 85c3af00abd2..67a944c0d690 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* hfa384x.h * * Defines the constants and data structures for the hfa384x diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 555711bc12f0..33e97ffbb436 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -202,7 +202,7 @@ static void unlocked_usbctlx_complete(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx); struct usbctlx_completor { - int (*complete)(struct usbctlx_completor *); + int (*complete)(struct usbctlx_completor *completor); }; static int @@ -3417,7 +3417,7 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb) /* Attach the rxmeta, set some stuff */ p80211skb_rxmeta_attach(wlandev, skb); - rxmeta = P80211SKB_RXMETA(skb); + rxmeta = p80211skb_rxmeta(skb); rxmeta->mactime = usbin->rxfrm.desc.time; rxmeta->rxrate = usbin->rxfrm.desc.rate; rxmeta->signal = usbin->rxfrm.desc.signal - hw->dbmadjust; @@ -3439,8 +3439,7 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb) default: netdev_warn(hw->wlandev->netdev, "Received frame on unsupported port=%d\n", - HFA384x_RXSTATUS_MACPORT_GET( - usbin->rxfrm.desc.status)); + HFA384x_RXSTATUS_MACPORT_GET(usbin->rxfrm.desc.status)); break; } } diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index 855b424f6423..91debcf20646 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -497,7 +497,7 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv, /* jkriegl: only process signal/noise if requested by iwspy */ if (wlandev->spy_number) orinoco_spy_gather(wlandev, eth_hdr(skb)->h_source, - P80211SKB_RXMETA(skb)); + p80211skb_rxmeta(skb)); /* Free the metadata */ p80211skb_rxmeta_detach(skb); @@ -563,7 +563,7 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb) pr_debug("Called w/ null skb.\n"); return; } - frmmeta = P80211SKB_FRMMETA(skb); + frmmeta = p80211skb_frmmeta(skb); if (!frmmeta) { /* no magic */ pr_debug("Called w/ bad frmmeta magic.\n"); return; @@ -605,7 +605,7 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) struct p80211_frmmeta *frmmeta; /* If these already have metadata, we error out! */ - if (P80211SKB_RXMETA(skb)) { + if (p80211skb_rxmeta(skb)) { netdev_err(wlandev->netdev, "%s: RXmeta already attached!\n", wlandev->name); result = 0; @@ -654,7 +654,7 @@ void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb) { struct p80211_frmmeta *meta; - meta = P80211SKB_FRMMETA(skb); + meta = p80211skb_frmmeta(skb); if (meta && meta->rx) p80211skb_rxmeta_detach(skb); else diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index 28459dcea4b1..827002ca9930 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211conv.h * * Ether/802.11 conversions and packet buffer routines @@ -63,16 +63,6 @@ #define P80211_FRMMETA_MAGIC 0x802110 -#define P80211SKB_FRMMETA(s) \ - (((((struct p80211_frmmeta *)((s)->cb))->magic) == \ - P80211_FRMMETA_MAGIC) ? \ - ((struct p80211_frmmeta *)((s)->cb)) : \ - (NULL)) - -#define P80211SKB_RXMETA(s) \ - (P80211SKB_FRMMETA((s)) ? P80211SKB_FRMMETA((s))->rx : \ - ((struct p80211_rxmeta *)(NULL))) - struct p80211_rxmeta { struct wlandevice *wlandev; @@ -98,6 +88,20 @@ void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb); int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb); void p80211skb_rxmeta_detach(struct sk_buff *skb); +static inline struct p80211_frmmeta *p80211skb_frmmeta(struct sk_buff *skb) +{ + struct p80211_frmmeta *frmmeta = (struct p80211_frmmeta *)skb->cb; + + return frmmeta->magic == P80211_FRMMETA_MAGIC ? frmmeta : NULL; +} + +static inline struct p80211_rxmeta *p80211skb_rxmeta(struct sk_buff *skb) +{ + struct p80211_frmmeta *frmmeta = p80211skb_frmmeta(skb); + + return frmmeta ? frmmeta->rx : NULL; +} + /* * Frame capture header. (See doc/capturefrm.txt) */ diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h index 133d70c08ecf..26b178721414 100644 --- a/drivers/staging/wlan-ng/p80211hdr.h +++ b/drivers/staging/wlan-ng/p80211hdr.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211hdr.h * * Macros, types, and functions for handling 802.11 MAC headers diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h index d8cde1d8870b..ed65ac57adbe 100644 --- a/drivers/staging/wlan-ng/p80211ioctl.h +++ b/drivers/staging/wlan-ng/p80211ioctl.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211ioctl.h * * Declares constants and types for the p80211 ioctls diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 4ac2f08a520a..e63b4b557d0a 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* This file is GENERATED AUTOMATICALLY. DO NOT EDIT OR MODIFY. * -------------------------------------------------------------------- * diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h index 15b7c08e210d..5602ec606074 100644 --- a/drivers/staging/wlan-ng/p80211metastruct.h +++ b/drivers/staging/wlan-ng/p80211metastruct.h @@ -1,49 +1,49 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* This file is GENERATED AUTOMATICALLY. DO NOT EDIT OR MODIFY. -* -------------------------------------------------------------------- -* -* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. -* -------------------------------------------------------------------- -* -* linux-wlan -* -* The contents of this file are subject to the Mozilla Public -* License Version 1.1 (the "License"); you may not use this file -* except in compliance with the License. You may obtain a copy of -* the License at http://www.mozilla.org/MPL/ -* -* Software distributed under the License is distributed on an "AS -* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -* implied. See the License for the specific language governing -* rights and limitations under the License. -* -* Alternatively, the contents of this file may be used under the -* terms of the GNU Public License version 2 (the "GPL"), in which -* case the provisions of the GPL are applicable instead of the -* above. If you wish to allow the use of your version of this file -* only under the terms of the GPL and not to allow others to use -* your version of this file under the MPL, indicate your decision -* by deleting the provisions above and replace them with the notice -* and other provisions required by the GPL. If you do not delete -* the provisions above, a recipient may use your version of this -* file under either the MPL or the GPL. -* -* -------------------------------------------------------------------- -* -* Inquiries regarding the linux-wlan Open Source project can be -* made directly to: -* -* AbsoluteValue Systems Inc. -* info@linux-wlan.com -* http://www.linux-wlan.com -* -* -------------------------------------------------------------------- -* -* Portions of the development of this software were funded by -* Intersil Corporation as part of PRISM(R) chipset product development. -* -* -------------------------------------------------------------------- -*/ + * -------------------------------------------------------------------- + * + * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. + * -------------------------------------------------------------------- + * + * linux-wlan + * + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU Public License version 2 (the "GPL"), in which + * case the provisions of the GPL are applicable instead of the + * above. If you wish to allow the use of your version of this file + * only under the terms of the GPL and not to allow others to use + * your version of this file under the MPL, indicate your decision + * by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL. If you do not delete + * the provisions above, a recipient may use your version of this + * file under either the MPL or the GPL. + * + * -------------------------------------------------------------------- + * + * Inquiries regarding the linux-wlan Open Source project can be + * made directly to: + * + * AbsoluteValue Systems Inc. + * info@linux-wlan.com + * http://www.linux-wlan.com + * + * -------------------------------------------------------------------- + * + * Portions of the development of this software were funded by + * Intersil Corporation as part of PRISM(R) chipset product development. + * + * -------------------------------------------------------------------- + */ #ifndef _P80211MKMETASTRUCT_H #define _P80211MKMETASTRUCT_H diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h index 3c12929858cb..c045c08e1991 100644 --- a/drivers/staging/wlan-ng/p80211mgmt.h +++ b/drivers/staging/wlan-ng/p80211mgmt.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211mgmt.h * * Macros, types, and functions to handle 802.11 mgmt frames diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h index ae119ecd74b0..114066526df4 100644 --- a/drivers/staging/wlan-ng/p80211msg.h +++ b/drivers/staging/wlan-ng/p80211msg.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211msg.h * * Macros, constants, types, and funcs for req and ind messages diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index ec9cc00ee241..8258cb5a335d 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -95,8 +95,8 @@ static int p80211knetdev_init(struct net_device *netdev); static int p80211knetdev_open(struct net_device *netdev); static int p80211knetdev_stop(struct net_device *netdev); -static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, - struct net_device *netdev); +static netdev_tx_t p80211knetdev_hard_start_xmit(struct sk_buff *skb, + struct net_device *netdev); static void p80211knetdev_set_multicast_list(struct net_device *dev); static int p80211knetdev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); @@ -321,8 +321,8 @@ static void p80211netdev_rx_bh(unsigned long arg) * zero on success, non-zero on failure. *---------------------------------------------------------------- */ -static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, - struct net_device *netdev) +static netdev_tx_t p80211knetdev_hard_start_xmit(struct sk_buff *skb, + struct net_device *netdev) { int result = 0; int txresult = -1; diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h index cebbe746a52f..d48466d943b4 100644 --- a/drivers/staging/wlan-ng/p80211netdev.h +++ b/drivers/staging/wlan-ng/p80211netdev.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211netdev.h * * WLAN net device structure and functions @@ -180,11 +180,11 @@ struct wlandevice { int (*close)(struct wlandevice *wlandev); void (*reset)(struct wlandevice *wlandev); int (*txframe)(struct wlandevice *wlandev, struct sk_buff *skb, - union p80211_hdr *p80211_hdr, - struct p80211_metawep *p80211_wep); + union p80211_hdr *p80211_hdr, + struct p80211_metawep *p80211_wep); int (*mlmerequest)(struct wlandevice *wlandev, struct p80211msg *msg); int (*set_multicast_list)(struct wlandevice *wlandev, - struct net_device *dev); + struct net_device *dev); void (*tx_timeout)(struct wlandevice *wlandev); /* 802.11 State */ diff --git a/drivers/staging/wlan-ng/p80211req.h b/drivers/staging/wlan-ng/p80211req.h index 20be2c3af4c1..c04053f3b02b 100644 --- a/drivers/staging/wlan-ng/p80211req.h +++ b/drivers/staging/wlan-ng/p80211req.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211req.h * * Request handling functions diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h index 94420562c418..7c37d56dd9b7 100644 --- a/drivers/staging/wlan-ng/p80211types.h +++ b/drivers/staging/wlan-ng/p80211types.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* * p80211types.h * @@ -119,11 +119,6 @@ /* is a DID-LEN-DATA triple */ /* with a max size of 4+4+384 */ -/*----------------------------------------------------------------*/ -/* The following macro creates a name for an enum */ - -#define MKENUMNAME(name) p80211enum_ ## name - /*---------------------------------------------------------------- * The following constants and macros are used to construct and * deconstruct the Data ID codes. The coding is as follows: @@ -348,30 +343,4 @@ typedef void (*p80211_fromtext_t) (struct catlistitem *, u32 did, u8 *itembuf, char *textbuf); typedef u32(*p80211_valid_t) (struct catlistitem *, u32 did, u8 *itembuf); -/*----------------------------------------------------------------*/ -/* Enumeration Lists */ -/* The following are the external declarations */ -/* for all enumerations */ - -extern struct p80211enum MKENUMNAME(truth); -extern struct p80211enum MKENUMNAME(ifstate); -extern struct p80211enum MKENUMNAME(powermgmt); -extern struct p80211enum MKENUMNAME(bsstype); -extern struct p80211enum MKENUMNAME(authalg); -extern struct p80211enum MKENUMNAME(phytype); -extern struct p80211enum MKENUMNAME(temptype); -extern struct p80211enum MKENUMNAME(regdomain); -extern struct p80211enum MKENUMNAME(ccamode); -extern struct p80211enum MKENUMNAME(diversity); -extern struct p80211enum MKENUMNAME(scantype); -extern struct p80211enum MKENUMNAME(resultcode); -extern struct p80211enum MKENUMNAME(reason); -extern struct p80211enum MKENUMNAME(status); -extern struct p80211enum MKENUMNAME(msgcode); -extern struct p80211enum MKENUMNAME(msgitem_status); - -extern struct p80211enum MKENUMNAME(lnxroam_reason); - -extern struct p80211enum MKENUMNAME(p2preamble); - #endif /* _P80211TYPES_H */ diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h index 564c3f4a3e03..17bc1ee0d498 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.h +++ b/drivers/staging/wlan-ng/prism2mgmt.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* prism2mgmt.h * * Declares the mgmt command handler functions diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index fed0b8ceca6f..914970249680 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -764,16 +764,16 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) if (hw->cap_sup_sta.id == 0x04) { netdev_info(wlandev->netdev, - "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", - hw->cap_sup_sta.role, hw->cap_sup_sta.id, - hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, - hw->cap_sup_sta.top); + "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", + hw->cap_sup_sta.role, hw->cap_sup_sta.id, + hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, + hw->cap_sup_sta.top); } else { netdev_info(wlandev->netdev, - "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", - hw->cap_sup_sta.role, hw->cap_sup_sta.id, - hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, - hw->cap_sup_sta.top); + "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", + hw->cap_sup_sta.role, hw->cap_sup_sta.id, + hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, + hw->cap_sup_sta.top); } /* Compatibility range, primary f/w actor, CFI supplier */ @@ -1189,7 +1189,6 @@ void prism2sta_processing_defer(struct work_struct *data) inf = (struct hfa384x_inf_frame *)skb->data; prism2sta_inf_authreq_defer(wlandev, inf); } - } /* Now let's handle the linkstatus stuff */ @@ -1241,9 +1240,9 @@ void prism2sta_processing_defer(struct work_struct *data) /* Collect the BSSID, and set state to allow tx */ result = hfa384x_drvr_getconfig(hw, - HFA384x_RID_CURRENTBSSID, - wlandev->bssid, - WLAN_BSSID_LEN); + HFA384x_RID_CURRENTBSSID, + wlandev->bssid, + WLAN_BSSID_LEN); if (result) { pr_debug ("getconfig(0x%02x) failed, result = %d\n", @@ -1260,14 +1259,13 @@ void prism2sta_processing_defer(struct work_struct *data) HFA384x_RID_CURRENTSSID, result); return; } - prism2mgmt_bytestr2pstr( - (struct hfa384x_bytestr *)&ssid, - (struct p80211pstrd *)&wlandev->ssid); + prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *)&ssid, + (struct p80211pstrd *)&wlandev->ssid); /* Collect the port status */ result = hfa384x_drvr_getconfig16(hw, - HFA384x_RID_PORTSTATUS, - &portstatus); + HFA384x_RID_PORTSTATUS, + &portstatus); if (result) { pr_debug ("getconfig(0x%02x) failed, result = %d\n", @@ -1404,7 +1402,7 @@ void prism2sta_processing_defer(struct work_struct *data) &joinreq, HFA384x_RID_JOINREQUEST_LEN); netdev_info(wlandev->netdev, - "linkstatus=ASSOCFAIL (re-submitting join)\n"); + "linkstatus=ASSOCFAIL (re-submitting join)\n"); } else { netdev_info(wlandev->netdev, "linkstatus=ASSOCFAIL (unhandled)\n"); } @@ -1501,7 +1499,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev, if (i >= hw->authlist.cnt) { if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL) netdev_warn(wlandev->netdev, - "assocstatus info frame received for non-authenticated station.\n"); + "assocstatus info frame received for non-authenticated station.\n"); } else { hw->authlist.assoc[i] = (rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC || @@ -1509,7 +1507,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev, if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL) netdev_warn(wlandev->netdev, -"authfail assocstatus info frame received for authenticated station.\n"); + "authfail assocstatus info frame received for authenticated station.\n"); } } @@ -1674,9 +1672,8 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev, if (hw->authlist.cnt >= WLAN_AUTH_MAX) { rec.status = cpu_to_le16(P80211ENUM_status_ap_full); } else { - ether_addr_copy( - hw->authlist.addr[hw->authlist.cnt], - rec.address); + ether_addr_copy(hw->authlist.addr[hw->authlist.cnt], + rec.address); hw->authlist.cnt++; added = 1; } @@ -1697,8 +1694,8 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev, if (added) hw->authlist.cnt--; netdev_err(wlandev->netdev, - "setconfig(authenticatestation) failed, result=%d\n", - result); + "setconfig(authenticatestation) failed, result=%d\n", + result); } } @@ -1937,9 +1934,8 @@ void prism2sta_commsqual_defer(struct work_struct *data) /* It only makes sense to poll these in non-IBSS */ if (wlandev->macmode != WLAN_MACMODE_IBSS_STA) { - result = hfa384x_drvr_getconfig( - hw, HFA384x_RID_DBMCOMMSQUALITY, - &hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN); + result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DBMCOMMSQUALITY, + &hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN); if (result) { netdev_err(wlandev->netdev, "error fetching commsqual\n"); |