diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 20d146b61ba7..5b7b4081e2c9 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -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 de33a07904f2..2245339eb6a2 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. 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..182cc7f0b230 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -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; }