Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

61 files changed, 91 insertions, 86 deletions

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index ea6b139b812..1663bc9e45d 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -19,7 +19,7 @@
    TBD:
    * look at deferring rx frames rather than discarding (as per tulip)
    * handle tx ring full as per tulip
-   * performace test to tune rx_copybreak
+   * performance test to tune rx_copybreak
 
    Most of my modifications relate to the braindead big-endian
    implementation by Intel.  When the i596 is operating in
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 4e6359fff0e..766aabfdfc7 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1633,8 +1633,13 @@ static int amd8111e_enable_link_change(struct amd8111e_priv* lp)
         readl(lp->mmio + CMD7);
         return 0;
 }
-/* This function is called when a packet transmission fails to complete within a  resonable period, on the assumption that an interrupts have been failed or the  interface is locked up. This function will reinitialize the hardware */
 
+/*
+ * This function is called when a packet transmission fails to complete
+ * within a reasonable period, on the assumption that an interrupt have
+ * failed or the interface is locked up. This function will reinitialize
+ * the hardware.
+ */
 static void amd8111e_tx_timeout(struct net_device *dev)
 {
         struct amd8111e_priv* lp = netdev_priv(dev);
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index b5dc7f55072..9d828aed968 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -120,7 +120,7 @@ static int irq = 5;		/* Default IRQ */
  *      DAYNA driver mode:
  *              Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, 
  *              Farallon PhoneNET PC III, Farallon PhoneNET PC II
- *      Other cards possibly supported mode unkown though:
+ *      Other cards possibly supported mode unknown though:
  *              Dayna DL2000 (Full length), COPS LT/M (Micro-Channel)
  *
  *      Cards NOT supported by this driver but supported by the ltpc.c
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h
index bb613f292e0..727be5cdd1e 100644
--- a/drivers/net/ariadne.h
+++ b/drivers/net/ariadne.h
@@ -244,7 +244,7 @@ struct Am79C960 {
 #define DLNKTST         0x0010  /* Disable Link Status */
 #define DAPC            0x0008  /* Disable Automatic Polarity Correction */
 #define MENDECL         0x0004  /* MENDEC Loopback Mode */
-#define LRTTSEL         0x0002  /* Low Receive Treshold/Transmit Mode Select */
+#define LRTTSEL         0x0002  /* Low Receive Threshold/Transmit Mode Select */
 #define PORTSEL1        0x0001  /* Port Select Bits */
 #define PORTSEL2        0x8000  /* Port Select Bits */
 #define INTL            0x4000  /* Internal Loopback */
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 1372e9a99f5..96506eacc13 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -1543,7 +1543,7 @@ static irqreturn_t atl1c_intr(int irq, void *data)
                 if (status & ISR_OVER)
                         if (netif_msg_intr(adapter))
                                 dev_warn(&pdev->dev,
-                                        "TX/RX over flow (status = 0x%x)\n",
+                                        "TX/RX overflow (status = 0x%x)\n",
                                         status & ISR_OVER);
 
                 /* link event */
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index e5f9676cf1b..21f40779f52 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -435,7 +435,7 @@ enum be_if_flags {
  * filtering capabilities. */
 struct be_cmd_req_if_create {
         struct be_cmd_req_hdr hdr;
-        u32 version;            /* ignore currntly */
+        u32 version;            /* ignore currently */
         u32 capability_flags;
         u32 enable_flags;
         u8 mac_addr[ETH_ALEN];
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 876b357101f..c3a7db326c9 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1877,7 +1877,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *func)
                 goto fw_exit;
         }
 
-        dev_info(&adapter->pdev->dev, "Firmware flashed succesfully\n");
+        dev_info(&adapter->pdev->dev, "Firmware flashed successfully\n");
 
 fw_exit:
         release_firmware(fw);
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h
index aa76cbada5e..732eafdeb0f 100644
--- a/drivers/net/bnx2x_reg.h
+++ b/drivers/net/bnx2x_reg.h
@@ -2536,7 +2536,7 @@
 /* [RC 1] A flag to indicate that overflow error occurred in one of the
    queues. */
 #define QM_REG_OVFERROR                                          0x16805c
-/* [RC 7] the Q were the qverflow occurs */
+/* [RC 7] the Q where the overflow occurs */
 #define QM_REG_OVFQNUM                                           0x168058
 /* [R 16] Pause state for physical queues 15-0 */
 #define QM_REG_PAUSESTATE0                                       0x168410
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 9b5936f072d..a1e7eb92bbf 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -559,7 +559,7 @@ static void rlb_update_rx_clients(struct bonding *bond)
                 }
         }
 
