diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bonding.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/8390/ax88796.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/eq.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ksz884x.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h | 2 | ||||
-rw-r--r-- | drivers/net/sungem_phy.c | 8 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/debugfs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/atmel.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 2 |
12 files changed, 15 insertions, 14 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 6dded569b111..21b68e5c14fd 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -245,7 +245,7 @@ struct bonding { | |||
245 | struct delayed_work ad_work; | 245 | struct delayed_work ad_work; |
246 | struct delayed_work mcast_work; | 246 | struct delayed_work mcast_work; |
247 | #ifdef CONFIG_DEBUG_FS | 247 | #ifdef CONFIG_DEBUG_FS |
248 | /* debugging suport via debugfs */ | 248 | /* debugging support via debugfs */ |
249 | struct dentry *debug_dir; | 249 | struct dentry *debug_dir; |
250 | #endif /* CONFIG_DEBUG_FS */ | 250 | #endif /* CONFIG_DEBUG_FS */ |
251 | }; | 251 | }; |
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 | */ |
115 | static int ax_initial_check(struct net_device *dev) | 115 | static 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 | */ |
6774 | static int fast_aging; | 6774 | static 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 | */ |
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 58f13adaa549..ae7cd7f3656d 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
@@ -608,7 +608,7 @@ static int bcm5421_poll_link(struct mii_phy* phy) | |||
608 | if ( mode == BCM54XX_COPPER) | 608 | if ( mode == BCM54XX_COPPER) |
609 | return genmii_poll_link(phy); | 609 | return genmii_poll_link(phy); |
610 | 610 | ||
611 | /* try to find out wether we have a link */ | 611 | /* try to find out whether we have a link */ |
612 | phy_write(phy, MII_NCONFIG, 0x2000); | 612 | phy_write(phy, MII_NCONFIG, 0x2000); |
613 | phy_reg = phy_read(phy, MII_NCONFIG); | 613 | phy_reg = phy_read(phy, MII_NCONFIG); |
614 | 614 | ||
@@ -634,7 +634,7 @@ static int bcm5421_read_link(struct mii_phy* phy) | |||
634 | 634 | ||
635 | phy->speed = SPEED_1000; | 635 | phy->speed = SPEED_1000; |
636 | 636 | ||
637 | /* find out wether we are running half- or full duplex */ | 637 | /* find out whether we are running half- or full duplex */ |
638 | phy_write(phy, MII_NCONFIG, 0x2000); | 638 | phy_write(phy, MII_NCONFIG, 0x2000); |
639 | phy_reg = phy_read(phy, MII_NCONFIG); | 639 | phy_reg = phy_read(phy, MII_NCONFIG); |
640 | 640 | ||
@@ -681,7 +681,7 @@ static int bcm5461_poll_link(struct mii_phy* phy) | |||
681 | if ( mode == BCM54XX_COPPER) | 681 | if ( mode == BCM54XX_COPPER) |
682 | return genmii_poll_link(phy); | 682 | return genmii_poll_link(phy); |
683 | 683 | ||
684 | /* find out wether we have a link */ | 684 | /* find out whether we have a link */ |
685 | phy_write(phy, MII_NCONFIG, 0x7000); | 685 | phy_write(phy, MII_NCONFIG, 0x7000); |
686 | phy_reg = phy_read(phy, MII_NCONFIG); | 686 | phy_reg = phy_read(phy, MII_NCONFIG); |
687 | 687 | ||
@@ -710,7 +710,7 @@ static int bcm5461_read_link(struct mii_phy* phy) | |||
710 | 710 | ||
711 | phy->speed = SPEED_1000; | 711 | phy->speed = SPEED_1000; |
712 | 712 | ||
713 | /* find out wether we are running half- or full duplex */ | 713 | /* find out whether we are running half- or full duplex */ |
714 | phy_write(phy, MII_NCONFIG, 0x7000); | 714 | phy_write(phy, MII_NCONFIG, 0x7000); |
715 | phy_reg = phy_read(phy, MII_NCONFIG); | 715 | phy_reg = phy_read(phy, MII_NCONFIG); |
716 | 716 | ||
diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c index 4b66ab1d0e5c..6702da838b0e 100644 --- a/drivers/net/wimax/i2400m/debugfs.c +++ b/drivers/net/wimax/i2400m/debugfs.c | |||
@@ -209,6 +209,7 @@ int debugfs_i2400m_reset_set(void *data, u64 val) | |||
209 | result = i2400m_reset(i2400m, rt); | 209 | result = i2400m_reset(i2400m, rt); |
210 | if (result >= 0) | 210 | if (result >= 0) |
211 | result = 0; | 211 | result = 0; |
212 | break; | ||
212 | default: | 213 | default: |
213 | result = -EINVAL; | 214 | result = -EINVAL; |
214 | } | 215 | } |
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); |