Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325509
b: refs/heads/master
c: d34602d
h: refs/heads/master
i:
  325507: 49af9d8
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed Sep 26, 2012
1 parent e2165a5 commit 1082c59
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bd084bac93a440388a70f0d9dbddcb5cbad08aca
refs/heads/master: d34602de3ba29b3ceafe4e15e27a25c6a5bccc38
4 changes: 2 additions & 2 deletions trunk/drivers/staging/wlan-ng/cfg80211.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* cfg80211 Interface for prism2_usb module */


/* Prism2 channell/frequency/bitrate declarations */
/* Prism2 channel/frequency/bitrate declarations */
static const struct ieee80211_channel prism2_channels[] = {
{ .center_freq = 2412 },
{ .center_freq = 2417 },
Expand Down Expand Up @@ -502,7 +502,7 @@ int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
goto exit;
}

/* Set the authorisation */
/* Set the authorization */
if ((sme->auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM) ||
((sme->auth_type == NL80211_AUTHTYPE_AUTOMATIC) && !is_wep))
msg_join.authtype.data = P80211ENUM_authalg_opensystem;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlan-ng/p80211netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
/*----------------------------------------------------------------
* p80211knetdev_set_multicast_list
*
* Called from higher lavers whenever there's a need to set/clear
* Called from higher layers whenever there's a need to set/clear
* promiscuous mode or rewrite the multicast list.
*
* Arguments:
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlan-ng/p80211types.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
P80211DID_LSB_ACCESS)

/*----------------------------------------------------------------*/
/* The following structure types are used for the represenation */
/* The following structure types are used for the representation */
/* of ENUMint type metadata. */

typedef struct p80211enumpair {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlan-ng/prism2fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static int read_cardpda(struct pda *pda, wlandevice_t *wlandev)
*
* Note also that the start address record, originally an S7 record in
* the srec file, is expected in the fw file to be like a data record but
* with a certain address to make it identiable.
* with a certain address to make it identifiable.
*
* Here's the SREC format that the fw should have come from:
* S[37]nnaaaaaaaaddd...dddcc
Expand Down

0 comments on commit 1082c59

Please sign in to comment.