-        /* do not update the entries again untill this counter is zero so that
+        /* do not update the entries again until this counter is zero so that
          * not to confuse the clients.
          */
         bond_info->rlb_update_delay_counter = RLB_UPDATE_DELAY;
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 6366061712f..b8d92c6f3dd 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1285,7 +1285,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /*
          * We do not use Tx completion interrupts to free DMAd Tx packets.
-         * This is good for performamce but means that we rely on new Tx
+         * This is good for performance but means that we rely on new Tx
          * packets arriving to run the destructors of completed packets,
          * which open up space in their sockets' send queues.  Sometimes
          * we do not get such new packets causing Tx to stall.  A single
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index d7688522336..75b099ce49c 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -118,7 +118,7 @@ doit:
         ret = ehea_set_portspeed(port, sp);
 
         if (!ret)
-                ehea_info("%s: Port speed succesfully set: %dMbps "
+                ehea_info("%s: Port speed successfully set: %dMbps "
                           "%s Duplex",
                           port->netdev->name, port->port_speed,
                           port->full_duplex == 1 ? "Full" : "Half");
@@ -134,7 +134,7 @@ static int ehea_nway_reset(struct net_device *dev)
         ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);
 
         if (!ret)
-                ehea_info("%s: Port speed succesfully set: %dMbps "
+                ehea_info("%s: Port speed successfully set: %dMbps "
                           "%s Duplex",
                           port->netdev->name, port->port_speed,
                           port->full_duplex == 1 ? "Full" : "Half");
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index ed60fd66427..0cab992b3d1 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -35,7 +35,7 @@
  *          driver only supports standard serial hardware (8250, 16450, 16550A)
  *
  *          This modem usually draws its supply current out of the otherwise unused
- *          TXD pin of the serial port. Thus a contignuous stream of 0x00-bytes
+ *          TXD pin of the serial port. Thus a contiguous stream of 0x00-bytes
  *          is transmitted to achieve a positive supply voltage.
  *
  *  hsk:    This is a 4800 baud FSK modem, designed for TNC use. It works fine
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 1e8dd8c74a6..8f7d0d146f2 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -115,7 +115,7 @@ struct smsc_ircc_subsystem_configuration {
         unsigned short vendor; /* PCI vendor ID */
         unsigned short device; /* PCI vendor ID */
         unsigned short subvendor; /* PCI subsystem vendor ID */
