Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8712: Fix typos.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Justin P. Mattock and committed by
Greg Kroah-Hartman
be10ac2b a5011a26

+41 -41
+1 -1
drivers/staging/rtl8712/drv_types.h
··· 146 146 /** 147 147 * struct _adapter - the main adapter structure for this device. 148 148 * 149 - * bup: True indicates that the interface is Up. 149 + * bup: True indicates that the interface is up. 150 150 */ 151 151 struct _adapter { 152 152 struct dvobj_priv dvobjpriv;
+1 -1
drivers/staging/rtl8712/ieee80211.h
··· 705 705 IEEE80211_ASSOCIATING_RETRY, 706 706 /* the association procedure is sending AUTH request*/ 707 707 IEEE80211_ASSOCIATING_AUTHENTICATING, 708 - /* the association procedure has successfully authentcated 708 + /* the association procedure has successfully authenticated 709 709 * and is sending association request 710 710 */ 711 711 IEEE80211_ASSOCIATING_AUTHENTICATED,
+1 -1
drivers/staging/rtl8712/if_ether.h
··· 25 25 ******************************************************************************/ 26 26 /* 27 27 * INET An implementation of the TCP/IP protocol suite for the LINUX 28 - * operating system. INET is implemented using the BSD Socket 28 + * operating system. INET is implemented using the BSD Socket 29 29 * interface as the means of communication with the user level. 30 30 * 31 31 * Global definitions for the Ethernet IEEE 802.3 interface.
+2 -2
drivers/staging/rtl8712/os_intfs.c
··· 52 52 static int hci = RTL8712_USB; 53 53 static int ampdu_enable = 1;/*for enable tx_ampdu*/ 54 54 55 - /* The video_mode variable is for vedio mode.*/ 55 + /* The video_mode variable is for video mode.*/ 56 56 /* It may be specify when inserting module with video_mode=1 parameter.*/ 57 57 static int video_mode = 1; /* enable video mode*/ 58 58 ··· 248 248 249 249 void r8712_stop_drv_threads(struct _adapter *padapter) 250 250 { 251 - /*Below is to termindate r8712_cmd_thread & event_thread...*/ 251 + /*Below is to terminate r8712_cmd_thread & event_thread...*/ 252 252 up(&padapter->cmdpriv.cmd_queue_sema); 253 253 if (padapter->cmdThread) 254 254 _down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);
+3 -3
drivers/staging/rtl8712/rtl8712_cmd.c
··· 69 69 * After trigger PBC, the variable will be set to false */ 70 70 DBG_8712("CheckPbcGPIO - PBC is pressed !!!!\n"); 71 71 /* 0 is the default value and it means the application monitors 72 - * the HW PBC doesn't privde its pid to driver. */ 72 + * the HW PBC doesn't provide its pid to driver. */ 73 73 if (padapter->pid == 0) 74 74 return; 75 75 kill_pid(find_vpid(padapter->pid), SIGUSR1, 1); ··· 382 382 *pcmdbuf = cpu_to_le32((cmdsz & 0x0000ffff) | 383 383 (pcmd->cmdcode << 16) | 384 384 (pcmdpriv->cmd_seq << 24)); 385 - pcmdbuf += 2 ; /* 8 bytes aligment */ 385 + pcmdbuf += 2 ; /* 8 bytes alignment */ 386 386 memcpy((u8 *)pcmdbuf, pcmd->parmbuf, pcmd->cmdsz); 387 387 while (check_cmd_fifo(padapter, wr_sz) == _FAIL) { 388 388 if ((padapter->bDriverStopped == true) || ··· 471 471 pevt_priv->event_seq++; /* update evt_seq */ 472 472 if (pevt_priv->event_seq > 127) 473 473 pevt_priv->event_seq = 0; 474 - peventbuf = peventbuf + 2; /* move to event content, 8 bytes aligment */ 474 + peventbuf = peventbuf + 2; /* move to event content, 8 bytes alignment */ 475 475 if (peventbuf) { 476 476 event_callback = wlanevents[evt_code].event_callback; 477 477 if (event_callback)
+1 -1
drivers/staging/rtl8712/rtl8712_cmd.h
··· 121 121 GEN_CMD_CODE(_GetCurDataRate) , 122 122 123 123 GEN_CMD_CODE(_GetTxRetrycnt), /* to record times that Tx retry to 124 - * transmmit packet after association 124 + * transmit packet after association 125 125 */ 126 126 GEN_CMD_CODE(_GetRxRetrycnt), /* to record total number of the 127 127 * received frame with ReTry bit set in
+1 -1
drivers/staging/rtl8712/rtl8712_efuse.c
··· 417 417 } else { /* write header fail */ 418 418 bResult = false; 419 419 if (0xFF == efuse_data) 420 - return bResult; /* not thing damaged. */ 420 + return bResult; /* nothing damaged. */ 421 421 /* call rescue procedure */ 422 422 if (fix_header(padapter, efuse_data, efuse_addr) == 423 423 false)
+1 -1
drivers/staging/rtl8712/rtl8712_gp_bitdef.h
··· 70 70 #define GPIOSEL_BT 2 /* BT_coex*/ 71 71 #define GPIOSEL_WLANDBG 3 /* WLANDBG*/ 72 72 #define GPIOSEL_GPIO_MASK (~(BIT(0)|BIT(1))) 73 - /* HW Readio OFF switch (GPIO BIT) */ 73 + /* HW Radio OFF switch (GPIO BIT) */ 74 74 #define HAL_8192S_HW_GPIO_OFF_BIT BIT(3) 75 75 #define HAL_8192S_HW_GPIO_OFF_MASK 0xF7 76 76 #define HAL_8192S_HW_GPIO_WPS_BIT BIT(4)
+2 -2
drivers/staging/rtl8712/rtl8712_hal.h
··· 83 83 unsigned char rfintfs; /* 0:SWSI, 1:HWSI, 2:HWPI*/ 84 84 unsigned char def_nettype; 85 85 unsigned char turboMode; 86 - unsigned char lowPowerMode;/* 0: noral mode, 1: low power mode*/ 86 + unsigned char lowPowerMode;/* 0: normal mode, 1: low power mode*/ 87 87 /*--- long word 2 ----*/ 88 88 unsigned char lbk_mode; /*0x00: normal, 0x03: MACLBK, 0x01: PHYLBK*/ 89 89 unsigned char mp_mode; /* 1: for MP use, 0: for normal driver */ ··· 123 123 unsigned char rsvd053; 124 124 }; 125 125 126 - struct fw_hdr {/*8-byte alinment required*/ 126 + struct fw_hdr {/*8-byte alignment required*/ 127 127 unsigned short signature; 128 128 unsigned short version; /*0x8000 ~ 0x8FFF for FPGA version, 129 129 *0x0000 ~ 0x7FFF for ASIC version,*/
+3 -3
drivers/staging/rtl8712/rtl8712_led.c
··· 60 60 * the # of times to blink is depend on time 61 61 * for scanning. */ 62 62 LED_NO_LINK_BLINK = 7, /* LED is blinking during no link state. */ 63 - LED_BLINK_StartToBlink = 8,/* Customzied for Sercomm Printer 63 + LED_BLINK_StartToBlink = 8,/* Customized for Sercomm Printer 64 64 * Server case */ 65 65 LED_BLINK_WPS = 9, /* LED is blinkg during WPS communication */ 66 66 LED_TXRX_BLINK = 10, ··· 826 826 { 827 827 struct LED_871x *pLed = (struct LED_871x *)data; 828 828 829 - /* This fixed the crash problem on Fedora 12 when trying to do thei 829 + /* This fixed the crash problem on Fedora 12 when trying to do the 830 830 * insmod;ifconfig up;rmmod commands. */ 831 831 if ((pLed->padapter->bSurpriseRemoved == true) || 832 832 (pLed->padapter->bDriverStopped == true)) ··· 836 836 837 837 /* Description: 838 838 * Callback function of LED BlinkWorkItem. 839 - * We dispatch acture LED blink action according to LedStrategy. 839 + * We dispatch actual LED blink action according to LedStrategy. 840 840 */ 841 841 static void BlinkWorkItemCallback(struct work_struct *work) 842 842 {
+2 -2
drivers/staging/rtl8712/rtl8712_recv.c
··· 459 459 cmd_seq = (u8)((le32_to_cpu(voffset) >> 24) & 0x7f); 460 460 eid = (u8)((le32_to_cpu(voffset) >> 16) & 0xff); 461 461 r8712_event_handle(padapter, (uint *)poffset); 462 - poffset += (cmd_len + 8);/*8 bytes aligment*/ 462 + poffset += (cmd_len + 8);/*8 bytes alignment*/ 463 463 } while (le32_to_cpu(voffset) & BIT(31)); 464 464 465 465 } ··· 603 603 } 604 604 } 605 605 spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); 606 - /*s2. check if winstart_b(indicate_seq) needs to been updated*/ 606 + /*s2. check if winstart_b(indicate_seq) needs to be updated*/ 607 607 if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) 608 608 goto _err_exit; 609 609 /*s3. Insert all packet into Reorder Queue to maintain its ordering.*/
+1 -1
drivers/staging/rtl8712/rtl871x_cmd.h
··· 720 720 * Result: 721 721 * 0x00: success 722 722 * 0x01: success, and check Response. 723 - * 0x02: cmd ignored due to duplicated sequcne number 723 + * 0x02: cmd ignored due to duplicated sequence number 724 724 * 0x03: cmd dropped due to invalid cmd code 725 725 * 0x04: reserved. 726 726 */
+7 -7
drivers/staging/rtl8712/rtl871x_ioctl_linux.c
··· 241 241 /* Add frequency/channel */ 242 242 iwe.cmd = SIOCGIWFREQ; 243 243 { 244 - /* check legel index */ 244 + /* check legal index */ 245 245 u8 dsconfig = pnetwork->network.Configuration.DSConfig; 246 246 if (dsconfig >= 1 && dsconfig <= sizeof( 247 247 ieee80211_wlan_frequencies) / sizeof(long)) ··· 809 809 810 810 /* 811 811 There are the BSSID information in the bssid.sa_data array. 812 - If cmd is IW_PMKSA_FLUSH, it means the wpa_suppplicant wants to clear 813 - all the PMKID information. If cmd is IW_PMKSA_ADD, it means the 814 - wpa_supplicant wants to add a PMKID/BSSID to driver. 812 + If cmd is IW_PMKSA_FLUSH, it means the wpa_supplicant wants to clear 813 + all the PMKID information. If cmd is IW_PMKSA_ADD, it means the 814 + wpa_supplicant wants to add a PMKID/BSSID to driver. 815 815 If cmd is IW_PMKSA_REMOVE, it means the wpa_supplicant wants to 816 - remove a PMKID/BSSID from driver. 816 + remove a PMKID/BSSID from driver. 817 817 */ 818 818 if (pPMK == NULL) 819 819 return -EINVAL; ··· 923 923 range->max_qual.noise = 100; 924 924 range->max_qual.updated = 7; /* Updated all three */ 925 925 range->avg_qual.qual = 92; /* > 8% missed beacons is 'bad' */ 926 - /* TODO: Find real 'good' to 'bad' threshol value for RSSI */ 926 + /* TODO: Find real 'good' to 'bad' threshold value for RSSI */ 927 927 range->avg_qual.level = 20 + -98; 928 928 range->avg_qual.noise = 0; 929 929 range->avg_qual.updated = 7; /* Updated all three */ ··· 1070 1070 * MAC# of a preferred Access Point. 1071 1071 * Currently, the request comes via Wireless Extensions' SIOCSIWAP ioctl. 1072 1072 * 1073 - * For this operation to succeed, there is no need for the interface to be Up. 1073 + * For this operation to succeed, there is no need for the interface to be up. 1074 1074 * 1075 1075 */ 1076 1076 static int r8711_wx_set_wap(struct net_device *dev,
+1 -1
drivers/staging/rtl8712/rtl871x_ioctl_set.c
··· 264 264 (*pold_state == Ndis802_11Infrastructure) || 265 265 (*pold_state == Ndis802_11IBSS)) { 266 266 /* will clr Linked_state before this function, 267 - * we must have chked whether issue dis-assoc_cmd or 267 + * we must have checked whether issue dis-assoc_cmd or 268 268 * not */ 269 269 r8712_ind_disconnect(padapter); 270 270 }
+4 -4
drivers/staging/rtl8712/rtl871x_mlme.c
··· 137 137 138 138 /* 139 139 return the wlan_network with the matching addr 140 - Shall be calle under atomic context... 140 + Shall be called under atomic context... 141 141 to avoid possible racing condition... 142 142 */ 143 143 static struct wlan_network *_r8712_find_network(struct __queue *scanned_queue, ··· 255 255 /* 256 256 return the wlan_network with the matching addr 257 257 258 - Shall be calle under atomic context... 258 + Shall be called under atomic context... 259 259 to avoid possible racing condition... 260 260 */ 261 261 static struct wlan_network *r8712_find_network(struct __queue *scanned_queue, ··· 1037 1037 * and the WiFi client will drop the data with seq number 0. 1038 1038 * So, the 8712 firmware has to inform driver with receiving the 1039 1039 * ADDBA-Req frame so that the driver can reset the 1040 - * sequence value of Rx reorder contorl. 1040 + * sequence value of Rx reorder control. 1041 1041 */ 1042 1042 void r8712_got_addbareq_event_callback(struct _adapter *adapter, u8 *pbuf) 1043 1043 { ··· 1775 1775 phtpriv->rx_ampdu_maxlen = max_ampdu_sz; 1776 1776 } 1777 1777 /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info 1778 - * if A-MPDU Rx is enabled, reseting rx_ordering_ctrl 1778 + * if A-MPDU Rx is enabled, resetting rx_ordering_ctrl 1779 1779 * wstart_b(indicate_seq) to default value=0xffff 1780 1780 * todo: check if AP can send A-MPDU packets 1781 1781 */
+3 -3
drivers/staging/rtl8712/rtl871x_mlme.h
··· 69 69 like ISR/Call-Back functions, the OID handlers, and even timer functions. 70 70 Each _queue has its own locks, already. 71 71 Other items are protected by mlme_priv.lock. 72 - To avoid possible dead lock, any thread trying to modifiying mlme_priv 73 - SHALL not lock up more than one locks at a time! 72 + To avoid possible dead lock, any thread trying to modify mlme_priv 73 + SHALL not lock up more than one lock at a time! 74 74 */ 75 75 76 76 #define traffic_threshold 10 ··· 132 132 * therefore set it to be the critical section... 133 133 * 134 134 * ### NOTE:#### (!!!!) 135 - * TAKE CARE THAT BEFORE CALLING THIS FUNC, LOCK pmlmepriv->lock 135 + * TAKE CARE BEFORE CALLING THIS FUNC, LOCK pmlmepriv->lock 136 136 */ 137 137 static inline void set_fwstate(struct mlme_priv *pmlmepriv, sint state) 138 138 {
+2 -2
drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
··· 184 184 185 185 /*RxIQ DC offset, Rx digital filter, DC notch filter */ 186 186 #define rOFDM0_XARxAFE 0xc10 187 - #define rOFDM0_XARxIQImbalance 0xc14 /* RxIQ imblance matrix */ 187 + #define rOFDM0_XARxIQImbalance 0xc14 /* RxIQ imbalance matrix */ 188 188 #define rOFDM0_XBRxAFE 0xc18 189 189 #define rOFDM0_XBRxIQImbalance 0xc1c 190 190 #define rOFDM0_XCRxAFE 0xc20 ··· 603 603 #define bCCKRxIG 0x7f00 604 604 #define bCCKLNAPolarity 0x800000 605 605 #define bCCKRx1stGain 0x7f0000 606 - #define bCCKRFExtend 0x20000000 /* CCK Rx Iinital gain polarity */ 606 + #define bCCKRFExtend 0x20000000 /* CCK Rx inital gain polarity */ 607 607 #define bCCKRxAGCSatLevel 0x1f000000 608 608 #define bCCKRxAGCSatCount 0xe0 609 609 #define bCCKRxRFSettle 0x1f /* AGCsamp_dly */
+1 -1
drivers/staging/rtl8712/rtl871x_xmit.c
··· 72 72 memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); 73 73 spin_lock_init(&pxmitpriv->lock); 74 74 /* 75 - Please insert all the queue initializaiton using _init_queue below 75 + Please insert all the queue initialization using _init_queue below 76 76 */ 77 77 pxmitpriv->adapter = padapter; 78 78 _init_queue(&pxmitpriv->be_pending);
+1 -1
drivers/staging/rtl8712/rtl871x_xmit.h
··· 119 119 120 120 u8 priority; 121 121 u8 encrypt; /* when 0 indicate no encrypt. when non-zero, 122 - * indicate the encrypt algorith*/ 122 + * indicate the encrypt algorithm*/ 123 123 u8 iv_len; 124 124 u8 icv_len; 125 125 unsigned char iv[8];
+2 -2
drivers/staging/rtl8712/usb_halinit.c
··· 141 141 /* Enable AFE PLL Macro Block */ 142 142 val8 = r8712_read8(padapter, AFE_PLL_CTRL); 143 143 r8712_write8(padapter, AFE_PLL_CTRL, (val8 | 0x11)); 144 - /* Attatch AFE PLL to MACTOP/BB/PCIe Digital */ 144 + /* Attach AFE PLL to MACTOP/BB/PCIe Digital */ 145 145 val8 = r8712_read8(padapter, SYS_ISO_CTRL); 146 146 r8712_write8(padapter, SYS_ISO_CTRL, (val8 & 0xEE)); 147 147 /* Switch to 40M clock */ ··· 234 234 udelay(500); 235 235 r8712_write8(padapter, AFE_PLL_CTRL, (val8 | 0x11)); 236 236 udelay(500); 237 - /* Attatch AFE PLL to MACTOP/BB/PCIe Digital */ 237 + /* Attach AFE PLL to MACTOP/BB/PCIe Digital */ 238 238 val8 = r8712_read8(padapter, SYS_ISO_CTRL); 239 239 r8712_write8(padapter, SYS_ISO_CTRL, (val8 & 0xEE)); 240 240 /* Switch to 40M clock */
+1 -1
drivers/staging/rtl8712/usb_intf.c
··· 644 644 /* decrease the reference count of the usb device structure 645 645 * when disconnect */ 646 646 usb_put_dev(udev); 647 - /* If we didn't unplug usb dongle and remove/insert modlue, driver 647 + /* If we didn't unplug usb dongle and remove/insert module, driver 648 648 * fails on sitesurvey for the first time when device is up. 649 649 * Reset usb port for sitesurvey fail issue. */ 650 650 if (udev->state != USB_STATE_NOTATTACHED)