From da4d20162c892af1838b4f2b0c37d6b1ec4ac487 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Tue, 25 Feb 2014 23:54:39 +0900 Subject: [PATCH] staging: rtl8821ae: Fix typo in comment and printk in rtl8821ae Fix spelling typo in comment and printk within rtl8821ae. Signed-off-by: Masanari Iida Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8821ae/base.c | 14 ++++++------ drivers/staging/rtl8821ae/core.c | 12 +++++------ drivers/staging/rtl8821ae/core.h | 8 +++---- drivers/staging/rtl8821ae/debug.c | 10 ++++----- drivers/staging/rtl8821ae/debug.h | 12 +++++------ drivers/staging/rtl8821ae/efuse.c | 10 ++++----- drivers/staging/rtl8821ae/pci.c | 14 ++++++------ drivers/staging/rtl8821ae/pci.h | 2 +- drivers/staging/rtl8821ae/ps.c | 2 +- drivers/staging/rtl8821ae/regd.c | 4 ++-- drivers/staging/rtl8821ae/wifi.h | 36 +++++++++++++++---------------- 11 files changed, 62 insertions(+), 62 deletions(-) diff --git a/drivers/staging/rtl8821ae/base.c b/drivers/staging/rtl8821ae/base.c index da04f034e114..fce9c3fb2170 100644 --- 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 40de6089039e..ff3139b6da65 100644 --- 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 4b247db2861d..f0c74e9239fd 100644 --- 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 cb051223c684..8a6c794bda41 100644 --- 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 5eb6251b89da..6c0a553e98b7 100644 --- 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 --git a/drivers/staging/rtl8821ae/efuse.c b/drivers/staging/rtl8821ae/efuse.c index 74c19ecc95a9..d40ffd680142 100644 --- a/drivers/staging/rtl8821ae/efuse.c +++ b/drivers/staging/rtl8821ae/efuse.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: @@ -1120,7 +1120,7 @@ static void efuse_power_switch(struct ieee80211_hw *hw, u8 bwrite, u8 pwrstate) { rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69); - // 1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid + // 1.2V Power: From VDDON with Power Cut(0x0000h[15]), default valid tmpV16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_ISO_CTRL]); diff --git a/drivers/staging/rtl8821ae/pci.c b/drivers/staging/rtl8821ae/pci.c index 618a3cb4a0c0..060049524b46 100644 --- a/drivers/staging/rtl8821ae/pci.c +++ b/drivers/staging/rtl8821ae/pci.c @@ -583,7 +583,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw) (rtlpriv->buddy_priv && rtlpriv->buddy_priv->easy_concurrent_ctl.bswitch_in_process))) return; - /* we juse use em for BE/BK/VI/VO */ + /* we just use em for BE/BK/VI/VO */ for (tid = 7; tid >= 0; tid--) { u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(hw, tid)]; struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue]; @@ -672,7 +672,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) } /* for sw LPS, just after NULL skb send out, we can - * sure AP kown we are sleeped, our we should not let + * sure AP known we are slept, our we should not let * rf to sleep*/ fc = rtl_get_fc(skb); if (ieee80211_is_nullfunc(fc)) { @@ -772,7 +772,7 @@ static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw, return 1; } -/* inorder to receive 8K AMSDU we have set skb to +/* In order to receive 8K AMSDU we have set skb to * 9100bytes in init rx ring, but if this packet is * not a AMSDU, this so big packet will be sent to * TCP/IP directly, this cause big packet ping fail @@ -783,7 +783,7 @@ static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw, /* but some platform will fail when alloc skb sometimes. * in this condition, we will send the old skb to * mac80211 directly, this will not cause any other - * issues, but only be losted by TCP/IP */ + * issues, but only be lost by TCP/IP */ static void _rtl_pci_rx_to_mac80211(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_rx_status rx_status) { @@ -1029,7 +1029,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id) rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb); - /*Shared IRQ or HW disappared */ + /*Shared IRQ or HW disappeared */ if (!inta || inta == 0xffff) goto done; /*<1> beacon related */ @@ -1936,7 +1936,7 @@ void rtl_pci_stop(struct ieee80211_hw *hw) u8 RFInProgressTimeOut = 0; /* - *should before disable interrrupt&adapter + *should before disable interrupt&adapter *and will do it immediately. */ set_hal_stop(rtlhal); @@ -2293,7 +2293,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, /* *init dbgp flags before all *other functions, because we will - *use it in other funtions like + *use it in other functions like *RT_TRACE/RT_PRINT/RTL_PRINT_DATA *you can not use these macro *before this diff --git a/drivers/staging/rtl8821ae/pci.h b/drivers/staging/rtl8821ae/pci.h index 9f206550a657..9d8f0ac18be5 100644 --- a/drivers/staging/rtl8821ae/pci.h +++ b/drivers/staging/rtl8821ae/pci.h @@ -187,7 +187,7 @@ struct rtl8192_tx_ring { }; struct rtl8192_rx_ring { - struct rtl_rx_desc *desc;/*for old trx flow, not uesd in new trx*/ + struct rtl_rx_desc *desc;/*for old trx flow, not used in new trx*/ /*dma matches either 'desc' or 'buffer_desc'*/ dma_addr_t dma; unsigned int idx; diff --git a/drivers/staging/rtl8821ae/ps.c b/drivers/staging/rtl8821ae/ps.c index f12ffa83c58d..7876442417f4 100644 --- a/drivers/staging/rtl8821ae/ps.c +++ b/drivers/staging/rtl8821ae/ps.c @@ -257,7 +257,7 @@ void rtl_ips_nic_off_wq_callback(void *data) *Do not enter IPS in the following conditions: *(1) RF is already OFF or Sleep *(2) b_swrf_processing (indicates the IPS is still under going) - *(3) Connectted (only disconnected can trigger IPS) + *(3) Connected (only disconnected can trigger IPS) *(4) IBSS (send Beacon) *(5) AP mode (send Beacon) *(6) monitor mode (rcv packet) diff --git a/drivers/staging/rtl8821ae/regd.c b/drivers/staging/rtl8821ae/regd.c index d89f15cb8089..0a4b3984b7ef 100644 --- a/drivers/staging/rtl8821ae/regd.c +++ b/drivers/staging/rtl8821ae/regd.c @@ -243,7 +243,7 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy, } /* - *If a country IE has been recieved check its rule for this + *If a country IE has been received check its rule for this *channel first before enabling active scan. The passive scan *would have been enforced by the initial processing of our *custom regulatory domain. @@ -455,7 +455,7 @@ int rtl_regd_init(struct ieee80211_hw *hw, if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) { RT_TRACE(COMP_REGD, DBG_DMESG, - (KERN_DEBUG "rtl: EEPROM indicates invalid contry code" + (KERN_DEBUG "rtl: EEPROM indicates invalid country code" "world wide 13 should be used\n")); rtlpriv->regd.country_code = COUNTRY_CODE_WORLD_WIDE_13; diff --git a/drivers/staging/rtl8821ae/wifi.h b/drivers/staging/rtl8821ae/wifi.h index 3b5b2e7fc35a..17a9d9f8781d 100644 --- a/drivers/staging/rtl8821ae/wifi.h +++ b/drivers/staging/rtl8821ae/wifi.h @@ -76,7 +76,7 @@ #define RTL_SLOT_TIME_20 20 /*related with tcp/ip. */ -/*if_ehther.h*/ +/*if_ether.h*/ #define ETH_P_PAE 0x888E /*Port Access Entity *(IEEE 802.1X) */ #define ETH_P_IP 0x0800 /*Internet Protocol packet */ @@ -112,7 +112,7 @@ #define MAX_NUM_RATES 264 /*for 88E use*/ -/*It must always set to 4, otherwise read efuse table secquence will be wrong.*/ +/*It must always set to 4, otherwise read efuse table sequence will be wrong.*/ #define MAX_TX_COUNT 4 #define MAX_RF_PATH 4 #define MAX_CHNL_GROUP_24G 6 @@ -435,7 +435,7 @@ enum ht_channel_width { HT_CHANNEL_WIDTH_80 = 2, }; -/* Ref: 802.11i sepc D10.0 7.3.2.25.1 +/* Ref: 802.11i spec D10.0 7.3.2.25.1 Cipher Suites Encryption Algorithms */ enum rt_enc_alg { NO_ENCRYPTION = 0, @@ -499,14 +499,14 @@ enum rtl_var_map { RTL_IMR_BCNDMAINT3, /*Beacon DMA Interrupt 3 */ RTL_IMR_BCNDMAINT2, /*Beacon DMA Interrupt 2 */ RTL_IMR_BCNDMAINT1, /*Beacon DMA Interrupt 1 */ - RTL_IMR_BCNDOK8, /*Beacon Queue DMA OK Interrup 8 */ - RTL_IMR_BCNDOK7, /*Beacon Queue DMA OK Interrup 7 */ - RTL_IMR_BCNDOK6, /*Beacon Queue DMA OK Interrup 6 */ - RTL_IMR_BCNDOK5, /*Beacon Queue DMA OK Interrup 5 */ - RTL_IMR_BCNDOK4, /*Beacon Queue DMA OK Interrup 4 */ - RTL_IMR_BCNDOK3, /*Beacon Queue DMA OK Interrup 3 */ - RTL_IMR_BCNDOK2, /*Beacon Queue DMA OK Interrup 2 */ - RTL_IMR_BCNDOK1, /*Beacon Queue DMA OK Interrup 1 */ + RTL_IMR_BCNDOK8, /*Beacon Queue DMA OK Interrupt 8 */ + RTL_IMR_BCNDOK7, /*Beacon Queue DMA OK Interrupt 7 */ + RTL_IMR_BCNDOK6, /*Beacon Queue DMA OK Interrupt 6 */ + RTL_IMR_BCNDOK5, /*Beacon Queue DMA OK Interrupt 5 */ + RTL_IMR_BCNDOK4, /*Beacon Queue DMA OK Interrupt 4 */ + RTL_IMR_BCNDOK3, /*Beacon Queue DMA OK Interrupt 3 */ + RTL_IMR_BCNDOK2, /*Beacon Queue DMA OK Interrupt 2 */ + RTL_IMR_BCNDOK1, /*Beacon Queue DMA OK Interrupt 1 */ RTL_IMR_TIMEOUT2, /*Timeout interrupt 2 */ RTL_IMR_TIMEOUT1, /*Timeout interrupt 1 */ RTL_IMR_TXFOVW, /*Transmit FIFO Overflow */ @@ -515,10 +515,10 @@ enum rtl_var_map { RTL_IMR_RXFOVW, /*Receive FIFO Overflow */ RTL_IMR_RDU, /*Receive Descriptor Unavailable */ RTL_IMR_ATIMEND, /*For 92C,ATIM Window End Interrupt */ - RTL_IMR_BDOK, /*Beacon Queue DMA OK Interrup */ + RTL_IMR_BDOK, /*Beacon Queue DMA OK Interrupt */ RTL_IMR_HIGHDOK, /*High Queue DMA OK Interrupt */ RTL_IMR_COMDOK, /*Command Queue DMA OK Interrupt*/ - RTL_IMR_TBDOK, /*Transmit Beacon OK interrup */ + RTL_IMR_TBDOK, /*Transmit Beacon OK interrupt */ RTL_IMR_MGNTDOK, /*Management Queue DMA OK Interrupt */ RTL_IMR_TBDER, /*For 92C,Transmit Beacon Error Interrupt */ RTL_IMR_BKDOK, /*AC_BK DMA OK Interrupt */ @@ -1256,7 +1256,7 @@ struct rtl_security { bool use_defaultkey; /*Encryption Algorithm for Unicast Packet */ enum rt_enc_alg pairwise_enc_algorithm; - /*Encryption Algorithm for Brocast/Multicast */ + /*Encryption Algorithm for Broadcast/Multicast */ enum rt_enc_alg group_enc_algorithm; /*Cam Entry Bitmap */ u32 hwsec_cam_bitmap; @@ -1691,7 +1691,7 @@ struct rtl_stats { }; struct rt_link_detect { - /* count for raoming */ + /* count for roaming */ u32 bcn_rx_inperiod; u32 roam_times; @@ -2089,7 +2089,7 @@ struct rtl_priv { /* *hal_cfg : for diff cards - *intf_ops : for diff interrface usb/pcie + *intf_ops : for diff interface usb/pcie */ struct rtl_hal_cfg *cfg; struct rtl_intf_ops *intf_ops; @@ -2107,7 +2107,7 @@ struct rtl_priv { /*for bt coexist use*/ struct rtl_bt_coexist btcoexist; - /* seperate 92ee from other ICs, + /* separate 92ee from other ICs, * 92ee use new trx flow. */ bool use_new_trx_flow; /*This must be the last item so @@ -2385,7 +2385,7 @@ Set subfield of little-endian 4-byte value to specified value. */ #define RT_RF_PS_LEVEL_ALWAYS_ASPM BIT(6) /* no matter RFOFF or SLEEP we set PS_ASPM_LEVL*/ #define RT_PS_LEVEL_ASPM BIT(7) -/*When LPS is on, disable 2R if no packet is received or transmittd.*/ +/*When LPS is on, disable 2R if no packet is received or transmitted.*/ #define RT_RF_LPS_DISALBE_2R BIT(30) #define RT_RF_LPS_LEVEL_ASPM BIT(31) /*LPS with ASPM */ #define RT_IN_PS_LEVEL(ppsc, _ps_flg) \