Merge tag 'tag-for-linus-3.5' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

[cascardo/linux.git] / drivers / staging / rtl8192u / r8192U.h

diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
index 9b81f26..57e3383 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U.h
+++ b/drivers/staging/rtl8192u/r8192U.h
@@ -11,7 +11,7 @@
 
    Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver
 
-   We want to tanks the Authors of those projects and the Ndiswrapper
+   We want to thank the Authors of those projects and the Ndiswrapper
    project Authors.
 */
 
@@ -98,7 +98,7 @@ do { if(rt_global_debug_component & component) \
 #define COMP_INIT                              BIT2            // during driver initialization / halt / reset.
 
 
-#define COMP_RECV                              BIT3            // Reveive part data path.
+#define COMP_RECV                              BIT3            // Receive data path.
 #define COMP_SEND                              BIT4            // Send part path.
 #define COMP_IO                                        BIT5            // I/O Related. Added by Annie, 2006-03-02.
 #define COMP_POWER                             BIT6            // 802.11 Power Save mode or System/Device Power state related.
@@ -322,7 +322,7 @@ typedef struct _tx_fwinfo_819x_usb {
         u8             TxSubCarrier:2;         // This is used for legacy OFDM rate only.
         u8             STBC:2;
         u8             AllowAggregation:1;
-        u8             RtsHT:1;                //Interpre RtsRate field as high throughput data rate
+        u8             RtsHT:1;                //Interpret RtsRate field as high throughput data rate
         u8             RtsShort:1;             //Short PLCP for CCK, or short GI for 11n MCS
         u8             RtsBandwidth:1;         // This is used for HT MCS rate only.
         u8             RtsSubcarrier:2;        // This is used for legacy OFDM rate only.
@@ -610,7 +610,6 @@ typedef struct Stats
 //     unsigned long rxnopointer;
        unsigned long rxok;
        unsigned long rxframgment;
-       unsigned long rxcmdpkt[4];              //08/05/08 amy rx cmd element txfeedback/bcn report/cfg set/query
        unsigned long rxurberr;
        unsigned long rxstaterr;
        unsigned long received_rate_histogram[4][32];   //0: Total, 1:OK, 2:CRC, 3:ICV, 2007 07 03 cosa
@@ -1117,7 +1116,7 @@ typedef struct r8192_priv
        bool bfsync_processing; // 500ms Fsync timer is active or not
        u32     rate_record;
        u32     rateCountDiffRecord;
-       u32     ContiuneDiffCount;
+       u32     ContinueDiffCount;
        bool bswitch_fsync;
 
        u8      framesync;