staging: rtl8821ae: Fix typo in comment and printk in rtl8821ae

Fix spelling typo in comment and printk within rtl8821ae.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8821ae/base.c b/drivers/staging/rtl8821ae/base.c
index da04f03..fce9c3f 100644 (file)
--- a/drivers/staging/rtl8821ae/base.c
+++ b/drivers/staging/rtl8821ae/base.c
@@ -39,10 +39,10 @@
 #include "pci.h"
 
 /*
- *NOTICE!!!: This file will be very big, we hsould
- *keep it clear under follwing roles:
+ *NOTICE!!!: This file will be very big, we should
+ *keep it clear under following roles:
  *
- *This file include follwing part, so, if you add new
+ *This file include following part, so, if you add new
  *functions into this file, please check which part it
  *should includes. or check if you should add new part
  *for this file:
@@ -662,7 +662,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
 
        if (rtlpriv->dm.b_useramask) {
                tcb_desc->ratr_index = ratr_index;
-               /* TODO we will differentiate adhoc and station futrue  */
+               /* TODO we will differentiate adhoc and station future  */
                if (mac->opmode == NL80211_IFTYPE_STATION ||
                        mac->opmode == NL80211_IFTYPE_MESH_POINT) {
                        tcb_desc->mac_id = 0;
@@ -772,10 +772,10 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                        tcb_desc->disable_ratefallback = 1;
                } else {
                        /*
-                        *because hw will nerver use hw_rate
+                        *because hw will never use hw_rate
                         *when tcb_desc->use_driver_rate = false
                         *so we never set highest N rate here,
-                        *and N rate will all be controled by FW
+                        *and N rate will all be controlled by FW
                         *when tcb_desc->use_driver_rate = false
                         */
                        if (sta && (sta->ht_cap.ht_supported)) {
@@ -1671,7 +1671,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)
                (memcmp(mac->bssid, ap4_2, 3) == 0) ||
                (memcmp(mac->bssid, ap4_3, 3) == 0) ||
                vendor == PEER_RAL) {
-               RT_TRACE(COMP_MAC80211, DBG_LOUD, ("=>ral findn\n"));
+               RT_TRACE(COMP_MAC80211, DBG_LOUD, ("=>ral find\n"));
                vendor = PEER_RAL;
        } else if (memcmp(mac->bssid, ap6_1, 3) == 0 ||
                vendor == PEER_CISCO) {

diff --git a/drivers/staging/rtl8821ae/core.c b/drivers/staging/rtl8821ae/core.c
index 40de608..ff3139b 100644 (file)
--- a/drivers/staging/rtl8821ae/core.c
+++ b/drivers/staging/rtl8821ae/core.c
@@ -373,7 +373,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                        /* sleep here is must, or we may recv the beacon and
                         * cause mac80211 into wrong ps state, this will cause
                         * power save nullfunc send fail, and further cause
-                        * pkt loss, So sleep must quickly but not immediatly
+                        * pkt loss, So sleep must quickly but not immediately
                         * because that will cause nullfunc send by mac80211
                         * fail, and cause pkt loss, we have tested that 5mA
                         * is worked very well */
@@ -1200,8 +1200,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                key_type = AESCMAC_ENCRYPTION;
                RT_TRACE(COMP_SEC, DBG_DMESG, ("alg:CMAC\n"));
                RT_TRACE(COMP_SEC, DBG_DMESG,
-                               ("HW don't support CMAC encrypiton, "
-                               "use software CMAC encrypiton\n"));
+                               ("HW don't support CMAC encryption, "
+                               "use software CMAC encryption\n"));
                err = -EOPNOTSUPP;
                goto out_unlock;
        default:
