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

staging: rtl8712: checkpatch cleanup: block comments using a trailing */

Fix checkpatch.pl warning "Block comments use a trailing */ on
a separate line" on multiple files of the driver by editing the
affected comments.

Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Raphaël Beamonte and committed by
Greg Kroah-Hartman
bef611a9 1c099ed6

+268 -134
+8 -4
drivers/staging/rtl8712/rtl8712_led.c
··· 58 58 LED_POWER_ON_BLINK = 5, 59 59 LED_SCAN_BLINK = 6, /* LED is blinking during scanning period, 60 60 * the # of times to blink is depend on time 61 - * for scanning. */ 61 + * for scanning. 62 + */ 62 63 LED_NO_LINK_BLINK = 7, /* LED is blinking during no link state. */ 63 64 LED_BLINK_StartToBlink = 8,/* Customized for Sercomm Printer 64 - * Server case */ 65 + * Server case 66 + */ 65 67 LED_BLINK_WPS = 9, /* LED is blinkg during WPS communication */ 66 68 LED_TXRX_BLINK = 10, 67 69 LED_BLINK_WPS_STOP = 11, /*for ALPHA */ ··· 112 110 { 113 111 del_timer_sync(&pLed->BlinkTimer); 114 112 /* We should reset bLedBlinkInProgress if we cancel 115 - * the LedControlTimer, */ 113 + * the LedControlTimer, 114 + */ 116 115 pLed->bLedBlinkInProgress = false; 117 116 } 118 117 ··· 830 827 struct LED_871x *pLed = (struct LED_871x *)data; 831 828 832 829 /* This fixed the crash problem on Fedora 12 when trying to do the 833 - * insmod;ifconfig up;rmmod commands. */ 830 + * insmod;ifconfig up;rmmod commands. 831 + */ 834 832 if (pLed->padapter->bSurpriseRemoved || pLed->padapter->bDriverStopped) 835 833 return; 836 834 schedule_work(&pLed->BlinkWorkItem);
+36 -18
drivers/staging/rtl8712/rtl8712_recv.c
··· 163 163 drvinfo_sz = (le32_to_cpu(prxstat->rxdw0) & 0x000f0000) >> 16; 164 164 drvinfo_sz <<= 3; 165 165 /*TODO: 166 - * Offset 0 */ 166 + * Offset 0 167 + */ 167 168 pattrib->bdecrypted = ((le32_to_cpu(prxstat->rxdw0) & BIT(27)) >> 27) 168 169 ? 0 : 1; 169 170 pattrib->crc_err = (le32_to_cpu(prxstat->rxdw0) & BIT(14)) >> 14; ··· 211 210 curfragnum = 0; 212 211 if (curfragnum != pfhdr->attrib.frag_num) { 213 212 /*the first fragment number must be 0 214 - *free the whole queue*/ 213 + *free the whole queue 214 + */ 215 215 r8712_free_recvframe(prframe, pfree_recv_queue); 216 216 r8712_free_recvframe_queue(defrag_q, pfree_recv_queue); 217 217 return NULL; ··· 226 224 /*check the fragment sequence (2nd ~n fragment frame) */ 227 225 if (curfragnum != pnfhdr->attrib.frag_num) { 228 226 /* the fragment number must increase (after decache) 229 - * release the defrag_q & prframe */ 227 + * release the defrag_q & prframe 228 + */ 230 229 r8712_free_recvframe(prframe, pfree_recv_queue); 231 230 r8712_free_recvframe_queue(defrag_q, pfree_recv_queue); 232 231 return NULL; 233 232 } 234 233 curfragnum++; 235 234 /* copy the 2nd~n fragment frame's payload to the first fragment 236 - * get the 2nd~last fragment frame's payload */ 235 + * get the 2nd~last fragment frame's payload 236 + */ 237 237 wlanhdr_offset = pnfhdr->attrib.hdrlen + pnfhdr->attrib.iv_len; 238 238 recvframe_pull(pnextrframe, wlanhdr_offset); 239 239 /* append to first fragment frame's tail (if privacy frame, 240 - * pull the ICV) */ 240 + * pull the ICV) 241 + */ 241 242 recvframe_pull_tail(prframe, pfhdr->attrib.icv_len); 242 243 memcpy(pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len); 243 244 recvframe_put(prframe, pnfhdr->len); ··· 283 278 prtnframe = precv_frame;/*isn't a fragment frame*/ 284 279 if (ismfrag == 1) { 285 280 /* 0~(n-1) fragment frame 286 - * enqueue to defraf_g */ 281 + * enqueue to defraf_g 282 + */ 287 283 if (pdefrag_q != NULL) { 288 284 if (fragnum == 0) { 289 285 /*the first fragment*/ ··· 300 294 prtnframe = NULL; 301 295 } else { 302 296 /* can't find this ta's defrag_queue, so free this 303 - * recv_frame */ 297 + * recv_frame 298 + */ 304 299 r8712_free_recvframe(precv_frame, pfree_recv_queue); 305 300 prtnframe = NULL; 306 301 } ··· 309 302 } 310 303 if ((ismfrag == 0) && (fragnum != 0)) { 311 304 /* the last fragment frame 312 - * enqueue the last fragment */ 305 + * enqueue the last fragment 306 + */ 313 307 if (pdefrag_q != NULL) { 314 308 phead = &pdefrag_q->queue; 315 309 list_add_tail(&pfhdr->list, phead); ··· 319 311 prtnframe = precv_frame; 320 312 } else { 321 313 /* can't find this ta's defrag_queue, so free this 322 - * recv_frame */ 314 + * recv_frame 315 + */ 323 316 r8712_free_recvframe(precv_frame, pfree_recv_queue); 324 317 prtnframe = NULL; 325 318 } ··· 400 391 eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || 401 392 !memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE))) { 402 393 /* remove RFC1042 or Bridge-Tunnel encapsulation and 403 - * replace EtherType */ 394 + * replace EtherType 395 + */ 404 396 skb_pull(sub_skb, SNAP_SIZE); 405 397 memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, 406 398 ETH_ALEN); ··· 540 530 preorder_ctrl->indicate_seq = pattrib->seq_num; 541 531 } 542 532 /* Prepare indication list and indication. 543 - * Check if there is any packet need indicate. */ 533 + * Check if there is any packet need indicate. 534 + */ 544 535 while (!list_empty(phead)) { 545 536 prframe = container_of(plist, union recv_frame, u.list); 546 537 pattrib = &prframe->u.hdr.attrib; ··· 768 757 /* Modify the RF RNA gain value to -40, -20, 769 758 * -2, 14 by Jenyu's suggestion 770 759 * Note: different RF with the different 771 - * RNA gain. */ 760 + * RNA gain. 761 + */ 772 762 case 0x3: 773 763 rx_pwr_all = -40 - (pcck_buf->cck_agc_rpt & 774 764 0x3e); ··· 854 842 total_rssi += rssi; 855 843 } 856 844 /* (2)PWDB, Average PWDB cacluated by hardware (for 857 - * rate adaptive) */ 845 + * rate adaptive) 846 + */ 858 847 rx_pwr_all = (((pphy_head[PHY_STAT_PWDB_ALL_SHT]) >> 1) & 0x7f) 859 848 - 106; 860 849 pwdb_all = query_rx_pwr_percentage(rx_pwr_all); ··· 883 870 } 884 871 /* UI BSS List signal strength(in percentage), make it good looking, 885 872 * from 0~100. It is assigned to the BSS List in 886 - * GetValueFromBeaconOrProbeRsp(). */ 873 + * GetValueFromBeaconOrProbeRsp(). 874 + */ 887 875 if (bcck_rate) 888 876 prframe->u.hdr.attrib.signal_strength = 889 877 (u8)r8712_signal_scale_mapping(pwdb_all); ··· 1041 1027 transfer_len = pskb->len; 1042 1028 /* Test throughput with Netgear 3700 (No security) with Chariot 3T3R 1043 1029 * pairs. The packet count will be a big number so that the containing 1044 - * packet will effect the Rx reordering. */ 1030 + * packet will effect the Rx reordering. 1031 + */ 1045 1032 if (transfer_len < pkt_len) { 1046 1033 /* In this case, it means the MAX_RECVBUF_SZ is too small to 1047 - * get the data from 8712u. */ 1034 + * get the data from 8712u. 1035 + */ 1048 1036 return _FAIL; 1049 1037 } 1050 1038 do { ··· 1073 1057 tmp_len = pkt_len + drvinfo_sz + RXDESC_SIZE; 1074 1058 pkt_offset = (u16)round_up(tmp_len, 128); 1075 1059 /* for first fragment packet, driver need allocate 1536 + 1076 - * drvinfo_sz + RXDESC_SIZE to defrag packet. */ 1060 + * drvinfo_sz + RXDESC_SIZE to defrag packet. 1061 + */ 1077 1062 if ((mf == 1) && (frag == 0)) 1078 1063 /*1658+6=1664, 1664 is 128 alignment.*/ 1079 1064 alloc_sz = max_t(u16, tmp_len, 1658); 1080 1065 else 1081 1066 alloc_sz = tmp_len; 1082 1067 /* 2 is for IP header 4 bytes alignment in QoS packet case. 1083 - * 4 is for skb->data 4 bytes alignment. */ 1068 + * 4 is for skb->data 4 bytes alignment. 1069 + */ 1084 1070 alloc_sz += 6; 1085 1071 pkt_copy = netdev_alloc_skb(padapter->pnetdev, alloc_sz); 1086 1072 if (pkt_copy) {
+2 -1
drivers/staging/rtl8712/rtl8712_recv.h
··· 61 61 struct phy_cck_rx_status { 62 62 /* For CCK rate descriptor. This is a unsigned 8:1 variable. 63 63 * LSB bit present 0.5. And MSB 7 bts present a signed value. 64 - * Range from -64~+63.5. */ 64 + * Range from -64~+63.5. 65 + */ 65 66 u8 adc_pwdb_X[4]; 66 67 u8 sq_rpt; 67 68 u8 cck_agc_rpt;
+2 -1
drivers/staging/rtl8712/rtl8712_spec.h
··· 83 83 84 84 #define CMD_ADDR_MAPPING_SHIFT 2 /*SDIO CMD ADDR MAPPING, 85 85 *shift 2 bit for match 86 - * offset[14:2]*/ 86 + * offset[14:2] 87 + */ 87 88 88 89 /*Offset for SDIO LOCAL*/ 89 90 #define OFFSET_SDIO_LOCAL 0x0FFF
+18 -9
drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h
··· 68 68 #define SYS_CLKSEL BIT(SYS_CLKSEL_SHT) /* System Clock 80MHz*/ 69 69 #define PS_CLKSEL_SHT 1 70 70 #define PS_CLKSEL BIT(PS_CLKSEL_SHT) /*System power save 71 - * clock select.*/ 71 + * clock select. 72 + */ 72 73 #define CPU_CLKSEL_SHT 2 73 74 #define CPU_CLKSEL BIT(CPU_CLKSEL_SHT) /* System Clock select, 74 75 * 1: AFE source, 75 - * 0: System clock(L-Bus)*/ 76 + * 0: System clock(L-Bus) 77 + */ 76 78 #define INT32K_EN_SHT 3 77 79 #define INT32K_EN BIT(INT32K_EN_SHT) 78 80 #define MACSLP_SHT 4 ··· 87 85 #define RING_CLK_EN BIT(RING_CLK_EN_SHT) 88 86 #define SWHW_SEL_SHT 14 89 87 #define SWHW_SEL BIT(SWHW_SEL_SHT) /* Load done, 90 - * control path switch.*/ 88 + * control path switch. 89 + */ 91 90 #define FWHW_SEL_SHT 15 92 91 #define FWHW_SEL BIT(FWHW_SEL_SHT) /* Sleep exit, 93 - * control path switch.*/ 92 + * control path switch. 93 + */ 94 94 95 95 /*9346CR*/ 96 96 #define _VPDIDX_MSK 0xFF00 ··· 122 118 #define AFE_MISC_E32_EN BIT(AFE_MISC_E32_EN_SHT) 123 119 #define AFE_MISC_MBEN_SHT 1 124 120 #define AFE_MISC_MBEN BIT(AFE_MISC_MBEN_SHT)/* Enable AFE Macro 125 - * Block's Mbias.*/ 121 + * Block's Mbias. 122 + */ 126 123 #define AFE_MISC_BGEN_SHT 0 127 124 #define AFE_MISC_BGEN BIT(AFE_MISC_BGEN_SHT)/* Enable AFE Macro 128 - * Block's Bandgap.*/ 125 + * Block's Bandgap. 126 + */ 129 127 130 128 131 129 /*--------------------------------------------------------------------------*/ ··· 155 149 156 150 /* EFUSE_CTRL*/ 157 151 #define EF_FLAG BIT(31) /* Access Flag, Write:1; 158 - * Read:0*/ 152 + * Read:0 153 + */ 159 154 #define EF_PGPD 0x70000000 /* E-fuse Program time*/ 160 155 #define EF_RDT 0x0F000000 /* E-fuse read time: in the 161 - * unit of cycle time*/ 156 + * unit of cycle time 157 + */ 162 158 #define EF_PDN_EN BIT(19) /* EFuse Power down enable*/ 163 159 #define ALD_EN BIT(18) /* Autoload Enable*/ 164 160 #define EF_ADDR 0x0003FF00 /* Access Address*/ ··· 172 164 /* EFUSE_CLK_CTRL*/ 173 165 #define EFUSE_CLK_EN BIT(1) /* E-Fuse Clock Enable*/ 174 166 #define EFUSE_CLK_SEL BIT(0) /* E-Fuse Clock Select, 175 - * 0:500K, 1:40M*/ 167 + * 0:500K, 1:40M 168 + */ 176 169 177 170 #endif /*__RTL8712_SYSCFG_BITDEF_H__*/ 178 171
+6 -3
drivers/staging/rtl8712/rtl8712_xmit.c
··· 535 535 * seqnum per tid. about usb using 4-endpoint, qsel points out 536 536 * the correct mapping between AC&Endpoint, 537 537 * the purpose is that correct mapping lets the MAC release 538 - * the AC Queue list correctly. */ 538 + * the AC Queue list correctly. 539 + */ 539 540 ptxdesc->txdw3 = cpu_to_le32((pattrib->priority << SEQ_SHT) & 540 541 0x0fff0000); 541 542 if ((pattrib->ether_type != 0x888e) && ··· 587 586 * per tid. about usb using 4-endpoint, qsel points out the 588 587 * correct mapping between AC&Endpoint, 589 588 * the purpose is that correct mapping let the MAC releases 590 - * the AC Queue list correctly. */ 589 + * the AC Queue list correctly. 590 + */ 591 591 ptxdesc->txdw3 = cpu_to_le32((pattrib->priority << SEQ_SHT) & 592 592 0x0fff0000); 593 593 /* offset 16 */ ··· 688 686 res = r8712_xmitframe_coalesce(padapter, 689 687 pxmitframe->pkt, pxmitframe); 690 688 /* always return ndis_packet after 691 - * r8712_xmitframe_coalesce */ 689 + * r8712_xmitframe_coalesce 690 + */ 692 691 r8712_xmit_complete(padapter, pxmitframe); 693 692 } 694 693 if (res == _SUCCESS)
+6 -3
drivers/staging/rtl8712/rtl871x_cmd.h
··· 185 185 */ 186 186 struct setkey_parm { 187 187 u8 algorithm; /* encryption algorithm, could be none, wep40, 188 - * TKIP, CCMP, wep104 */ 188 + * TKIP, CCMP, wep104 189 + */ 189 190 u8 keyid; 190 191 u8 grpkey; /* 1: this is the grpkey for 802.1x. 191 - * 0: this is the unicast key for 802.1x */ 192 + * 0: this is the unicast key for 802.1x 193 + */ 192 194 u8 key[16]; /* this could be 40 or 104 */ 193 195 }; 194 196 ··· 572 570 u8 bcn_rx_en; 573 571 u8 bcn_pass_cnt; /* fw report one beacon information to 574 572 * driver when it receives bcn_pass_cnt 575 - * beacons. */ 573 + * beacons. 574 + */ 576 575 u8 bcn_to; /* beacon TO (ms). ¡§=0¡¨ no limit.*/ 577 576 u16 bcn_itv; 578 577 u8 app_itv; /* only for VOIP mode. */
+2 -1
drivers/staging/rtl8712/rtl871x_ht.h
··· 36 36 unsigned int tx_amsdu_enable;/*for enable Tx A-MSDU */ 37 37 unsigned int tx_amdsu_maxlen; /* 1: 8k, 0:4k ; default:8k, for tx */ 38 38 unsigned int rx_ampdu_maxlen; /* for rx reordering ctrl win_sz, 39 - * updated when join_callback. */ 39 + * updated when join_callback. 40 + */ 40 41 struct ieee80211_ht_cap ht_cap; 41 42 }; 42 43
+2 -1
drivers/staging/rtl8712/rtl871x_ioctl.h
··· 68 68 69 69 struct oid_obj_priv { 70 70 unsigned char dbg; /* 0: without OID debug message 71 - * 1: with OID debug message */ 71 + * 1: with OID debug message 72 + */ 72 73 uint (*oidfuns)(struct oid_par_priv *poid_par_priv); 73 74 }; 74 75
+8 -4
drivers/staging/rtl8712/rtl871x_ioctl_set.c
··· 140 140 ETH_ALEN)) { 141 141 if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) 142 142 goto _Abort_Set_BSSID; /* driver is in 143 - * WIFI_ADHOC_MASTER_STATE */ 143 + * WIFI_ADHOC_MASTER_STATE 144 + */ 144 145 } else { 145 146 r8712_disassoc_cmd(padapter); 146 147 if (check_fwstate(pmlmepriv, _FW_LINKED)) ··· 204 203 } 205 204 } else { 206 205 goto _Abort_Set_SSID; /* driver is in 207 - * WIFI_ADHOC_MASTER_STATE */ 206 + * WIFI_ADHOC_MASTER_STATE 207 + */ 208 208 } 209 209 } 210 210 } else { ··· 256 254 (*pold_state == Ndis802_11IBSS)) { 257 255 /* will clr Linked_state before this function, 258 256 * we must have checked whether issue dis-assoc_cmd or 259 - * not */ 257 + * not 258 + */ 260 259 r8712_ind_disconnect(padapter); 261 260 } 262 261 *pold_state = networktype; 263 262 /* clear WIFI_STATION_STATE; WIFI_AP_STATE; WIFI_ADHOC_STATE; 264 - * WIFI_ADHOC_MASTER_STATE */ 263 + * WIFI_ADHOC_MASTER_STATE 264 + */ 265 265 _clr_fwstate_(pmlmepriv, WIFI_STATION_STATE | WIFI_AP_STATE | 266 266 WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE); 267 267 switch (networktype) {
+10 -5
drivers/staging/rtl8712/rtl871x_led.h
··· 72 72 SW_LED_MODE0, /* SW control 1 LED via GPIO0. It is default option. */ 73 73 SW_LED_MODE1, /* 2 LEDs, through LED0 and LED1. For ALPHA. */ 74 74 SW_LED_MODE2, /* SW control 1 LED via GPIO0, 75 - * custom for AzWave 8187 minicard. */ 75 + * custom for AzWave 8187 minicard. 76 + */ 76 77 SW_LED_MODE3, /* SW control 1 LED via GPIO0, 77 - * customized for Sercomm Printer Server case.*/ 78 + * customized for Sercomm Printer Server case. 79 + */ 78 80 SW_LED_MODE4, /*for Edimax / Belkin*/ 79 81 SW_LED_MODE5, /*for Sercomm / Belkin*/ 80 82 SW_LED_MODE6, /*for WNC / Corega*/ 81 83 HW_LED, /* HW control 2 LEDs, LED0 and LED1 (there are 4 different 82 - * control modes, see MAC.CONFIG1 for details.)*/ 84 + * control modes, see MAC.CONFIG1 for details.) 85 + */ 83 86 }; 84 87 85 88 struct LED_871x { ··· 99 96 u8 bLedWPSBlinkInProgress; 100 97 u32 BlinkTimes; /* No. times to toggle for blink.*/ 101 98 u32 BlinkingLedState; /* Next state for blinking, 102 - * either LED_ON or OFF.*/ 99 + * either LED_ON or OFF. 100 + */ 103 101 104 102 struct timer_list BlinkTimer; /* Timer object for led blinking.*/ 105 103 struct work_struct BlinkWorkItem; /* Workitem used by BlinkTimer */ ··· 119 115 120 116 /*=========================================================================== 121 117 * Interface to manipulate LED objects. 122 - *===========================================================================*/ 118 + *=========================================================================== 119 + */ 123 120 void r8712_InitSwLeds(struct _adapter *padapter); 124 121 void r8712_DeInitSwLeds(struct _adapter *padapter); 125 122 void LedControl871x(struct _adapter *padapter, enum LED_CTL_MODE LedAction);
+20 -10
drivers/staging/rtl8712/rtl871x_mlme.c
··· 403 403 404 404 405 405 /* If we didn't find a match, then get a new network slot to initialize 406 - * with this beacon's information */ 406 + * with this beacon's information 407 + */ 407 408 if (end_of_queue_search(phead, plist)) { 408 409 if (list_empty(&pmlmepriv->free_bss_pool.queue)) { 409 410 /* If there are no more slots, expire the oldest */ ··· 927 926 if (psta != NULL) { 928 927 /*the sta have been in sta_info_queue => do nothing 929 928 *(between drv has received this event before and 930 - * fw have not yet to set key to CAM_ENTRY) */ 929 + * fw have not yet to set key to CAM_ENTRY) 930 + */ 931 931 return; 932 932 } 933 933 ··· 1173 1171 pmlmepriv->assoc_ssid.SsidLength))) { 1174 1172 if (pmlmepriv->assoc_by_rssi) { 1175 1173 /* if the ssid is the same, select the bss 1176 - * which has the max rssi*/ 1174 + * which has the max rssi 1175 + */ 1177 1176 if (pnetwork_max_rssi) { 1178 1177 if (pnetwork->network.Rssi > 1179 1178 pnetwork_max_rssi->network.Rssi) ··· 1355 1352 i = -1; /* Could not find. */ 1356 1353 } else { 1357 1354 ; /* There is one Pre-Authentication Key for the 1358 - * specific BSSID. */ 1355 + * specific BSSID. 1356 + */ 1359 1357 } 1360 1358 return i; 1361 1359 } ··· 1434 1430 if (match) { 1435 1431 if (sec_ie[0] == _WPA_IE_ID_) { 1436 1432 /* parsing SSN IE to select required encryption 1437 - * algorithm, and set the bc/mc encryption algorithm */ 1433 + * algorithm, and set the bc/mc encryption algorithm 1434 + */ 1438 1435 while (true) { 1439 1436 /*check wpa_oui tag*/ 1440 1437 if (memcmp(&sec_ie[2], &wpa_oui[0], 4)) { ··· 1449 1444 } 1450 1445 if (!memcmp(&sec_ie[8], &wpa_oui[0], 3)) { 1451 1446 /* get bc/mc encryption type (group 1452 - * key type)*/ 1447 + * key type) 1448 + */ 1453 1449 switch (sec_ie[11]) { 1454 1450 case 0x0: /*none*/ 1455 1451 psecuritypriv->XGrpPrivacy = ··· 1488 1482 } /*else the uncst_oui is match*/ 1489 1483 } else { /*mixed mode, unicast_enc_type > 1*/ 1490 1484 /*select the uncst_oui and remove 1491 - * the other uncst_oui*/ 1485 + * the other uncst_oui 1486 + */ 1492 1487 cnt = sec_ie[12]; 1493 1488 remove_cnt = (cnt - 1) * 4; 1494 1489 sec_ie[12] = 0x01; ··· 1506 1499 } 1507 1500 if (authmode == _WPA2_IE_ID_) { 1508 1501 /* parsing RSN IE to select required encryption 1509 - * algorithm, and set the bc/mc encryption algorithm */ 1502 + * algorithm, and set the bc/mc encryption algorithm 1503 + */ 1510 1504 while (true) { 1511 1505 if ((sec_ie[2] != 0x01) || (sec_ie[3] != 0x0)) { 1512 1506 /*IE Ver error*/ ··· 1551 1543 } /*else the uncst_oui is match*/ 1552 1544 } else { /*mixed mode, unicast_enc_type > 1*/ 1553 1545 /*select the uncst_oui and remove the 1554 - * other uncst_oui*/ 1546 + * other uncst_oui 1547 + */ 1555 1548 cnt = sec_ie[8]; 1556 1549 remove_cnt = (cnt - 1) * 4; 1557 1550 sec_ie[8] = 0x01; ··· 1676 1667 struct ht_priv *phtpriv = &pmlmepriv->htpriv; 1677 1668 1678 1669 /* todo: if you want to do something io/reg/hw setting before join_bss, 1679 - * please add code here */ 1670 + * please add code here 1671 + */ 1680 1672 phtpriv->ampdu_enable = false;/*reset to disabled*/ 1681 1673 for (i = 0; i < 16; i++) 1682 1674 phtpriv->baddbareq_issued[i] = false;/*reset it*/
+8 -4
drivers/staging/rtl8712/rtl871x_mlme.h
··· 47 47 #define WIFI_ADHOC_MASTER_STATE 0x00000040 48 48 #define WIFI_UNDER_LINKING 0x00000080 49 49 #define WIFI_SITE_MONITOR 0x00000800 /* to indicate the station 50 - * is under site surveying*/ 50 + * is under site surveying 51 + */ 51 52 #define WIFI_MP_STATE 0x00010000 52 53 #define WIFI_MP_CTX_BACKGROUND 0x00020000 /* in cont. tx background*/ 53 54 #define WIFI_MP_CTX_ST 0x00040000 /* in cont. tx with 54 - * single-tone*/ 55 + * single-tone 56 + */ 55 57 #define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 /* pending in cont, tx 56 - * background due to out of skb*/ 58 + * background due to out of skb 59 + */ 57 60 #define WIFI_MP_CTX_CCK_HW 0x00100000 /* in continuous tx*/ 58 61 #define WIFI_MP_CTX_CCK_CS 0x00200000 /* in cont, tx with carrier 59 - * suppression*/ 62 + * suppression 63 + */ 60 64 #define WIFI_MP_LPBK_STATE 0x00400000 61 65 62 66 #define _FW_UNDER_LINKING WIFI_UNDER_LINKING
+2 -1
drivers/staging/rtl8712/rtl871x_mp.c
··· 376 376 /* Use PHY_REG.txt default value. Do not need to change. 377 377 * Correct the tx power for CCK rate in 40M. 378 378 * Set Control channel to upper or lower. These settings are 379 - * required only for 40MHz */ 379 + * required only for 40MHz 380 + */ 380 381 set_bb_reg(pAdapter, rCCK0_System, bCCKSideBand, 381 382 (HAL_PRIME_CHNL_OFFSET_DONT_CARE >> 1)); 382 383 set_bb_reg(pAdapter, rOFDM1_LSTF, 0xC00,
+2 -1
drivers/staging/rtl8712/rtl871x_mp.h
··· 108 108 unsigned char network_macaddr[6]; 109 109 /*Testing Flag*/ 110 110 u32 mode;/*0 for normal type packet, 111 - * 1 for loopback packet (16bytes TXCMD)*/ 111 + * 1 for loopback packet (16bytes TXCMD) 112 + */ 112 113 sint prev_fw_state; 113 114 u8 *pallocated_mp_xmitframe_buf; 114 115 u8 *pmp_xmtframe_buf;
+26 -13
drivers/staging/rtl8712/rtl871x_mp_ioctl.h
··· 158 158 {1, oid_null_function}, /*0x05 OID_RT_PRO_SET_SCRAMBLER*/ 159 159 {1, oid_null_function}, /*0x06 OID_RT_PRO_SET_FILTER_BB*/ 160 160 {1, oid_null_function}, /*0x07 161 - * OID_RT_PRO_SET_MANUAL_DIVERS_BB*/ 161 + * OID_RT_PRO_SET_MANUAL_DIVERS_BB 162 + */ 162 163 {1, oid_rt_pro_set_channel_direct_call_hdl}, /*0x08*/ 163 164 {1, oid_null_function}, /*0x09 164 - * OID_RT_PRO_SET_SLEEP_MODE_DIRECT_CALL*/ 165 + * OID_RT_PRO_SET_SLEEP_MODE_DIRECT_CALL 166 + */ 165 167 {1, oid_null_function}, /*0x0A 166 - * OID_RT_PRO_SET_WAKE_MODE_DIRECT_CALL*/ 168 + * OID_RT_PRO_SET_WAKE_MODE_DIRECT_CALL 169 + */ 167 170 {1, oid_rt_pro_set_continuous_tx_hdl}, /*0x0B 168 - * OID_RT_PRO_SET_TX_CONTINUOUS_DIRECT_CALL*/ 171 + * OID_RT_PRO_SET_TX_CONTINUOUS_DIRECT_CALL 172 + */ 169 173 {1, oid_rt_pro_set_single_carrier_tx_hdl}, /*0x0C 170 - * OID_RT_PRO_SET_SINGLE_CARRIER_TX_CONTINUOUS*/ 174 + * OID_RT_PRO_SET_SINGLE_CARRIER_TX_CONTINUOUS 175 + */ 171 176 {1, oid_null_function}, /*0x0D 172 - * OID_RT_PRO_SET_TX_ANTENNA_BB*/ 177 + * OID_RT_PRO_SET_TX_ANTENNA_BB 178 + */ 173 179 {1, oid_rt_pro_set_antenna_bb_hdl}, /*0x0E*/ 174 180 {1, oid_null_function}, /*0x0F OID_RT_PRO_SET_CR_SCRAMBLER*/ 175 181 {1, oid_null_function}, /*0x10 OID_RT_PRO_SET_CR_NEW_FILTER*/ 176 182 {1, oid_rt_pro_set_tx_power_control_hdl}, /*0x11 177 - * OID_RT_PRO_SET_TX_POWER_CONTROL*/ 183 + * OID_RT_PRO_SET_TX_POWER_CONTROL 184 + */ 178 185 {1, oid_null_function}, /*0x12 OID_RT_PRO_SET_CR_TX_CONFIG*/ 179 186 {1, oid_null_function}, /*0x13 180 - * OID_RT_PRO_GET_TX_POWER_CONTROL*/ 187 + * OID_RT_PRO_GET_TX_POWER_CONTROL 188 + */ 181 189 {1, oid_null_function}, /*0x14 182 - * OID_RT_PRO_GET_CR_SIGNAL_QUALITY*/ 190 + * OID_RT_PRO_GET_CR_SIGNAL_QUALITY 191 + */ 183 192 {1, oid_null_function}, /*0x15 OID_RT_PRO_SET_CR_SETPOINT*/ 184 193 {1, oid_null_function}, /*0x16 OID_RT_PRO_SET_INTEGRATOR*/ 185 194 {1, oid_null_function}, /*0x17 OID_RT_PRO_SET_SIGNAL_QUALITY*/ ··· 212 203 {1, oid_rt_pro_query_rx_packet_received_hdl}, /*0x26*/ 213 204 {1, oid_rt_pro_query_rx_packet_crc32_error_hdl},/*0x27*/ 214 205 {1, oid_null_function}, /*0x28 215 - *OID_RT_PRO_QUERY_CURRENT_ADDRESS*/ 206 + *OID_RT_PRO_QUERY_CURRENT_ADDRESS 207 + */ 216 208 {1, oid_null_function}, /*0x29 217 - *OID_RT_PRO_QUERY_PERMANENT_ADDRESS*/ 209 + *OID_RT_PRO_QUERY_PERMANENT_ADDRESS 210 + */ 218 211 {1, oid_null_function}, /*0x2A 219 - *OID_RT_PRO_SET_PHILIPS_RF_PARAMETERS*/ 212 + *OID_RT_PRO_SET_PHILIPS_RF_PARAMETERS 213 + */ 220 214 {1, oid_rt_pro_set_carrier_suppression_tx_hdl},/*0x2B 221 - *OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX*/ 215 + *OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX 216 + */ 222 217 {1, oid_null_function}, /*0x2C OID_RT_PRO_RECEIVE_PACKET*/ 223 218 {1, oid_null_function}, /*0x2D OID_RT_PRO_WRITE_EEPROM_BYTE*/ 224 219 {1, oid_null_function}, /*0x2E OID_RT_PRO_READ_EEPROM_BYTE*/
+22 -11
drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
··· 82 82 * 3. Page8(0x800) 83 83 */ 84 84 #define rFPGA0_RFMOD 0x800 /*RF mode & CCK TxSC RF 85 - * BW Setting?? */ 85 + * BW Setting?? 86 + */ 86 87 #define rFPGA0_TxInfo 0x804 /* Status report?? */ 87 88 #define rFPGA0_PSDFunction 0x808 88 89 #define rFPGA0_TxGainStage 0x80c /* Set TX PWR init gain? */ ··· 120 119 121 120 #define rFPGA0_AnalogParameter1 0x880 /* Crystal cap setting 122 121 * RF-R/W protection 123 - * for parameter4?? */ 122 + * for parameter4?? 123 + */ 124 124 #define rFPGA0_AnalogParameter2 0x884 125 125 #define rFPGA0_AnalogParameter3 0x888 /* Useless now */ 126 126 #define rFPGA0_AnalogParameter4 0x88c ··· 148 146 * 5. PageA(0xA00) 149 147 * 150 148 * Set Control channel to upper or lower. 151 - * These settings are required only for 40MHz */ 149 + * These settings are required only for 40MHz 150 + */ 152 151 #define rCCK0_System 0xa00 153 152 154 153 #define rCCK0_AFESetting 0xa04 /* Disable init gain now */ ··· 158 155 #define rCCK0_RxAGC1 0xa0c 159 156 /* AGC default value, saturation level 160 157 * Antenna Diversity, RX AGC, LNA Threshold, RX LNA Threshold useless now. 161 - * Not the same as 90 series */ 158 + * Not the same as 90 series 159 + */ 162 160 #define rCCK0_RxAGC2 0xa10 /* AGC & DAGC */ 163 161 164 162 #define rCCK0_RxHP 0xa14 165 163 166 164 #define rCCK0_DSPParameter1 0xa18 /* Timing recovery & Channel 167 - * estimation threshold */ 165 + * estimation threshold 166 + */ 168 167 #define rCCK0_DSPParameter2 0xa1c /* SQ threshold */ 169 168 170 169 #define rCCK0_TxFilter1 0xa20 171 170 #define rCCK0_TxFilter2 0xa24 172 171 #define rCCK0_DebugPort 0xa28 /* debug port and Tx filter3 */ 173 172 #define rCCK0_FalseAlarmReport 0xa2c /* 0xa2d useless now 0xa30-a4f 174 - * channel report */ 173 + * channel report 174 + */ 175 175 #define rCCK0_TRSSIReport 0xa50 176 176 #define rCCK0_RxReport 0xa54 /* 0xa57 */ 177 177 #define rCCK0_FACounterLower 0xa5c /* 0xa5b */ ··· 199 193 #define rOFDM0_XDRxIQImbalance 0xc2c 200 194 201 195 #define rOFDM0_RxDetector1 0xc30 /* PD,BW & SBD DM tune 202 - * init gain */ 196 + * init gain 197 + */ 203 198 #define rOFDM0_RxDetector2 0xc34 /* SBD & Fame Sync. */ 204 199 #define rOFDM0_RxDetector3 0xc38 /* Frame Sync. */ 205 200 #define rOFDM0_RxDetector4 0xc3c /* PD, SBD, Frame Sync & 206 - * Short-GI */ 201 + * Short-GI 202 + */ 207 203 208 204 #define rOFDM0_RxDSP 0xc40 /* Rx Sync Path */ 209 205 #define rOFDM0_CFOandDAGC 0xc44 /* CFO & DAGC */ ··· 291 283 #define rTxAGC_Mcs15_Mcs12 0xe1c 292 284 293 285 /* Analog- control in RX_WAIT_CCA : REG: EE0 294 - * [Analog- Power & Control Register] */ 286 + * [Analog- Power & Control Register] 287 + */ 295 288 #define rRx_Wait_CCCA 0xe70 296 289 #define rAnapar_Ctrl_BB 0xee0 297 290 ··· 380 371 /* 381 372 * Bit Mask 382 373 * 383 - * 1. Page1(0x100) */ 374 + * 1. Page1(0x100) 375 + */ 384 376 #define bBBResetB 0x100 /* Useless now? */ 385 377 #define bGlobalResetB 0x200 386 378 #define bOFDMTxStart 0x4 ··· 928 918 #define bPesudoNoiseState_D 0xffff0000 929 919 930 920 /* 7. RF Register 931 - * Zebra1 */ 921 + * Zebra1 922 + */ 932 923 #define bZebra1_HSSIEnable 0x8 /* Useless */ 933 924 #define bZebra1_TRxControl 0xc00 934 925 #define bZebra1_TRxGainSetting 0x07f
+2 -1
drivers/staging/rtl8712/rtl871x_pwrctrl.c
··· 52 52 pwrpriv->cpwm = val8; 53 53 break; 54 54 case PS_STATE_S2:/* only for USB normal powersave mode use, 55 - * temp mark some code. */ 55 + * temp mark some code. 56 + */ 56 57 case PS_STATE_S3: 57 58 case PS_STATE_S4: 58 59 pwrpriv->cpwm = val8;
+2 -1
drivers/staging/rtl8712/rtl871x_pwrctrl.h
··· 91 91 struct mutex mutex_lock; 92 92 /*volatile*/ u8 rpwm; /* requested power state for fw */ 93 93 /* fw current power state. updated when 1. read from HCPWM or 94 - * 2. driver lowers power level */ 94 + * 2. driver lowers power level 95 + */ 95 96 /*volatile*/ u8 cpwm; 96 97 /*volatile*/ u8 tog; /* toggling */ 97 98 /*volatile*/ u8 cpwm_tog; /* toggling */
+16 -8
drivers/staging/rtl8712/rtl871x_recv.c
··· 265 265 266 266 if ((psta != NULL) && (psta->ieee8021x_blocked)) { 267 267 /* blocked 268 - * only accept EAPOL frame */ 268 + * only accept EAPOL frame 269 + */ 269 270 if (ether_type == 0x888e) { 270 271 prtnframe = precv_frame; 271 272 } else { ··· 278 277 } else { 279 278 /* allowed 280 279 * check decryption status, and decrypt the 281 - * frame if needed */ 280 + * frame if needed 281 + */ 282 282 prtnframe = precv_frame; 283 283 /* check is the EAPOL frame or not (Rekey) */ 284 284 if (ether_type == 0x888e) { ··· 336 334 sta_addr = pattrib->src; 337 335 } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { 338 336 /* For Station mode, sa and bssid should always be BSSID, 339 - * and DA is my mac-address */ 337 + * and DA is my mac-address 338 + */ 340 339 if (memcmp(pattrib->bssid, pattrib->src, ETH_ALEN)) 341 340 return _FAIL; 342 341 sta_addr = pattrib->bssid; 343 342 } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { 344 343 if (bmcast) { 345 344 /* For AP mode, if DA == MCAST, then BSSID should 346 - * be also MCAST */ 345 + * be also MCAST 346 + */ 347 347 if (!IS_MCAST(pattrib->bssid)) 348 348 return _FAIL; 349 349 } else { /* not mc-frame */ 350 350 /* For AP mode, if DA is non-MCAST, then it must be 351 - * BSSID, and bssid == BSSID */ 351 + * BSSID, and bssid == BSSID 352 + */ 352 353 if (memcmp(pattrib->bssid, pattrib->dst, ETH_ALEN)) 353 354 return _FAIL; 354 355 sta_addr = pattrib->src; ··· 396 391 if ((GetFrameSubType(ptr)) == WIFI_DATA_NULL) 397 392 return _FAIL; 398 393 /* drop QoS-SubType Data, including QoS NULL, 399 - * excluding QoS-Data */ 394 + * excluding QoS-Data 395 + */ 400 396 if ((GetFrameSubType(ptr) & WIFI_QOS_DATA_TYPE) == 401 397 WIFI_QOS_DATA_TYPE) { 402 398 if (GetFrameSubType(ptr) & (BIT(4) | BIT(5) | BIT(6))) ··· 451 445 if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { 452 446 /* For AP mode, if DA is non-MCAST, then it must be BSSID, 453 447 * and bssid == BSSID 454 - * For AP mode, RA=BSSID, TX=STA(SRC_ADDR), A3=DST_ADDR */ 448 + * For AP mode, RA=BSSID, TX=STA(SRC_ADDR), A3=DST_ADDR 449 + */ 455 450 if (memcmp(pattrib->bssid, mybssid, ETH_ALEN)) 456 451 return _FAIL; 457 452 *psta = r8712_get_stainfo(pstapriv, pattrib->src); ··· 626 619 (memcmp(psnap_type, (void *)SNAP_ETH_TYPE_APPLETALK_AARP, 2))) || 627 620 !memcmp(psnap, (void *)bridge_tunnel_header, SNAP_SIZE)) { 628 621 /* remove RFC1042 or Bridge-Tunnel encapsulation and 629 - * replace EtherType */ 622 + * replace EtherType 623 + */ 630 624 bsnaphdr = true; 631 625 } else { 632 626 /* Leave Ethernet header part of hdr and full payload */
+6 -3
drivers/staging/rtl8712/rtl871x_recv.h
··· 153 153 static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz) 154 154 { 155 155 /* used for extract sz bytes from rx_data, update rx_data and return 156 - * the updated rx_data to the caller */ 156 + * the updated rx_data to the caller 157 + */ 157 158 if (precvframe == NULL) 158 159 return NULL; 159 160 precvframe->u.hdr.rx_data += sz; ··· 170 169 { 171 170 /* used for append sz bytes from ptr to rx_tail, update rx_tail and 172 171 * return the updated rx_tail to the caller 173 - * after putting, rx_tail must be still larger than rx_end. */ 172 + * after putting, rx_tail must be still larger than rx_end. 173 + */ 174 174 if (precvframe == NULL) 175 175 return NULL; 176 176 precvframe->u.hdr.rx_tail += sz; ··· 188 186 /* rmv data from rx_tail (by yitsen) 189 187 * used for extract sz bytes from rx_end, update rx_end and return the 190 188 * updated rx_end to the caller 191 - * after pulling, rx_end must be still larger than rx_data. */ 189 + * after pulling, rx_end must be still larger than rx_data. 190 + */ 192 191 if (precvframe == NULL) 193 192 return NULL; 194 193 precvframe->u.hdr.rx_tail -= sz;
+16 -8
drivers/staging/rtl8712/rtl871x_security.h
··· 90 90 91 91 struct security_priv { 92 92 u32 AuthAlgrthm; /* 802.11 auth, could be open, shared, 93 - * 8021x and authswitch */ 93 + * 8021x and authswitch 94 + */ 94 95 u32 PrivacyAlgrthm; /* This specify the privacy for shared 95 - * auth. algorithm. */ 96 + * auth. algorithm. 97 + */ 96 98 u32 PrivacyKeyIndex; /* this is only valid for legendary 97 - * wep, 0~3 for key id. */ 99 + * wep, 0~3 for key id. 100 + */ 98 101 union Keytype DefKey[4]; /* this is only valid for def. key */ 99 102 u32 DefKeylen[4]; 100 103 u32 XGrpPrivacy; /* This specify the privacy algthm. 101 - * used for Grp key */ 104 + * used for Grp key 105 + */ 102 106 u32 XGrpKeyid; /* key id used for Grp Key */ 103 107 union Keytype XGrpKey[2]; /* 802.1x Group Key, for 104 - * inx0 and inx1 */ 108 + * inx0 and inx1 109 + */ 105 110 union Keytype XGrptxmickey[2]; 106 111 union Keytype XGrprxmickey[2]; 107 112 union pn48 Grptxpn; /* PN48 used for Grp Key xmit. */ ··· 123 118 s32 sw_encrypt; /* from registry_priv */ 124 119 s32 sw_decrypt; /* from registry_priv */ 125 120 s32 hw_decrypted; /* if the rx packets is hw_decrypted==false, 126 - * it means the hw has not been ready. */ 121 + * it means the hw has not been ready. 122 + */ 127 123 u32 ndisauthtype; /* keeps the auth_type & enc_status from upper 128 - * layer ioctl(wpa_supplicant or wzc) */ 124 + * layer ioctl(wpa_supplicant or wzc) 125 + */ 129 126 u32 ndisencryptstatus; 130 127 struct wlan_bssid_ex sec_bss; /* for joinbss (h2c buffer) usage */ 131 128 struct NDIS_802_11_WEP ndiswep; ··· 143 136 u32 btkip_countermeasure_time; 144 137 /*------------------------------------------------------------------- 145 138 * For WPA2 Pre-Authentication. 146 - *------------------------------------------------------------------ */ 139 + *------------------------------------------------------------------ 140 + **/ 147 141 struct RT_PMKID_LIST PMKIDList[NUM_PMKID_CACHE]; 148 142 u8 PMKIDIndex; 149 143 };
+2 -1
drivers/staging/rtl8712/rtl871x_sta_mgt.c
··· 188 188 _r8712_init_sta_xmit_priv(&psta->sta_xmitpriv); 189 189 _r8712_init_sta_recv_priv(&psta->sta_recvpriv); 190 190 /* for A-MPDU Rx reordering buffer control, 191 - * cancel reordering_ctrl_timer */ 191 + * cancel reordering_ctrl_timer 192 + */ 192 193 for (i = 0; i < 16; i++) { 193 194 preorder_ctrl = &psta->recvreorder_ctrl[i]; 194 195 del_timer(&preorder_ctrl->reordering_ctrl_timer);
+12 -6
drivers/staging/rtl8712/rtl871x_xmit.c
··· 204 204 205 205 { 206 206 /*If driver xmit ARP packet, driver can set ps mode to initial 207 - * setting. It stands for getting DHCP or fix IP.*/ 207 + * setting. It stands for getting DHCP or fix IP. 208 + */ 208 209 if (pattrib->ether_type == 0x0806) { 209 210 if (padapter->pwrctrlpriv.pwr_mode != 210 211 padapter->registrypriv.power_mgnt) { ··· 233 232 if (pattrib->ether_type != 0x8712) 234 233 return _FAIL; 235 234 /* for mp storing the txcmd per packet, 236 - * according to the info of txcmd to update pattrib */ 235 + * according to the info of txcmd to update pattrib 236 + */ 237 237 /*get MP_TXDESC_SIZE bytes txcmd per packet*/ 238 238 _r8712_pktfile_read(&pktfile, (u8 *)&txdesc, TXDESC_SIZE); 239 239 memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); ··· 246 244 if (pattrib->ether_type == ETH_P_IP) { 247 245 /* The following is for DHCP and ARP packet, we use cck1M to 248 246 * tx these packets and let LPS awake some time 249 - * to prevent DHCP protocol fail */ 247 + * to prevent DHCP protocol fail 248 + */ 250 249 u8 tmp[24]; 251 250 252 251 _r8712_pktfile_read(&pktfile, &tmp[0], 24); ··· 258 255 ((tmp[21] == 67) && (tmp[23] == 68))) { 259 256 /* 68 : UDP BOOTP client 260 257 * 67 : UDP BOOTP server 261 - * Use low rate to send DHCP packet.*/ 258 + * Use low rate to send DHCP packet. 259 + */ 262 260 pattrib->dhcp_pkt = 1; 263 261 } 264 262 } ··· 341 337 else 342 338 pattrib->bswenc = false; 343 339 /* if in MP_STATE, update pkt_attrib from mp_txcmd, and overwrite 344 - * some settings above.*/ 340 + * some settings above. 341 + */ 345 342 if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) 346 343 pattrib->priority = (txdesc.txdw1 >> QSEL_SHT) & 0x1f; 347 344 return _SUCCESS; ··· 443 438 } 444 439 r8712_secgetmic(&micdata, &(mic[0])); 445 440 /* add mic code and add the mic code length in 446 - * last_txcmdsz */ 441 + * last_txcmdsz 442 + */ 447 443 memcpy(payload, &(mic[0]), 8); 448 444 pattrib->last_txcmdsz += 8; 449 445 payload = payload - pattrib->last_txcmdsz + 8;
+8 -4
drivers/staging/rtl8712/rtl871x_xmit.h
··· 58 58 } while (0) 59 59 60 60 /* Fixed the Big Endian bug when doing the Tx. 61 - * The Linksys WRH54G will check this.*/ 61 + * The Linksys WRH54G will check this. 62 + */ 62 63 #define TKIP_IV(pattrib_iv, txpn, keyidx)\ 63 64 do { \ 64 65 pattrib_iv[0] = txpn._byte_.TSC1;\ ··· 106 105 u16 seqnum; 107 106 u16 ether_type; 108 107 u16 pktlen; /* the original 802.3 pkt raw_data len 109 - * (not include ether_hdr data) */ 108 + * (not include ether_hdr data) 109 + */ 110 110 u16 last_txcmdsz; 111 111 112 112 u8 pkt_hdrlen; /*the original 802.3 pkt header len*/ ··· 121 119 122 120 u8 priority; 123 121 u8 encrypt; /* when 0 indicate no encrypt. when non-zero, 124 - * indicate the encrypt algorithm*/ 122 + * indicate the encrypt algorithm 123 + */ 125 124 u8 iv_len; 126 125 u8 icv_len; 127 126 unsigned char iv[8]; ··· 179 176 spinlock_t lock; 180 177 sint option; 181 178 sint apsd_setting; /* When bit mask is on, the associated edca 182 - * queue supports APSD.*/ 179 + * queue supports APSD. 180 + */ 183 181 struct tx_servq be_q; /* priority == 0,3 */ 184 182 struct tx_servq bk_q; /* priority == 1,2*/ 185 183 struct tx_servq vi_q; /*priority == 4,5*/
+2 -1
drivers/staging/rtl8712/usb_halinit.c
··· 196 196 msleep(20); 197 197 /* Revised POS, */ 198 198 /* Enable AFE Macro Block's Bandgap and Enable AFE Macro 199 - * Block's Mbias */ 199 + * Block's Mbias 200 + */ 200 201 r8712_write8(padapter, SPS0_CTRL + 1, 0x53); 201 202 r8712_write8(padapter, SPS0_CTRL, 0x57); 202 203 val8 = r8712_read8(padapter, AFE_MISC);
+8 -4
drivers/staging/rtl8712/usb_intf.c
··· 301 301 /*disable_hw_interrupt*/ 302 302 if (!padapter->bSurpriseRemoved) { 303 303 /*device still exists, so driver can do i/o operation 304 - * TODO: */ 304 + * TODO: 305 + */ 305 306 } 306 307 307 308 /* cancel in irp */ ··· 612 611 } 613 612 614 613 /* rmmod module & unplug(SurpriseRemoved) will call r871xu_dev_remove() 615 - * => how to recognize both */ 614 + * => how to recognize both 615 + */ 616 616 static void r871xu_dev_remove(struct usb_interface *pusb_intf) 617 617 { 618 618 struct net_device *pnetdev = usb_get_intfdata(pusb_intf); ··· 637 635 r8712_free_drv_sw(padapter); 638 636 639 637 /* decrease the reference count of the usb device structure 640 - * when disconnect */ 638 + * when disconnect 639 + */ 641 640 usb_put_dev(udev); 642 641 } 643 642 /* If we didn't unplug usb dongle and remove/insert module, driver 644 643 * fails on sitesurvey for the first time when device is up. 645 - * Reset usb port for sitesurvey fail issue. */ 644 + * Reset usb port for sitesurvey fail issue. 645 + */ 646 646 if (udev->state != USB_STATE_NOTATTACHED) 647 647 usb_reset_device(udev); 648 648 }
+10 -5
drivers/staging/rtl8712/wifi.h
··· 376 376 377 377 /*----------------------------------------------------------------------------- 378 378 Below is for the security related definition 379 - ------------------------------------------------------------------------------*/ 379 + *----------------------------------------------------------------------------- 380 + */ 380 381 #define _RESERVED_FRAME_TYPE_ 0 381 382 #define _SKB_FRAME_TYPE_ 2 382 383 #define _PRE_ALLOCMEM_ 1 ··· 421 420 422 421 /* --------------------------------------------------------------------------- 423 422 Below is the fixed elements... 424 - -----------------------------------------------------------------------------*/ 423 + * --------------------------------------------------------------------------- 424 + */ 425 425 #define _AUTH_ALGM_NUM_ 2 426 426 #define _AUTH_SEQ_NUM_ 2 427 427 #define _BEACON_ITERVAL_ 2 ··· 450 448 451 449 /*----------------------------------------------------------------------------- 452 450 Below is the definition for 802.11i / 802.1x 453 - ------------------------------------------------------------------------------*/ 451 + *------------------------------------------------------------------------------ 452 + */ 454 453 #define _IEEE8021X_MGT_ 1 /*WPA */ 455 454 #define _IEEE8021X_PSK_ 2 /* WPA with pre-shared key */ 456 455 457 456 /*----------------------------------------------------------------------------- 458 457 Below is the definition for WMM 459 - ------------------------------------------------------------------------------*/ 458 + *------------------------------------------------------------------------------ 459 + */ 460 460 #define _WMM_IE_Length_ 7 /* for WMM STA */ 461 461 #define _WMM_Para_Element_Length_ 24 462 462 463 463 464 464 /*----------------------------------------------------------------------------- 465 465 Below is the definition for 802.11n 466 - ------------------------------------------------------------------------------*/ 466 + *------------------------------------------------------------------------------ 467 + */ 467 468 468 469 /* block-ack parameters */ 469 470 #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002
+4 -2
drivers/staging/rtl8712/wlan_bssdef.h
··· 171 171 struct NDIS_802_11_WEP { 172 172 u32 Length; /* Length of this structure */ 173 173 u32 KeyIndex; /* 0 is the per-client key, 174 - * 1-N are the global keys */ 174 + * 1-N are the global keys 175 + */ 175 176 u32 KeyLength; /* length of key in bytes */ 176 177 u8 KeyMaterial[16]; /* variable length depending on above field */ 177 178 }; ··· 195 194 struct list_head list; 196 195 int network_type; /*refer to ieee80211.h for WIRELESS_11A/B/G */ 197 196 int fixed; /* set to fixed when not to be removed asi 198 - * site-surveying */ 197 + * site-surveying 198 + */ 199 199 unsigned int last_scanned; /*timestamp for the network */ 200 200 int aid; /*will only be valid when a BSS is joined. */ 201 201 int join_res;