diff options
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cmd.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/via/via-velocity.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 02a2e90d581a..923c4878461e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c | |||
@@ -1695,7 +1695,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) | |||
1695 | if (err) { | 1695 | if (err) { |
1696 | vp_oper->vlan_idx = NO_INDX; | 1696 | vp_oper->vlan_idx = NO_INDX; |
1697 | mlx4_warn(&priv->dev, | 1697 | mlx4_warn(&priv->dev, |
1698 | "No vlan resorces slave %d, port %d\n", | 1698 | "No vlan resources slave %d, port %d\n", |
1699 | slave, port); | 1699 | slave, port); |
1700 | return err; | 1700 | return err; |
1701 | } | 1701 | } |
@@ -1711,7 +1711,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) | |||
1711 | err = vp_oper->mac_idx; | 1711 | err = vp_oper->mac_idx; |
1712 | vp_oper->mac_idx = NO_INDX; | 1712 | vp_oper->mac_idx = NO_INDX; |
1713 | mlx4_warn(&priv->dev, | 1713 | mlx4_warn(&priv->dev, |
1714 | "No mac resorces slave %d, port %d\n", | 1714 | "No mac resources slave %d, port %d\n", |
1715 | slave, port); | 1715 | slave, port); |
1716 | return err; | 1716 | return err; |
1717 | } | 1717 | } |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index db4280ce9c09..716fc37ada5a 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | |||
@@ -922,7 +922,7 @@ int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd) | |||
922 | 922 | ||
923 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 923 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
924 | if (rv != 0) { | 924 | if (rv != 0) { |
925 | printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n", | 925 | printk(KERN_ERR "%s: could not notify %s IP 0x%x request\n", |
926 | adapter->netdev->name, | 926 | adapter->netdev->name, |
927 | (cmd == NX_IP_UP) ? "Add" : "Remove", ip); | 927 | (cmd == NX_IP_UP) ? "Add" : "Remove", ip); |
928 | } | 928 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 851cb4a80d50..03cd4c3d7835 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | |||
@@ -941,7 +941,7 @@ void qlcnic_82xx_config_ipaddr(struct qlcnic_adapter *adapter, | |||
941 | rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 941 | rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
942 | if (rv != 0) | 942 | if (rv != 0) |
943 | dev_err(&adapter->netdev->dev, | 943 | dev_err(&adapter->netdev->dev, |
944 | "could not notify %s IP 0x%x reuqest\n", | 944 | "could not notify %s IP 0x%x request\n", |
945 | (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); | 945 | (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); |
946 | } | 946 | } |
947 | 947 | ||
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index f5fbc12d3e10..a43e8492b1ce 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c | |||
@@ -2056,7 +2056,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) | |||
2056 | struct sk_buff *skb; | 2056 | struct sk_buff *skb; |
2057 | 2057 | ||
2058 | if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { | 2058 | if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { |
2059 | VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame span multple RDs.\n", vptr->netdev->name); | 2059 | VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame spans multiple RDs.\n", vptr->netdev->name); |
2060 | stats->rx_length_errors++; | 2060 | stats->rx_length_errors++; |
2061 | return -EINVAL; | 2061 | return -EINVAL; |
2062 | } | 2062 | } |