-        unsigned short subdevice; /* PCI sybsystem device ID */
+        unsigned short subdevice; /* PCI subsystem device ID */
         unsigned short sir_io; /* I/O port for SIR */
         unsigned short fir_io; /* I/O port for FIR */
         unsigned char  fir_irq; /* FIR IRQ */
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index aa7286bc436..8739ba850f8 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1384,7 +1384,7 @@ static inline void veth_build_dma_list(struct dma_chunk *list,
         unsigned long done;
         int i = 1;
 
-        /* FIXME: skbs are continguous in real addresses.  Do we
+        /* FIXME: skbs are contiguous in real addresses.  Do we
          * really need to break it into PAGE_SIZE chunks, or can we do
          * it just at the granularity of iSeries real->absolute
          * mapping?  Indeed, given the way the allocator works, can we
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index a0c578585a5..b77238dbafb 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -47,7 +47,7 @@
    TBD:
    * look at deferring rx frames rather than discarding (as per tulip)
    * handle tx ring full as per tulip
-   * performace test to tune rx_copybreak
+   * performance test to tune rx_copybreak
 
    Most of my modifications relate to the braindead big-endian
    implementation by Intel.  When the i596 is operating in
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index 51e11c3e53e..c0dbfc185b5 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -47,7 +47,7 @@
    TBD:
    * look at deferring rx frames rather than discarding (as per tulip)
    * handle tx ring full as per tulip
-   * performace test to tune rx_copybreak
+   * performance test to tune rx_copybreak
 
    Most of my modifications relate to the braindead big-endian
    implementation by Intel.  When the i596 is operating in
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 03b781a7a18..829b9ec9ff6 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -204,7 +204,7 @@ static void mlx4_en_free_rx_desc(struct mlx4_en_priv *priv,
                 en_dbg(DRV, priv, "Freeing fragment:%d\n", nr);
                 dma = be64_to_cpu(rx_desc->data[nr].addr);
 
-                en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma);
+                en_dbg(DRV, priv, "Unmapping buffer at dma:0x%llx\n", (u64) dma);
                 pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size,
                                  PCI_DMA_FROMDEVICE);
                 put_page(skb_frags[nr].page);
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 8c7279965b4..3d1396af946 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -47,7 +47,7 @@ enum {
 static int inline_thold __read_mostly = MAX_INLINE;
 
 module_param_named(inline_thold, inline_thold, int, 0444);
-MODULE_PARM_DESC(inline_thold, "treshold for using inline data");
+MODULE_PARM_DESC(inline_thold, "threshold for using inline data");
 
 int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
                            struct mlx4_en_tx_ring *ring, u32 size,
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index 4376147b0ea..82c3ebc584e 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -162,7 +162,7 @@ enum {
 #define MLX4_EN_DEF_RX_PAUSE    1
 #define MLX4_EN_DEF_TX_PAUSE    1
 
-/* Interval between sucessive polls in the Tx routine when polling is used
+/* Interval between successive polls in the Tx routine when polling is used
    instead of interrupts (in per-core Tx rings) - should be power of 2 */
 #define MLX4_EN_TX_POLL_MODER   16
 #define MLX4_EN_TX_POLL_TIMEOUT (HZ / 4)
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index b211613e9db..86fde1a90a5 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -296,7 +296,7 @@ static void gelic_card_reset_chain(struct gelic_card *card,
  * @card: card structure
  * @descr: descriptor to re-init
  *
- * return 0 on succes, <0 on failure
+ * return 0 on success, <0 on failure
  *
  * allocates a new rx skb, iommu-maps it and attaches it to the descriptor.
  * Activate the descriptor state-wise
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h
index 5b631c6c977..0a88b535197 100644
--- a/drivers/net/ps3_gelic_wireless.h
+++ b/drivers/net/ps3_gelic_wireless.h
@@ -199,7 +199,7 @@ struct gelic_eurus_rssi_info {
 /* for 'stat' member of gelic_wl_info */
 enum gelic_wl_info_status_bit {
         GELIC_WL_STAT_CONFIGURED,
-        GELIC_WL_STAT_CH_INFO,   /* ch info aquired */
+        GELIC_WL_STAT_CH_INFO,   /* ch info acquired */
         GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */
         GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */
         GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 4c610511eb4..f72643313ba 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -3651,7 +3651,7 @@ static int ql_adapter_up(struct ql3_adapter *qdev)
                 ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
         } else {
                 printk(KERN_ERR PFX
-                       "%s: Could not aquire driver lock.\n",
+                       "%s: Could not acquire driver lock.\n",
                        ndev->name);
                 goto err_lock;
         }
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 0dd7839322b..cc4218667cb 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3238,7 +3238,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
 
 /**
  *  s2io_chk_xpak_counter - Function to check the status of the xpak counters
- *  @counter      : couter value to be updated
+ *  @counter      : counter value to be updated
  *  @flag         : flag to indicate the status
  *  @type         : counter type
  *  Description:
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index c072f7f36ac..9d94a141555 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1760,7 +1760,7 @@ static int sis900_rx(struct net_device *net_dev)
                                 sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE,
                                 PCI_DMA_FROMDEVICE);
 
-                        /* refill the Rx buffer, what if there is not enought
+                        /* refill the Rx buffer, what if there is not enough
                          * memory for new socket buffer ?? */
                         if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
                                 /*
@@ -1775,7 +1775,7 @@ static int sis900_rx(struct net_device *net_dev)
                         }
 
                         /* This situation should never happen, but due to
-                           some unknow bugs, it is possible that
+                           some unknown bugs, it is possible that
                            we are working on NULL sk_buff :-( */
                         if (sis_priv->rx_skbuff[entry] == NULL) {
                                 if (netif_msg_rx_err(sis_priv))
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h
index 1758d954836..026a83b9f74 100644
--- a/drivers/net/skfp/h/smc.h
+++ b/drivers/net/skfp/h/smc.h
@@ -393,10 +393,10 @@ struct smt_config {
                                          */
         u_long  mac_d_max ;             /* MAC : D_Max timer value */
 
-        u_long lct_short ;              /* LCT : error threshhold */
-        u_long lct_medium ;             /* LCT : error threshhold */
-        u_long lct_long ;               /* LCT : error threshhold */
-        u_long lct_extended ;           /* LCT : error threshhold */
+        u_long lct_short ;              /* LCT : error threshold */
+        u_long lct_medium ;             /* LCT : error threshold */
+        u_long lct_long ;               /* LCT : error threshold */
+        u_long lct_extended ;           /* LCT : error threshold */
 } ;
 
 #ifdef  DEBUG
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index b27156eaf26..db216a72850 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -1002,7 +1002,7 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 }
                 break;
         default:
-                printk("ioctl for %s: unknow cmd: %04x\n", dev->name, ioc.cmd);
+                printk("ioctl for %s: unknown cmd: %04x\n", dev->name, ioc.cmd);
                 status = -EOPNOTSUPP;
 
         }                       // switch
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6a10d7ba587..a76cd66c228 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1975,7 +1975,7 @@ static void sky2_link_down(struct sky2_port *sky2)
 
         netif_carrier_off(sky2->netdev);
 
-        /* Turn on link LED */
+        /* Turn off link LED */
         sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
 
         if (netif_msg_link(sky2))
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index f9cdcbcb77d..24954fecf3d 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -816,7 +816,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
         SMSC_TRACE(HW, "Passed Loop Back Test");
 #endif                          /* USE_PHY_WORK_AROUND */
 
-        SMSC_TRACE(HW, "phy initialised succesfully");
+        SMSC_TRACE(HW, "phy initialised successfully");
         return 0;
 }
 
diff --git a/drivers/net/smsc911x.h b/drivers/net/smsc911x.h
index b5716bd8a59..016360c65ce 100644
--- a/drivers/net/smsc911x.h
+++ b/drivers/net/smsc911x.h
@@ -30,7 +30,7 @@
 #define SMSC_NAPI_WEIGHT        16
 
 /* implements a PHY loopback test at initialisation time, to ensure a packet
- * can be succesfully looped back */
+ * can be successfully looped back */
 #define USE_PHY_WORK_AROUND
 
 #define DPRINTK(nlevel, klevel, fmt, args...) \
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 90e663f4515..40b51e6bc77 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -409,7 +409,7 @@ spider_net_free_rx_chain_contents(struct spider_net_card *card)
  * @card: card structure
  * @descr: descriptor to re-init
  *
- * Return 0 on succes, <0 on failure.
+ * Return 0 on success, <0 on failure.
  *
  * Allocates a new rx skb, iommu-maps it and attaches it to the
  * descriptor. Mark the descriptor as activated, ready-to-use.
diff --git a/drivers/net/stmmac/gmac.c b/drivers/net/stmmac/gmac.c
index b624bb5bae0..52586ee6895 100644
--- a/drivers/net/stmmac/gmac.c
+++ b/drivers/net/stmmac/gmac.c
@@ -112,7 +112,7 @@ static void gmac_dma_operation_mode(unsigned long ioaddr, int txmode,
                               " (threshold = %d)\n", txmode);
                 csr6 &= ~DMA_CONTROL_TSF;
                 csr6 &= DMA_CONTROL_TC_TX_MASK;
-                /* Set the transmit threashold */
+                /* Set the transmit threshold */
                 if (txmode <= 32)
                         csr6 |= DMA_CONTROL_TTC_32;
                 else if (txmode <= 64)
diff --git a/drivers/net/stmmac/gmac.h b/drivers/net/stmmac/gmac.h
index 684a363120a..2e82d6c9a14 100644
--- a/drivers/net/stmmac/gmac.h
+++ b/drivers/net/stmmac/gmac.h
@@ -154,14 +154,14 @@ enum rx_tx_priority_ratio {
 #define DMA_CONTROL_DT          0x04000000 /* Disable Drop TCP/IP csum error */
 #define DMA_CONTROL_RSF         0x02000000 /* Receive Store and Forward */
 #define DMA_CONTROL_DFF         0x01000000 /* Disaable flushing */
-/* Theshold for Activating the FC */
+/* Threshold for Activating the FC */
 enum rfa {
         act_full_minus_1 = 0x00800000,
         act_full_minus_2 = 0x00800200,
         act_full_minus_3 = 0x00800400,
         act_full_minus_4 = 0x00800600,
 };
-/* Theshold for Deactivating the FC */
+/* Threshold for Deactivating the FC */
 enum rfd {
         deac_full_minus_1 = 0x00400000,
         deac_full_minus_2 = 0x00400800,
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 75fa32e34fd..685cc3a4d2a 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -96,7 +96,7 @@
  *
  *      Change by Mike Sullivan et al.:
  *      + added turbo card support. No need to use lanaid to configure
- *      the adapter into isa compatiblity mode.
+ *      the adapter into isa compatibility mode.
  *
  *      Changes by Burt Silverman to allow the computer to behave nicely when
  *      a cable is pulled or not in place, or a PCMCIA card is removed hot.
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index ebda61bc4c2..78e12b5e3ac 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -426,7 +426,7 @@ static int smctr_alloc_shared_memory(struct net_device *dev)
         smctr_malloc(dev, 1L);
 
         /* Allocate Non-MAC receive data buffers.
-         * To guarantee a minimum of 256 contigous memory to
+         * To guarantee a minimum of 256 contiguous memory to
          * UM_Receive_Packet's lookahead pointer, before a page
          * change or ring end is encountered, place each rx buffer on
          * a 256 byte boundary.
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 4469f2451a6..5e9adbaf674 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3798,7 +3798,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 prop = of_get_property(np, "tx-clock", NULL);
                 if (!prop) {
                         printk(KERN_ERR
-                                "ucc_geth: mising tx-clock-name property\n");
+                                "ucc_geth: missing tx-clock-name property\n");
                         return -EINVAL;
                 }
                 if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) {
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index 03a6ca016d5..a007e2acf65 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -80,16 +80,16 @@ struct ucc_geth {
                                    frames) received that were between 128
                                    (Including FCS length==4) and 255 octets */
         u32 txok;               /* Total number of octets residing in frames
-                                   that where involved in succesfull
+                                   that where involved in successfull
                                    transmission */
         u16 txcf;               /* Total number of PAUSE control frames
                                    transmitted by this MAC */
         u8 res4[0x2];
         u32 tmca;               /* Total number of frames that were transmitted
-                                   succesfully with the group address bit set
+                                   successfully with the group address bit set
                                    that are not broadcast frames */
         u32 tbca;               /* Total number of frames transmitted
-                                   succesfully that had destination address
+                                   successfully that had destination address
                                    field equal to the broadcast address */
         u32 rxfok;              /* Total number of frames received OK */
         u32 rxbok;              /* Total number of octets received OK */
@@ -98,9 +98,9 @@ struct ucc_geth {
                                    HW because it includes octets in frames that
                                    never even reach the UCC */
         u32 rmca;               /* Total number of frames that were received
-                                   succesfully with the group address bit set
+                                   successfully with the group address bit set
                                    that are not broadcast frames */
-        u32 rbca;               /* Total number of frames received succesfully
+        u32 rbca;               /* Total number of frames received successfully
                                    that had destination address equal to the
                                    broadcast address */
         u32 scar;               /* Statistics carry register */
@@ -759,15 +759,15 @@ struct ucc_geth_hardware_statistics {
                                    frames) received that were between 128
                                    (Including FCS length==4) and 255 octets */
         u32 txok;               /* Total number of octets residing in frames
-                                   that where involved in succesfull
+                                   that where involved in successfull
                                    transmission */
         u16 txcf;               /* Total number of PAUSE control frames
                                    transmitted by this MAC */
         u32 tmca;               /* Total number of frames that were transmitted
-                                   succesfully with the group address bit set
+                                   successfully with the group address bit set
                                    that are not broadcast frames */
         u32 tbca;               /* Total number of frames transmitted
-                                   succesfully that had destination address
+                                   successfully that had destination address
                                    field equal to the broadcast address */
         u32 rxfok;              /* Total number of frames received OK */
         u32 rxbok;              /* Total number of octets received OK */
@@ -776,9 +776,9 @@ struct ucc_geth_hardware_statistics {
                                    HW because it includes octets in frames that
                                    never even reach the UCC */
         u32 rmca;               /* Total number of frames that were received
-                                   succesfully with the group address bit set
+                                   successfully with the group address bit set
                                    that are not broadcast frames */
-        u32 rbca;               /* Total number of frames received succesfully
+        u32 rbca;               /* Total number of frames received successfully
                                    that had destination address equal to the
                                    broadcast address */
 } __attribute__ ((packed));
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index c6c922247d0..0c3c738d741 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -748,7 +748,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
         mii_nway_restart(&dev->mii);
 
         if (netif_msg_ifup(dev))
-                devdbg(dev, "phy initialised succesfully");
+                devdbg(dev, "phy initialised successfully");
         return 0;
 }
 
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 840cff72a0f..4d4c543c146 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -182,7 +182,7 @@ static inline pvc_device* find_pvc(hdlc_device *hdlc, u16 dlci)
                 if (pvc->dlci == dlci)
                         return pvc;
                 if (pvc->dlci > dlci)
-                        return NULL; /* the listed is sorted */
+                        return NULL; /* the list is sorted */
                 pvc = pvc->next;
         }
 
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ea71b33d2e..ee784e091f6 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -927,7 +927,7 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
         sc->lmc_media = &lmc_t1_media;
         break;
     default:
-        printk(KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev->name);
+        printk(KERN_WARNING "%s: LMC UNKNOWN CARD!\n", dev->name);
         break;
     }
 
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 07c32e68909..99d27473ba3 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -1114,7 +1114,7 @@ error:
  * device. See the file header for the format. Run all checks on the
  * buffer header, then run over each payload's descriptors, verify
  * their consistency and act on each payload's contents.  If
- * everything is succesful, update the device's statistics.
+ * everything is successful, update the device's statistics.
  *
  * Note: You need to set the skb to contain only the length of the
  * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE).
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
index a28c42f32c9..4da02941046 100644
--- a/drivers/net/wireless/ath/ath5k/base.h
+++ b/drivers/net/wireless/ath/ath5k/base.h
@@ -36,7 +36,7 @@
  */
 
 /*
- * Defintions for the Atheros Wireless LAN controller driver.
+ * Definitions for the Atheros Wireless LAN controller driver.
  */
 #ifndef _DEV_ATH_ATHVAR_H
 #define _DEV_ATH_ATHVAR_H
