aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx4
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-30 21:57:33 -0400
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-31 10:26:23 -0400
commit25985edcedea6396277003854657b5f3cb31a628 (patch)
treef026e810210a2ee7290caeb737c23cb6472b7c38 /drivers/net/mlx4
parent6aba74f2791287ec407e0f92487a725a25908067 (diff)
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'drivers/net/mlx4')
-rw-r--r--drivers/net/mlx4/en_main.c2
-rw-r--r--drivers/net/mlx4/en_netdev.c10
-rw-r--r--drivers/net/mlx4/en_rx.c2
-rw-r--r--drivers/net/mlx4/en_selftest.c2
-rw-r--r--drivers/net/mlx4/en_tx.c2
-rw-r--r--drivers/net/mlx4/mcg.c2
-rw-r--r--drivers/net/mlx4/port.c4
7 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 9317b61a75b8..9276b1b25586 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)
236 goto err_mr; 236 goto err_mr;
237 } 237 }
238 238
239 /* Configure wich ports to start according to module parameters */ 239 /* Configure which ports to start according to module parameters */
240 mdev->port_cnt = 0; 240 mdev->port_cnt = 0;
241 mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) 241 mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
242 mdev->port_cnt++; 242 mdev->port_cnt++;
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 4f158baa0246..77063f91c564 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)
247 priv->port); 247 priv->port);
248 if (err) 248 if (err)
249 en_err(priv, "Failed enabling " 249 en_err(priv, "Failed enabling "
250 "promiscous mode\n"); 250 "promiscuous mode\n");
251 251
252 /* Disable port multicast filter (unconditionally) */ 252 /* Disable port multicast filter (unconditionally) */
253 err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 253 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)
276 } 276 }
277 277
278 /* 278 /*
279 * Not in promiscous mode 279 * Not in promiscuous mode
280 */ 280 */
281 281
282 if (priv->flags & MLX4_EN_FLAG_PROMISC) { 282 if (priv->flags & MLX4_EN_FLAG_PROMISC) {
@@ -292,14 +292,14 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
292 err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn, 292 err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
293 priv->port); 293 priv->port);
294 if (err) 294 if (err)
295 en_err(priv, "Failed disabling promiscous mode\n"); 295 en_err(priv, "Failed disabling promiscuous mode\n");
296 296
297 /* Disable Multicast promisc */ 297 /* Disable Multicast promisc */
298 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) { 298 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
299 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn, 299 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
300 priv->port); 300 priv->port);
301 if (err) 301 if (err)
302 en_err(priv, "Failed disabling multicast promiscous mode\n"); 302 en_err(priv, "Failed disabling multicast promiscuous mode\n");
303 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC; 303 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
304 } 304 }
305 305
@@ -331,7 +331,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
331 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn, 331 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
332 priv->port); 332 priv->port);
333 if (err) 333 if (err)
334 en_err(priv, "Failed disabling multicast promiscous mode\n"); 334 en_err(priv, "Failed disabling multicast promiscuous mode\n");
335 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC; 335 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
336 } 336 }
337 337
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 05998ee297c9..cfd50bc49169 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)
706} 706}
707 707
708 708
709/* Calculate the last offset position that accomodates a full fragment 709/* Calculate the last offset position that accommodates a full fragment
710 * (assuming fagment size = stride-align) */ 710 * (assuming fagment size = stride-align) */
711static int mlx4_en_last_alloc_offset(struct mlx4_en_priv *priv, u16 stride, u16 align) 711static int mlx4_en_last_alloc_offset(struct mlx4_en_priv *priv, u16 stride, u16 align)
712{ 712{
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/mlx4/en_selftest.c
index 9c91a92da705..191a8dcd8a93 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)
149 149
150 netif_carrier_off(dev); 150 netif_carrier_off(dev);
151retry_tx: 151retry_tx:
152 /* Wait untill all tx queues are empty. 152 /* Wait until all tx queues are empty.
153 * there should not be any additional incoming traffic 153 * there should not be any additional incoming traffic
154 * since we turned the carrier off */ 154 * since we turned the carrier off */
155 msleep(200); 155 msleep(200);
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 01feb8fd42ad..b229acf1855f 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)
636 if (unlikely(!real_size)) 636 if (unlikely(!real_size))
637 goto tx_drop; 637 goto tx_drop;
638 638
639 /* Allign descriptor to TXBB size */ 639 /* Align descriptor to TXBB size */
640 desc_size = ALIGN(real_size, TXBB_SIZE); 640 desc_size = ALIGN(real_size, TXBB_SIZE);
641 nr_txbb = desc_size / TXBB_SIZE; 641 nr_txbb = desc_size / TXBB_SIZE;
642 if (unlikely(nr_txbb > MAX_DESC_TXBBS)) { 642 if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index e71372aa9cc4..279521aed826 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,
222 222
223 /* the given qpn is listed as a promisc qpn 223 /* the given qpn is listed as a promisc qpn
224 * we need to add it as a duplicate to this entry 224 * we need to add it as a duplicate to this entry
225 * for future refernce */ 225 * for future references */
226 list_for_each_entry(dqp, &entry->duplicates, list) { 226 list_for_each_entry(dqp, &entry->duplicates, list) {
227 if (qpn == dqp->qpn) 227 if (qpn == dqp->qpn)
228 return 0; /* qp is already duplicated */ 228 return 0; /* qp is already duplicated */
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index eca7d8596f87..8856659fb43c 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)
172 } 172 }
173 173
174 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) { 174 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
175 /* MAC already registered, increase refernce count */ 175 /* MAC already registered, increase references count */
176 ++table->refs[i]; 176 ++table->refs[i];
177 goto out; 177 goto out;
178 } 178 }
@@ -360,7 +360,7 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
360 if (table->refs[i] && 360 if (table->refs[i] &&
361 (vlan == (MLX4_VLAN_MASK & 361 (vlan == (MLX4_VLAN_MASK &
362 be32_to_cpu(table->entries[i])))) { 362 be32_to_cpu(table->entries[i])))) {
363 /* Vlan already registered, increase refernce count */ 363 /* Vlan already registered, increase references count */
364 *index = i; 364 *index = i;
365 ++table->refs[i]; 365 ++table->refs[i];
366 goto out; 366 goto out;