diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /drivers/net/wireless | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ap.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 9cadaa296fa..dbb986946e1 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
| @@ -1224,7 +1224,7 @@ static void ap_crypt_init(struct ap_data *ap) | |||
| 1224 | 1224 | ||
| 1225 | 1225 | ||
| 1226 | /* Generate challenge data for shared key authentication. IEEE 802.11 specifies | 1226 | /* Generate challenge data for shared key authentication. IEEE 802.11 specifies |
| 1227 | * that WEP algorithm is used for generating challange. This should be unique, | 1227 | * that WEP algorithm is used for generating challenge. This should be unique, |
| 1228 | * but otherwise there is not really need for randomness etc. Initialize WEP | 1228 | * but otherwise there is not really need for randomness etc. Initialize WEP |
| 1229 | * with pseudo random key and then use increasing IV to get unique challenge | 1229 | * with pseudo random key and then use increasing IV to get unique challenge |
| 1230 | * streams. | 1230 | * streams. |
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 2f999fc94f6..e9d9d622a9b 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
| @@ -1896,7 +1896,7 @@ fail: | |||
| 1896 | /* Some SMP systems have reported number of odd errors with hostap_pci. fid | 1896 | /* Some SMP systems have reported number of odd errors with hostap_pci. fid |
| 1897 | * register has changed values between consecutive reads for an unknown reason. | 1897 | * register has changed values between consecutive reads for an unknown reason. |
| 1898 | * This should really not happen, so more debugging is needed. This test | 1898 | * This should really not happen, so more debugging is needed. This test |
| 1899 | * version is a big slower, but it will detect most of such register changes | 1899 | * version is a bit slower, but it will detect most of such register changes |
| 1900 | * and will try to get the correct fid eventually. */ | 1900 | * and will try to get the correct fid eventually. */ |
| 1901 | #define EXTRA_FID_READ_TESTS | 1901 | #define EXTRA_FID_READ_TESTS |
| 1902 | 1902 | ||