aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
commita2013a13e68354e0c8f3696b69701803e13fb737 (patch)
treea7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/net/wireless
parentdadfab4873256d2145640c0ce468fcbfb48977fe (diff)
parent106f9d9337f65bd428c0c79f650e3489e458d771 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina: "Usual stuff -- comment/printk typo fixes, documentation updates, dead code elimination." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) HOWTO: fix double words typo x86 mtrr: fix comment typo in mtrr_bp_init propagate name change to comments in kernel source doc: Update the name of profiling based on sysfs treewide: Fix typos in various drivers treewide: Fix typos in various Kconfig wireless: mwifiex: Fix typo in wireless/mwifiex driver messages: i2o: Fix typo in messages/i2o scripts/kernel-doc: check that non-void fcts describe their return value Kernel-doc: Convention: Use a "Return" section to describe return values radeon: Fix typo and copy/paste error in comments doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c various: Fix spelling of "asynchronous" in comments. Fix misspellings of "whether" in comments. eisa: Fix spelling of "asynchronous". various: Fix spelling of "registered" in comments. doc: fix quite a few typos within Documentation target: iscsi: fix comment typos in target/iscsi drivers treewide: fix typo of "suport" in various comments and Kconfig treewide: fix typo of "suppport" in various comments ...
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/atmel.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.h2
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 4a4e98f71807..4374079dfc2a 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2963,7 +2963,7 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
2963 ssid_el_p[1] = priv->SSID_size; 2963 ssid_el_p[1] = priv->SSID_size;
2964 memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size); 2964 memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size);
2965 ssid_el_p[2 + priv->SSID_size] = WLAN_EID_SUPP_RATES; 2965 ssid_el_p[2 + priv->SSID_size] = WLAN_EID_SUPP_RATES;
2966 ssid_el_p[3 + priv->SSID_size] = 4; /* len of suported rates */ 2966 ssid_el_p[3 + priv->SSID_size] = 4; /* len of supported rates */
2967 memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4); 2967 memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4);
2968 2968
2969 atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize); 2969 atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize);
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index 973125242490..5fe17cbab1f3 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -1045,7 +1045,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
1045 IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP 1045 IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP
1046 IPW_ORD_POWER_MGMT_INDEX, //NS // 1046 IPW_ORD_POWER_MGMT_INDEX, //NS //
1047 IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon 1047 IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon
1048 IPW_ORD_COUNTRY_CHANNELS, // channels suported by country 1048 IPW_ORD_COUNTRY_CHANNELS, // channels supported by country
1049// IPW_ORD_COUNTRY_CHANNELS: 1049// IPW_ORD_COUNTRY_CHANNELS:
1050// For 11b the lower 2-byte are used for channels from 1-14 1050// For 11b the lower 2-byte are used for channels from 1-14
1051// and the higher 2-byte are not used. 1051// and the higher 2-byte are not used.
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index ff306d763e37..71ab320fae82 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1155,7 +1155,7 @@ int zd_chip_init_hw(struct zd_chip *chip)
1155 if (r) 1155 if (r)
1156 goto out; 1156 goto out;
1157 /* Currently we support IEEE 802.11g for full and high speed USB. 1157 /* Currently we support IEEE 802.11g for full and high speed USB.
1158 * It might be discussed, whether we should suppport pure b mode for 1158 * It might be discussed, whether we should support pure b mode for
1159 * full speed USB. 1159 * full speed USB.
1160 */ 1160 */
1161 r = set_mandatory_rates(chip, 1); 1161 r = set_mandatory_rates(chip, 1);