Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings

7 files changed, 12 insertions, 12 deletions

diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 9317b61a75b..9276b1b2558 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -236,7 +236,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
                 goto err_mr;
         }
 
-        /* Configure wich ports to start according to module parameters */
+        /* Configure which ports to start according to module parameters */
         mdev->port_cnt = 0;
         mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
                 mdev->port_cnt++;
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 4f158baa024..77063f91c56 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -247,7 +247,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                                                priv->port);
                         if (err)
                                 en_err(priv, "Failed enabling "
-                                             "promiscous mode\n");
+                                             "promiscuous mode\n");
 
                         /* Disable port multicast filter (unconditionally) */
                         err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
@@ -276,7 +276,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
         }
 
         /*
-         * Not in promiscous mode
+         * Not in promiscuous mode
          */
 
         if (priv->flags & MLX4_EN_FLAG_PROMISC) {
@@ -292,14 +292,14 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                         err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
                                                           priv->port);
                 if (err)
-                        en_err(priv, "Failed disabling promiscous mode\n");
+                        en_err(priv, "Failed disabling promiscuous mode\n");
 
                 /* Disable Multicast promisc */
                 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
                         err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
                                                             priv->port);
                         if (err)
-                                en_err(priv, "Failed disabling multicast promiscous mode\n");
+                                en_err(priv, "Failed disabling multicast promiscuous mode\n");
                         priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
                 }
 
@@ -331,7 +331,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                         err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
                                                             priv->port);
                         if (err)
-                                en_err(priv, "Failed disabling multicast promiscous mode\n");
+                                en_err(priv, "Failed disabling multicast promiscuous mode\n");
                         priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
                 }
 
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 05998ee297c..cfd50bc4916 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -706,7 +706,7 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)
 }
 
 
-/* Calculate the last offset position that accomodates a full fragment
+/* Calculate the last offset position that accommodates a full fragment
  * (assuming fagment size = stride-align) */
 static int mlx4_en_last_alloc_offset(struct mlx4_en_priv *priv, u16 stride, u16 align)
 {
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/mlx4/en_selftest.c
index 9c91a92da70..191a8dcd8a9 100644
--- a/drivers/net/mlx4/en_selftest.c
+++ b/drivers/net/mlx4/en_selftest.c
@@ -149,7 +149,7 @@ void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf)
 
                 netif_carrier_off(dev);
 retry_tx:
-                /* Wait untill all tx queues are empty.
+                /* Wait until all tx queues are empty.
                  * there should not be any additional incoming traffic
                  * since we turned the carrier off */
                 msleep(200);
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 01feb8fd42a..b229acf1855 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -636,7 +636,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         if (unlikely(!real_size))
                 goto tx_drop;
 
-        /* Allign descriptor to TXBB size */
+        /* Align descriptor to TXBB size */
         desc_size = ALIGN(real_size, TXBB_SIZE);
         nr_txbb = desc_size / TXBB_SIZE;
         if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index c6d336aed2d..e63c37d6a11 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -222,7 +222,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
 
         /* the given qpn is listed as a promisc qpn
          * we need to add it as a duplicate to this entry
-         * for future refernce */
+         * for future references */
         list_for_each_entry(dqp, &entry->duplicates, list) {
                 if (qpn == dqp->qpn)
                         return 0; /* qp is already duplicated */
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index eca7d8596f8..8856659fb43 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -172,7 +172,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
                 }
 
                 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
-                        /* MAC already registered, increase refernce count */
+                        /* MAC already registered, increase references count */
                         ++table->refs[i];
                         goto out;
                 }
@@ -360,7 +360,7 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
                 if (table->refs[i] &&
                     (vlan == (MLX4_VLAN_MASK &
                               be32_to_cpu(table->entries[i])))) {
-                        /* Vlan already registered, increase refernce count */
+                        /* Vlan already registered, increase references count */
                         *index = i;
                         ++table->refs[i];
                         goto out;