aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
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/ethernet
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/ethernet')
-rw-r--r--drivers/net/ethernet/8390/ax88796.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c2
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_ethtool.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/eq.c2
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c2
-rw-r--r--drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 0338352bc036..70dba5d01ad3 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -109,7 +109,7 @@ static inline struct ax_device *to_ax_dev(struct net_device *dev)
109/* 109/*
110 * ax_initial_check 110 * ax_initial_check
111 * 111 *
112 * do an initial probe for the card to check wether it exists 112 * do an initial probe for the card to check whether it exists
113 * and is functional 113 * and is functional
114 */ 114 */
115static int ax_initial_check(struct net_device *dev) 115static int ax_initial_check(struct net_device *dev)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index b8b4b749daab..09b625e0fdaa 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -4318,7 +4318,7 @@ static int bnx2x_queue_comp_cmd(struct bnx2x *bp,
4318 4318
4319 if (o->next_tx_only >= o->max_cos) 4319 if (o->next_tx_only >= o->max_cos)
4320 /* >= becuase tx only must always be smaller than cos since the 4320 /* >= becuase tx only must always be smaller than cos since the
4321 * primary connection suports COS 0 4321 * primary connection supports COS 0
4322 */ 4322 */
4323 BNX2X_ERR("illegal value for next tx_only: %d. max cos was %d", 4323 BNX2X_ERR("illegal value for next tx_only: %d. max cos was %d",
4324 o->next_tx_only, o->max_cos); 4324 o->next_tx_only, o->max_cos);
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 9089d00f1421..14e30515f6aa 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -1671,7 +1671,7 @@ static void e1000_get_wol(struct net_device *netdev,
1671 /* apply any specific unsupported masks here */ 1671 /* apply any specific unsupported masks here */
1672 switch (hw->device_id) { 1672 switch (hw->device_id) {
1673 case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: 1673 case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
1674 /* KSP3 does not suppport UCAST wake-ups */ 1674 /* KSP3 does not support UCAST wake-ups */
1675 wol->supported &= ~WAKE_UCAST; 1675 wol->supported &= ~WAKE_UCAST;
1676 1676
1677 if (adapter->wol & E1000_WUFC_EX) 1677 if (adapter->wol & E1000_WUFC_EX)
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index b84a88bc44dc..c48cf6f6529c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -1267,7 +1267,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
1267 /* Temporary use polling for command completions */ 1267 /* Temporary use polling for command completions */
1268 mlx4_cmd_use_polling(dev); 1268 mlx4_cmd_use_polling(dev);
1269 1269
1270 /* Map the new eq to handle all asyncronous events */ 1270 /* Map the new eq to handle all asynchronous events */
1271 err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0, 1271 err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0,
1272 priv->eq_table.eq[i].eqn); 1272 priv->eq_table.eq[i].eqn);
1273 if (err) { 1273 if (err) {
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 093d594435e1..83f0ea929d3d 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -6769,7 +6769,7 @@ static int stp;
6769/* 6769/*
6770 * This enables fast aging in the KSZ8842 switch. Not sure what situation 6770 * This enables fast aging in the KSZ8842 switch. Not sure what situation
6771 * needs that. However, fast aging is used to flush the dynamic MAC table when 6771 * needs that. However, fast aging is used to flush the dynamic MAC table when
6772 * STP suport is enabled. 6772 * STP support is enabled.
6773 */ 6773 */
6774static int fast_aging; 6774static int fast_aging;
6775 6775
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
index 7ec4b864a550..75ec5e7cf50d 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
@@ -27,7 +27,7 @@ struct mcp_gen_header {
27 * 27 *
28 * Fields below this comment are extensions added in later versions 28 * Fields below this comment are extensions added in later versions
29 * of this struct, drivers should compare the header_length against 29 * of this struct, drivers should compare the header_length against
30 * offsetof(field) to check wether a given MCP implements them. 30 * offsetof(field) to check whether a given MCP implements them.
31 * 31 *
32 * Never remove any field. Keep everything naturally align. 32 * Never remove any field. Keep everything naturally align.
33 */ 33 */