diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-15 11:30:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-15 11:30:39 -0800 |
commit | 46f7b635569731ff81a3b72d1bcd4415b293b637 (patch) | |
tree | e97e5e28d1768bb281116d92292851758ea20024 /drivers/staging/wlan-ng | |
parent | 9682ec9692e5ac11c6caebd079324e727b19e7ce (diff) | |
parent | 533e80b1ea709577ec5cf73b8b566569bc711259 (diff) |
Merge tag 'staging-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging drivers patches from Greg KH:
"Here's the big staging driver tree update for 3.20-rc1.
Lots of little things in here, adding up to lots of overall cleanups.
The IIO driver updates are also in here as they cross the staging tree
boundry a lot. I2O has moved into staging as well, as a plan to drop
it from the tree eventually as that's a dead subsystem.
All of this has been in linux-next with no reported issues for a
while"
* tag 'staging-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (740 commits)
staging: lustre: lustre: libcfs: define symbols as static
staging: rtl8712: Do coding style cleanup
staging: lustre: make obd_updatemax_lock static
staging: rtl8188eu: core: switch with redundant cases
staging: rtl8188eu: odm: conditional setting with no effect
staging: rtl8188eu: odm: condition with no effect
staging: ft1000: fix braces warning
staging: sm7xxfb: fix remaining CamelCase
staging: sm7xxfb: fix CamelCase
staging: rtl8723au: multiple condition with no effect - if identical to else
staging: sm7xxfb: make smtc_scr_info static
staging/lustre/mdc: Initialize req in mdc_enqueue for !it case
staging/lustre/clio: Do not allow group locks with gid 0
staging/lustre/llite: don't add to page cache upon failure
staging/lustre/llite: Add exception entry check after radix_tree
staging/lustre/libcfs: protect kkuc_groups from write access
staging/lustre/fld: refer to MDT0 for fld lookup in some cases
staging/lustre/llite: Solve a race to access lli_has_smd in read case
staging/lustre/ptlrpc: hold rq_lock when modify rq_flags
staging/lustre/lnet: portal spreading rotor should be unsigned
...
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 6 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 17 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211req.c | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2mgmt.h | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 4 |
6 files changed, 16 insertions, 17 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 20d146b61ba7..8f2091070491 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -879,7 +879,7 @@ typedef struct hfa384x_usb_error { /* Unions for packaging all the known packet types together */ typedef union hfa384x_usbout { - u16 type; + __le16 type; hfa384x_usb_txfrm_t txfrm; hfa384x_usb_cmdreq_t cmdreq; hfa384x_usb_wridreq_t wridreq; @@ -889,7 +889,7 @@ typedef union hfa384x_usbout { } __packed hfa384x_usbout_t; typedef union hfa384x_usbin { - u16 type; + __le16 type; hfa384x_usb_rxfrm_t rxfrm; hfa384x_usb_txfrm_t txfrm; hfa384x_usb_infofrm_t infofrm; @@ -1268,7 +1268,7 @@ typedef struct hfa384x { hfa384x_downloadbuffer_t bufinfo; u16 dltimeout; - int scanflag; /* to signal scan comlete */ + int scanflag; /* to signal scan complete */ int join_ap; /* are we joined to a specific ap */ int join_retries; /* number of join retries till we fail */ hfa384x_JoinRequest_data_t joinreq; /* join request saved data */ diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 55d2f563e308..28cd1c4c02c8 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -382,7 +382,7 @@ done: * * Arguments: * hw device struct -* tx_urb URB of data for tranmission +* tx_urb URB of data for transmission * memflags memory allocation flags * * Returns: @@ -2391,7 +2391,7 @@ int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len) * 0 success * >0 f/w reported error - f/w status code * <0 driver reported error -* -ETIMEDOUT timout waiting for the cmd regs to become +* -ETIMEDOUT timeout waiting for the cmd regs to become * available, or waiting for the control reg * to indicate the Aux port is enabled. * -ENODATA the buffer does NOT contain a valid PDA. @@ -3346,7 +3346,7 @@ retry: if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0) run_queue = 1; } else { - const u16 intype = (usbin->type & ~cpu_to_le16(0x8000)); + const __le16 intype = (usbin->type & ~cpu_to_le16(0x8000)); /* * Check that our message is what we're expecting ... @@ -4123,12 +4123,11 @@ static int hfa384x_isgood_pdrcode(u16 pdrcode) pr_debug("Encountered unknown PDR#=0x%04x, assuming it's ok.\n", pdrcode); return 1; - } else { - /* bad code */ - pr_debug("Encountered unknown PDR#=0x%04x, (>=0x1000), assuming it's bad.\n", - pdrcode); - return 0; } + break; } - return 0; /* avoid compiler warnings */ + /* bad code */ + pr_debug("Encountered unknown PDR#=0x%04x, (>=0x1000), assuming it's bad.\n", + pdrcode); + return 0; } diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index 7eaaf9a63503..bd69e8cf200f 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -511,7 +511,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, * protocol. * * Arguments: -* proto protocl number (in host order) to search for. +* proto protocol number (in host order) to search for. * * Returns: * 1 - if the table is empty or a match is found. diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c index 7221379c9742..4b84b568f6ca 100644 --- a/drivers/staging/wlan-ng/p80211req.c +++ b/drivers/staging/wlan-ng/p80211req.c @@ -80,7 +80,7 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev, /*---------------------------------------------------------------- * p80211req_dorequest * -* Handles an MLME reqest/confirm message. +* Handles an MLME request/confirm message. * * Arguments: * wlandev WLAN device struct diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h index b62fdcba94e6..16f123959104 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.h +++ b/drivers/staging/wlan-ng/prism2mgmt.h @@ -45,7 +45,7 @@ * -------------------------------------------------------------------- * * This file contains the constants and data structures for interaction -* with the hfa384x Wireless LAN (WLAN) Media Access Contoller (MAC). +* with the hfa384x Wireless LAN (WLAN) Media Access Controller (MAC). * The hfa384x is a portion of the Harris PRISM(tm) WLAN chipset. * * [Implementation and usage notes] diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index df577dfe7ffb..10ad24a89ddd 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -199,7 +199,7 @@ static int prism2sta_close(wlandevice_t *wlandev) /*---------------------------------------------------------------- * prism2sta_reset * -* Not currently implented. +* Currently not implemented. * * Arguments: * wlandev wlan device structure @@ -662,7 +662,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) "ident: ap f/w: id=0x%02x %d.%d.%d\n", hw->ident_sta_fw.id, hw->ident_sta_fw.major, hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); - netdev_err(wlandev->netdev, "Unsupported Tertiary AP firmeare loaded!\n"); + netdev_err(wlandev->netdev, "Unsupported Tertiary AP firmware loaded!\n"); goto failed; } |