@@ -193,7 +193,7 @@ struct ath5k_softc {
         struct ath5k_txq        *cabq;          /* content after beacon */
 
         int                     power_level;    /* Requested tx power in dbm */
-        bool                    assoc;          /* assocate state */
+        bool                    assoc;          /* associate state */
         bool                    enable_beacon;  /* true if beacons are on */
 };
 
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 644962adda9..81ea52c4faf 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -1492,7 +1492,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode)
  * This info is used to calibrate the baseband power table. Imagine
  * that for each channel there is a power curve that's hw specific
  * (depends on amplifier etc) and we try to "correct" this curve using
- * offests we pass on to phy chip (baseband -> before amplifier) so that
+ * offsets we pass on to phy chip (baseband -> before amplifier) so that
  * it can use accurate power values when setting tx power (takes amplifier's
  * performance on each channel into account).
  *
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 1a039f2bd73..6f04cc758dc 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -117,7 +117,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,
 
 /*
  * This code is used to optimize rf gain on different environments
- * (temprature mostly) based on feedback from a power detector.
+ * (temperature mostly) based on feedback from a power detector.
  *
  * It's only used on RF5111 and RF5112, later RF chips seem to have
  * auto adjustment on hw -notice they have a much smaller BANK 7 and
@@ -2675,7 +2675,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
                 /* Fill curves in reverse order
                  * from lower power (max gain)
                  * to higher power. Use curve -> idx
-                 * backmaping we did on eeprom init */
+                 * backmapping we did on eeprom init */
                 u8 idx = pdg_curve_to_idx[pdg];
 
                 /* Grab the needed curves by index */
