11 files changed, 20 insertions, 20 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 3b3d851fe266..ce2010952886 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -616,7 +616,7 @@
  * READ_CONTROL: 0 write BBP, 1 read BBP
  * BUSY: ASIC is busy executing BBP commands
  * BBP_PAR_DUR: 0 4 MAC clocks, 1 8 MAC clocks
- * BBP_RW_MODE: 0 serial, 1 paralell
+ * BBP_RW_MODE: 0 serial, 1 parallel
  */
 #define BBP_CSR_CFG                     0x101c
 #define BBP_CSR_CFG_VALUE               FIELD32(0x000000ff)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 6ed646a02d49..790afd3ed946 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1550,7 +1550,7 @@ static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,
         if (rf->channel > 14) {
                 /*
                  * When TX power is below 0, we should increase it by 7 to
-                 * make it a positive value (Minumum value is -7).
+                 * make it a positive value (Minimum value is -7).
                  * However this means that values between 0 and 7 have
                  * double meaning, and we should set a 7DBm boost flag.
                  */
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 73d3332be614..c446db69bd3c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -490,13 +490,13 @@ struct rt2x00intf_conf {
         enum nl80211_iftype type;
 
         /*
-         * TSF sync value, this is dependant on the operation type.
+         * TSF sync value, this is dependent on the operation type.
          */
         enum tsf_sync sync;
 
         /*
-         * The MAC and BSSID addressess are simple array of bytes,
-         * these arrays are little endian, so when sending the addressess
+         * The MAC and BSSID addresses are simple array of bytes,
+         * these arrays are little endian, so when sending the addresses
          * to the drivers, copy the it into a endian-signed variable.
          *
          * Note that all devices (except rt2500usb) have 32 bits
@@ -1173,7 +1173,7 @@ void rt2x00queue_stop_queue(struct data_queue *queue);
  * @drop: True to drop all pending frames.
  *
  * This function will flush the queue. After this call
- * the queue is guarenteed to be empty.
+ * the queue is guaranteed to be empty.
  */
 void rt2x00queue_flush_queue(struct data_queue *queue, bool drop);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index edebbf04bc57..555180d8f4aa 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -60,7 +60,7 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
          * Note that when NULL is passed as address we will send
          * 00:00:00:00:00 to the device to clear the address.
          * This will prevent the device being confused when it wants
-         * to ACK frames or consideres itself associated.
+         * to ACK frames or considers itself associated.
          */
         memset(conf.mac, 0, sizeof(conf.mac));
         if (mac)
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index e1e0c51fcde8..1bb9d46077ff 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -237,7 +237,7 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
         }
 
         /*
-         * NOTE: Always count the payload as transfered,
+         * NOTE: Always count the payload as transferred,
          * even when alignment was set to zero. This is required
          * for determining the correct offset for the ICV data.
          */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dump.h b/drivers/net/wireless/rt2x00/rt2x00dump.h
index 5d6e0b83151f..063ebcce97f8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dump.h
+++ b/drivers/net/wireless/rt2x00/rt2x00dump.h
@@ -51,7 +51,7 @@
  *   [rt2x00dump header][hardware descriptor][ieee802.11 frame]
  *
  * rt2x00dump header: The description of the dumped frame, as well as
- *      additional information usefull for debugging. See &rt2x00dump_hdr.
+ *      additional information useful for debugging. See &rt2x00dump_hdr.
  * hardware descriptor: Descriptor that was used to receive or transmit
  *      the frame.
  * ieee802.11 frame: The actual frame that was received or transmitted.
diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/rt2x00/rt2x00link.c
index fa55399be192..ea10b0068f82 100644
--- a/drivers/net/wireless/rt2x00/rt2x00link.c
+++ b/drivers/net/wireless/rt2x00/rt2x00link.c
@@ -273,7 +273,7 @@ void rt2x00link_start_tuner(struct rt2x00_dev *rt2x00dev)
         /**
          * While scanning, link tuning is disabled. By default
          * the most sensitive settings will be used to make sure
-         * that all beacons and probe responses will be recieved
+         * that all beacons and probe responses will be received
          * during the scan.
          */
         if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 56f9d0df9c61..ab8c16f8bcaf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -615,7 +615,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
         }
 
         /*
-         * When DMA allocation is required we should guarentee to the
+         * When DMA allocation is required we should guarantee to the
          * driver that the DMA is aligned to a 4-byte boundary.
          * However some drivers require L2 padding to pad the payload
          * rather then the header. This could be a requirement for
@@ -760,7 +760,7 @@ bool rt2x00queue_for_each_entry(struct data_queue *queue,
         spin_unlock_irqrestore(&queue->index_lock, irqflags);
 
         /*
-         * Start from the TX done pointer, this guarentees that we will
+         * Start from the TX done pointer, this guarantees that we will
          * send out all frames in the correct order.
          */
         if (index_start < index_end) {
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index 36f4d03eff61..167d45873dca 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -345,8 +345,8 @@ struct txentry_desc {
  *      only be touched after the device has signaled it is done with it.
  * @ENTRY_DATA_PENDING: This entry contains a valid frame and is waiting
  *      for the signal to start sending.
- * @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occured
- *      while transfering the data to the hardware. No TX status report will
+ * @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occurred
+ *      while transferring the data to the hardware. No TX status report will
  *      be expected from the hardware.
  * @ENTRY_DATA_STATUS_PENDING: The entry has been send to the device and
  *      returned. It is now waiting for the status reporting before the
@@ -367,7 +367,7 @@ enum queue_entry_flags {
  * @last_action: Timestamp of last change.
  * @queue: The data queue (&struct data_queue) to which this entry belongs.
  * @skb: The buffer which is currently being transmitted (for TX queue),
- *      or used to directly recieve data in (for RX queue).
+ *      or used to directly receive data in (for RX queue).
  * @entry_idx: The entry index number.
  * @priv_data: Private data belonging to this queue entry. The pointer
  *      points to data specific to a particular driver and queue type.
@@ -391,7 +391,7 @@ struct queue_entry {
  * @Q_INDEX: Index pointer to the current entry in the queue, if this entry is
  *      owned by the hardware then the queue is considered to be full.
  * @Q_INDEX_DMA_DONE: Index pointer for the next entry which will have been
- *      transfered to the hardware.
+ *      transferred to the hardware.
  * @Q_INDEX_DONE: Index pointer to the next entry which will be completed by
  *      the hardware and for which we need to run the txdone handler. If this
  *      entry is not owned by the hardware the queue is considered to be empty.
@@ -635,7 +635,7 @@ static inline int rt2x00queue_threshold(struct data_queue *queue)
 }
 
 /**
- * rt2x00queue_status_timeout - Check if a timeout occured for STATUS reports
+ * rt2x00queue_status_timeout - Check if a timeout occurred for STATUS reports
  * @entry: Queue entry to check.
  */
 static inline int rt2x00queue_status_timeout(struct queue_entry *entry)
@@ -646,7 +646,7 @@ static inline int rt2x00queue_status_timeout(struct queue_entry *entry)
 }
 
 /**
- * rt2x00queuedma__timeout - Check if a timeout occured for DMA transfers
+ * rt2x00queue_dma_timeout - Check if a timeout occurred for DMA transfers
  * @entry: Queue entry to check.
  */
 static inline int rt2x00queue_dma_timeout(struct queue_entry *entry)
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index e027ebd44583..39e1052123e3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -226,7 +226,7 @@ static void rt2x00usb_work_txdone_entry(struct queue_entry *entry)
         /*
          * If the transfer to hardware succeeded, it does not mean the
          * frame was send out correctly. It only means the frame
-         * was succesfully pushed to the hardware, we have no
+         * was successfully pushed to the hardware, we have no
          * way to determine the transmission status right now.
          * (Only indirectly by looking at the failed TX counters
          * in the register).
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index a69f18758871..323ca7b2b095 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -413,7 +413,7 @@ void rt2x00usb_flush_queue(struct data_queue *queue, bool drop);
  * @rt2x00dev: Pointer to &struct rt2x00_dev
  *
  * Check the health of the USB communication and determine
- * if timeouts have occured. If this is the case, this function
+ * if timeouts have occurred. If this is the case, this function
  * will reset all communication to restore functionality again.
  */
 void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev);