diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /net/wireless | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/reg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 3332d5bce317..ab801a1097b2 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -809,7 +809,7 @@ static void handle_channel(struct wiphy *wiphy, | |||
809 | if (r) { | 809 | if (r) { |
810 | /* | 810 | /* |
811 | * We will disable all channels that do not match our | 811 | * We will disable all channels that do not match our |
812 | * recieved regulatory rule unless the hint is coming | 812 | * received regulatory rule unless the hint is coming |
813 | * from a Country IE and the Country IE had no information | 813 | * from a Country IE and the Country IE had no information |
814 | * about a band. The IEEE 802.11 spec allows for an AP | 814 | * about a band. The IEEE 802.11 spec allows for an AP |
815 | * to send only a subset of the regulatory rules allowed, | 815 | * to send only a subset of the regulatory rules allowed, |
@@ -838,7 +838,7 @@ static void handle_channel(struct wiphy *wiphy, | |||
838 | request_wiphy && request_wiphy == wiphy && | 838 | request_wiphy && request_wiphy == wiphy && |
839 | request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) { | 839 | request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) { |
840 | /* | 840 | /* |
841 | * This gaurantees the driver's requested regulatory domain | 841 | * This guarantees the driver's requested regulatory domain |
842 | * will always be used as a base for further regulatory | 842 | * will always be used as a base for further regulatory |
843 | * settings | 843 | * settings |
844 | */ | 844 | */ |