@@ -2777,7 +2777,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
         /* Now we have a set of curves for this
          * channel on tmpL (x range is table_max - table_min
          * and y values are tmpL[pdg][]) sorted in the same
-         * order as EEPROM (because we've used the backmaping).
+         * order as EEPROM (because we've used the backmapping).
          * So for RF5112 it's from higher power to lower power
          * and for RF2413 it's from lower power to higher power.
          * For RF5111 we only have one curve. */
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 1895d63aad0..0a35ee62a02 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -969,7 +969,7 @@ static bool ath_rc_update_per(struct ath_softc *sc,
                                  * Since this probe succeeded, we allow the next
                                  * probe twice as soon.  This allows the maxRate
                                  * to move up faster if the probes are
-                                 * succesful.
+                                 * successful.
                                  */
                                 ath_rc_priv->probe_time =
                                         now_msec - rate_table->probe_interval / 2;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 098dda1a67c..e56b941ecaa 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2955,7 +2955,7 @@ static void do_periodic_work(struct b43_wldev *dev)
 /* Periodic work locking policy:
  *      The whole periodic work handler is protected by
  *      wl->mutex. If another lock is needed somewhere in the
- *      pwork callchain, it's aquired in-place, where it's needed.
+ *      pwork callchain, it's acquired in-place, where it's needed.
  */
 static void b43_periodic_work_handler(struct work_struct *work)
 {
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 4b60148a5e6..881784b18b0 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2277,7 +2277,7 @@ static void do_periodic_work(struct b43legacy_wldev *dev)
 /* Periodic work locking policy:
  *      The whole periodic work handler is protected by
  *      wl->mutex. If another lock is needed somewhere in the
- *      pwork callchain, it's aquired in-place, where it's needed.
+ *      pwork callchain, it's acquired in-place, where it's needed.
  */
 static void b43legacy_periodic_work_handler(struct work_struct *work)
 {
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 6e2fc0cb6f8..64af9080fe9 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -551,7 +551,7 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
                 /* get number of entries */
                 field_count = *(((u16 *) & field_info) + 1);
 
-                /* abort if no enought memory */
+                /* abort if no enough memory */
                 total_length = field_len * field_count;
                 if (total_length > *len) {
                         *len = total_length;
@@ -3044,7 +3044,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
                              IPW_MAX_BDS)) {
                         /* TODO: Support merging buffers if more than
                          * IPW_MAX_BDS are used */
-                        IPW_DEBUG_INFO("%s: Maximum BD theshold exceeded.  "
+                        IPW_DEBUG_INFO("%s: Maximum BD threshold exceeded.  "
                                        "Increase fragmentation level.\n",
                                        priv->net_dev->name);
                 }
@@ -6820,7 +6820,7 @@ static int ipw2100_wx_get_range(struct net_device *dev,
         range->max_qual.updated = 7;    /* Updated all three */
 
         range->avg_qual.qual = 70;      /* > 8% missed beacons is 'bad' */
-        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+        /* TODO: Find real 'good' to 'bad' threshold value for RSSI */
         range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM;
         range->avg_qual.noise = 0;
         range->avg_qual.updated = 7;    /* Updated all three */
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index a6ca536e44f..fdbc97b7fcb 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -768,7 +768,7 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, u32 * len)
                 /* get number of entries */
                 field_count = *(((u16 *) & field_info) + 1);
 
-                /* abort if not enought memory */
+                /* abort if not enough memory */
                 total_len = field_len * field_count;
                 if (total_len > *len) {
                         *len = total_len;
@@ -7732,7 +7732,7 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv,
         case SEC_LEVEL_0:
                 break;
         default:
-                printk(KERN_ERR "Unknow security level %d\n",
+                printk(KERN_ERR "Unknown security level %d\n",
                        priv->ieee->sec.level);
                 break;
         }
@@ -8916,7 +8916,7 @@ static int ipw_wx_get_range(struct net_device *dev,
         range->max_qual.updated = 7;    /* Updated all three */
 
         range->avg_qual.qual = 70;
-        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+        /* TODO: Find real 'good' to 'bad' threshold value for RSSI */
         range->avg_qual.level = 0;      /* FIXME to real average level */
         range->avg_qual.noise = 0;
         range->avg_qual.updated = 7;    /* Updated all three */
@@ -10289,7 +10289,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb,
                 case SEC_LEVEL_0:
                         break;
                 default:
-                        printk(KERN_ERR "Unknow security level %d\n",
+                        printk(KERN_ERR "Unknown security level %d\n",
                                priv->ieee->sec.level);
                         break;
                 }
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index eb2b60834c1..c7b3f17d8da 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -175,7 +175,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
         ieee->host_decrypt = 1;
         ieee->host_mc_decrypt = 1;
 
-        /* Host fragementation in Open mode. Default is enabled.
+        /* Host fragmentation in Open mode. Default is enabled.
          * Note: host fragmentation is always enabled if host encryption
          * is enabled. For cards can do hardware encryption, they must do
          * hardware fragmentation as well. So we don't need a variable
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c
index c430418248b..d13c8853ee8 100644
--- a/drivers/net/wireless/iwmc3200wifi/hal.c
+++ b/drivers/net/wireless/iwmc3200wifi/hal.c
@@ -411,7 +411,7 @@ static void iwm_build_lmac_hdr(struct iwm_priv *iwm, struct iwm_lmac_hdr *hdr,
 /*
  * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC.
  * Sending command to the LMAC is equivalent to sending a
- * regular UMAC command with the LMAC passtrough or the LMAC
+ * regular UMAC command with the LMAC passthrough or the LMAC
  * wrapper UMAC command IDs.
  */
 int iwm_hal_send_host_cmd(struct iwm_priv *iwm,
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 771a301003c..8ddb51a2a97 100644
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1448,7 +1448,7 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm,
                 kfree_skb(packet->skb);
                 break;
         default:
-                IWM_ERR(iwm, "Unknow ticket action: %d\n",
+                IWM_ERR(iwm, "Unknown ticket action: %d\n",
                         le16_to_cpu(ticket_node->ticket->action));
                 kfree_skb(packet->skb);
         }
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 485a8d40652..afe6abecc04 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -934,7 +934,7 @@ static int if_sdio_probe(struct sdio_func *func,
         }
 
         if (i == ARRAY_SIZE(if_sdio_models)) {
-                lbs_pr_err("unkown card model 0x%x\n", card->model);
+                lbs_pr_err("unknown card model 0x%x\n", card->model);
                 ret = -ENODEV;
                 goto free;
         }
diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c
index a3eefe109df..84200da900b 100644
--- a/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@ -550,7 +550,7 @@ static const struct {							\
 
 #define DEFAULT_PDR(pid) default_pdr_data_##pid
 
-/*  HWIF Compatiblity */
+/*  HWIF Compatibility */
 DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00");
 
 /* PPPPSign */
@@ -656,7 +656,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw,
                                          record_id + 1, pdi);
                         }
                         break;
-                case 0x5: /*  HWIF Compatiblity */
+                case 0x5: /*  HWIF Compatibility */
                         default_pdi = (struct pdi *) &DEFAULT_PDR(0x0005);
                         break;
                 case 0x108: /* PPPPSign */
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index bc08464d832..f7f5c793514 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -1897,7 +1897,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
         return 0;
 }
 
-/* Setting policy also clears the MAC acl, even if we don't change the defaut
+/* Setting policy also clears the MAC acl, even if we don't change the default
  * policy
  */
 
@@ -2323,7 +2323,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
 
         case DOT11_OID_BEACON:
                 send_formatted_event(priv,
-                                     "Received a beacon from an unkown AP",
+                                     "Received a beacon from an unknown AP",
                                      mlme, 0);
                 break;
 
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h
index ccd644104ad..aced0577569 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.h
+++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -35,7 +35,7 @@
 
 /*
  * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
  */
 #define DEFAULT_RSSI_OFFSET             100
 
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h
index 54d37957883..3db9041838a 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.h
+++ b/drivers/net/wireless/rt2x00/rt2500pci.h
@@ -46,7 +46,7 @@
 
 /*
  * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
  */
 #define DEFAULT_RSSI_OFFSET             121
 
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h
index b01edca4258..d3000827883 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.h
+++ b/drivers/net/wireless/rt2x00/rt2500usb.h
@@ -46,7 +46,7 @@
 
 /*
  * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
  */
 #define DEFAULT_RSSI_OFFSET             120
 
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index 93eb699165c..77b5116f549 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -37,7 +37,7 @@
 
 /*
  * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
  */
 #define DEFAULT_RSSI_OFFSET             120
 
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h
index 81fe0be51c4..e194332dac5 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.h
+++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -37,7 +37,7 @@
 
 /*
  * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
  */
 #define DEFAULT_RSSI_OFFSET             120
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 33918fd5b23..10c702b5be4 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -3987,7 +3987,7 @@ wavelan_interrupt(int		irq,
 #endif
 
   /* Prevent reentrancy. We need to do that because we may have
-   * multiple interrupt handler running concurently.
+   * multiple interrupt handler running concurrently.
    * It is safe because interrupts are disabled before aquiring
    * the spinlock. */
   spin_lock(&lp->spinlock);
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 6d666359a42..2b7f9659437 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -312,7 +312,7 @@ static void tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
  * zd_mac_tx_failed - callback for failed frames
  * @dev: the mac80211 wireless device
  *
- * This function is called if a frame couldn't be succesfully be
+ * This function is called if a frame couldn't be successfully be
  * transferred. The first frame from the tx queue, will be selected and
  * reported as error to the upper layers.
  */