@@ -1235,8 +1235,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                key_type = AESCMAC_ENCRYPTION;
                RT_TRACE(COMP_SEC, DBG_DMESG, ("alg:CMAC\n"));
                RT_TRACE(COMP_SEC, DBG_DMESG,
-                        ("HW don't support CMAC encrypiton, "
-                         "use software CMAC encrypiton\n"));
+                        ("HW don't support CMAC encryption, "
+                         "use software CMAC encryption\n"));
                err = -EOPNOTSUPP;
                goto out_unlock;
        default:
@@ -1411,7 +1411,7 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)
 }
 
 /* this function is called by mac80211 to flush tx buffer
- * before switch channle or power save, or tx buffer packet
+ * before switch channel or power save, or tx buffer packet
  * maybe send after offchannel or rf sleep, this may cause
  * dis-association by AP */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0))

diff --git a/drivers/staging/rtl8821ae/core.h b/drivers/staging/rtl8821ae/core.h
index 4b247db..f0c74e9 100644 (file)
--- a/drivers/staging/rtl8821ae/core.h
+++ b/drivers/staging/rtl8821ae/core.h
@@ -2,20 +2,20 @@
  *
  * Copyright(c) 2009-2010  Realtek Corporation.
  *
- * Tmis program is free software; you can redistribute it and/or modify it
+ * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * Tmis program is distributed in the hope that it will be useful, but WITHOUT
+ * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
+ * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * Tme full GNU General Public License is included in this distribution in the
+ * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:

diff --git a/drivers/staging/rtl8821ae/debug.c b/drivers/staging/rtl8821ae/debug.c
index cb05122..8a6c794 100644 (file)
--- a/drivers/staging/rtl8821ae/debug.c
+++ b/drivers/staging/rtl8821ae/debug.c
@@ -2,20 +2,20 @@
  *
  * Copyright(c) 2009-2010  Realtek Corporation.
  *
- * Tmis program is free software; you can redistribute it and/or modify it
+ * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * Tmis program is distributed in the hope that it will be useful, but WITHOUT
+ * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
+ * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * Tme full GNU General Public License is included in this distribution in the
+ * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:
@@ -985,4 +985,4 @@ void rtl_proc_remove_topdir(void)
 {
        if (proc_topdir)
                remove_proc_entry("rtlwifi", init_net.proc_net);
-}
\ No newline at end of file
+}

diff --git a/drivers/staging/rtl8821ae/debug.h b/drivers/staging/rtl8821ae/debug.h
index 5eb6251..6c0a553 100644 (file)
--- a/drivers/staging/rtl8821ae/debug.h
+++ b/drivers/staging/rtl8821ae/debug.h
@@ -2,20 +2,20 @@
  *
  * Copyright(c) 2009-2010  Realtek Corporation.
  *
- * Tmis program is free software; you can redistribute it and/or modify it
+ * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * Tmis program is distributed in the hope that it will be useful, but WITHOUT
+ * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * tmis program; if not, write to the Free Software Foundation, Inc.,
+ * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * Tme full GNU General Public License is included in this distribution in the
+ * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:
@@ -44,7 +44,7 @@
 #define DBG_EMERG                      0
 
 /*
- *Abnormal, rare, or unexpeted cases.
+ *Abnormal, rare, or unexpected cases.
  *For example, Packet/IO Ctl canceled,
  *device suprisely unremoved and so on.
  */
@@ -54,7 +54,7 @@
  *Normal case driver developer should
  *open, we can see link status like
  *assoc/AddBA/DHCP/adapter start and
- *so on basic and useful infromations.
+ *so on basic and useful informations.
  */
 #define DBG_DMESG                      3
 

diff --cc drivers/staging/rtl8821ae/efuse.c
Simple merge

diff --cc drivers/staging/rtl8821ae/pci.c
Simple merge

diff --cc drivers/staging/rtl8821ae/pci.h
Simple merge

diff --cc drivers/staging/rtl8821ae/ps.c
Simple merge

diff --cc drivers/staging/rtl8821ae/regd.c
Simple merge

diff --cc drivers/staging/rtl8821ae/wifi.h
Simple merge