Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 15df6c2b922de3088203ad90347a30d31ccca67e

Authored by Charles Clément
Committed by Greg Kroah-Hartman
1 parent 2989e96f17
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Staging: vt6655: remove PWORD typedef 

Use unsigned short * instead.

Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 21 changed files with 131 additions and 133 deletions Side-by-side Diff

drivers/staging/vt6655/80211mgr.c
Diff comments   View file @ 15df6c2
... ... @@ -99,9 +99,9 @@
99 99 // Fixed Fields
100 100 pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
101 101 + WLAN_BEACON_OFF_TS);
102   - pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  102 + pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
103 103 + WLAN_BEACON_OFF_BCN_INT);
104   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  104 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
105 105 + WLAN_BEACON_OFF_CAPINFO);
106 106  
107 107 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_BEACON_OFF_SSID;
108 108  
... ... @@ -133,9 +133,9 @@
133 133 // Fixed Fields
134 134 pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
135 135 + WLAN_BEACON_OFF_TS);
136   - pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  136 + pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
137 137 + WLAN_BEACON_OFF_BCN_INT);
138   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  138 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
139 139 + WLAN_BEACON_OFF_CAPINFO);
140 140  
141 141 // Information elements
... ... @@ -296,7 +296,7 @@
296 296  
297 297  
298 298 // Fixed Fields
299   - pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  299 + pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
300 300 + WLAN_DISASSOC_OFF_REASON);
301 301 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DISASSOC_OFF_REASON + sizeof(*(pFrame->pwReason));
302 302  
... ... @@ -323,7 +323,7 @@
323 323 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
324 324  
325 325 // Fixed Fields
326   - pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  326 + pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
327 327 + WLAN_DISASSOC_OFF_REASON);
328 328  
329 329 return;
330 330  
... ... @@ -348,9 +348,9 @@
348 348 {
349 349 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
350 350 // Fixed Fields
351   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  351 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
352 352 + WLAN_ASSOCREQ_OFF_CAP_INFO);
353   - pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  353 + pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
354 354 + WLAN_ASSOCREQ_OFF_LISTEN_INT);
355 355 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCREQ_OFF_LISTEN_INT + sizeof(*(pFrame->pwListenInterval));
356 356 return;
357 357  
... ... @@ -377,9 +377,9 @@
377 377  
378 378 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
379 379 // Fixed Fields
380   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  380 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
381 381 + WLAN_ASSOCREQ_OFF_CAP_INFO);
382   - pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  382 + pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
383 383 + WLAN_ASSOCREQ_OFF_LISTEN_INT);
384 384  
385 385 // Information elements
386 386  
387 387  
... ... @@ -442,11 +442,11 @@
442 442 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
443 443  
444 444 // Fixed Fields
445   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  445 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
446 446 + WLAN_ASSOCRESP_OFF_CAP_INFO);
447   - pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  447 + pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
448 448 + WLAN_ASSOCRESP_OFF_STATUS);
449   - pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  449 + pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
450 450 + WLAN_ASSOCRESP_OFF_AID);
451 451 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCRESP_OFF_AID
452 452 + sizeof(*(pFrame->pwAid));
453 453  
454 454  
... ... @@ -476,11 +476,11 @@
476 476 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
477 477  
478 478 // Fixed Fields
479   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  479 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
480 480 + WLAN_ASSOCRESP_OFF_CAP_INFO);
481   - pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  481 + pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
482 482 + WLAN_ASSOCRESP_OFF_STATUS);
483   - pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  483 + pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
484 484 + WLAN_ASSOCRESP_OFF_AID);
485 485  
486 486 // Information elements
487 487  
... ... @@ -521,9 +521,9 @@
521 521 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
522 522  
523 523 // Fixed Fields
524   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  524 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
525 525 + WLAN_REASSOCREQ_OFF_CAP_INFO);
526   - pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  526 + pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
527 527 + WLAN_REASSOCREQ_OFF_LISTEN_INT);
528 528 pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
529 529 + WLAN_REASSOCREQ_OFF_CURR_AP);
530 530  
... ... @@ -554,9 +554,9 @@
554 554 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
555 555  
556 556 // Fixed Fields
557   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  557 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
558 558 + WLAN_REASSOCREQ_OFF_CAP_INFO);
559   - pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  559 + pFrame->pwListenInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
560 560 + WLAN_REASSOCREQ_OFF_LISTEN_INT);
561 561 pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
562 562 + WLAN_REASSOCREQ_OFF_CURR_AP);
563 563  
... ... @@ -701,9 +701,9 @@
701 701 // Fixed Fields
702 702 pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
703 703 + WLAN_PROBERESP_OFF_TS);
704   - pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  704 + pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
705 705 + WLAN_PROBERESP_OFF_BCN_INT);
706   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  706 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
707 707 + WLAN_PROBERESP_OFF_CAP_INFO);
708 708  
709 709 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_PROBERESP_OFF_CAP_INFO +
710 710  
... ... @@ -738,9 +738,9 @@
738 738 // Fixed Fields
739 739 pFrame->pqwTimestamp = (PQWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
740 740 + WLAN_PROBERESP_OFF_TS);
741   - pFrame->pwBeaconInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  741 + pFrame->pwBeaconInterval = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
742 742 + WLAN_PROBERESP_OFF_BCN_INT);
743   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  743 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
744 744 + WLAN_PROBERESP_OFF_CAP_INFO);
745 745  
746 746 // Information elements
747 747  
748 748  
... ... @@ -847,11 +847,11 @@
847 847 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
848 848  
849 849 // Fixed Fields
850   - pFrame->pwAuthAlgorithm = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  850 + pFrame->pwAuthAlgorithm = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
851 851 + WLAN_AUTHEN_OFF_AUTH_ALG);
852   - pFrame->pwAuthSequence = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  852 + pFrame->pwAuthSequence = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
853 853 + WLAN_AUTHEN_OFF_AUTH_SEQ);
854   - pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  854 + pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
855 855 + WLAN_AUTHEN_OFF_STATUS);
856 856 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_AUTHEN_OFF_STATUS + sizeof(*(pFrame->pwStatus));
857 857  
858 858  
859 859  
... ... @@ -880,11 +880,11 @@
880 880 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
881 881  
882 882 // Fixed Fields
883   - pFrame->pwAuthAlgorithm = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  883 + pFrame->pwAuthAlgorithm = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
884 884 + WLAN_AUTHEN_OFF_AUTH_ALG);
885   - pFrame->pwAuthSequence = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  885 + pFrame->pwAuthSequence = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
886 886 + WLAN_AUTHEN_OFF_AUTH_SEQ);
887   - pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  887 + pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
888 888 + WLAN_AUTHEN_OFF_STATUS);
889 889  
890 890 // Information elements
... ... @@ -918,7 +918,7 @@
918 918 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
919 919  
920 920 // Fixed Fields
921   - pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  921 + pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
922 922 + WLAN_DEAUTHEN_OFF_REASON);
923 923 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DEAUTHEN_OFF_REASON + sizeof(*(pFrame->pwReason));
924 924  
... ... @@ -945,7 +945,7 @@
945 945 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
946 946  
947 947 // Fixed Fields
948   - pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  948 + pFrame->pwReason = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
949 949 + WLAN_DEAUTHEN_OFF_REASON);
950 950  
951 951 return;
952 952  
953 953  
... ... @@ -971,11 +971,11 @@
971 971 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
972 972  
973 973 // Fixed Fields
974   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  974 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
975 975 + WLAN_REASSOCRESP_OFF_CAP_INFO);
976   - pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  976 + pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
977 977 + WLAN_REASSOCRESP_OFF_STATUS);
978   - pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  978 + pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
979 979 + WLAN_REASSOCRESP_OFF_AID);
980 980  
981 981 pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid));
982 982  
983 983  
... ... @@ -1006,11 +1006,11 @@
1006 1006 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
1007 1007  
1008 1008 // Fixed Fields
1009   - pFrame->pwCapInfo = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  1009 + pFrame->pwCapInfo = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
1010 1010 + WLAN_REASSOCRESP_OFF_CAP_INFO);
1011   - pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  1011 + pFrame->pwStatus = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
1012 1012 + WLAN_REASSOCRESP_OFF_STATUS);
1013   - pFrame->pwAid = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
  1013 + pFrame->pwAid = (unsigned short *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
1014 1014 + WLAN_REASSOCRESP_OFF_AID);
1015 1015  
1016 1016 //Information elements
drivers/staging/vt6655/80211mgr.h
Diff comments   View file @ 15df6c2
... ... @@ -511,8 +511,8 @@
511 511 PUWLAN_80211HDR pHdr;
512 512 // fixed fields
513 513 PQWORD pqwTimestamp;
514   - PWORD pwBeaconInterval;
515   - PWORD pwCapInfo;
  514 + unsigned short *pwBeaconInterval;
  515 + unsigned short *pwCapInfo;
516 516 /*-- info elements ----------*/
517 517 PWLAN_IE_SSID pSSID;
518 518 PWLAN_IE_SUPP_RATES pSuppRates;
... ... @@ -556,7 +556,7 @@
556 556 unsigned char *pBuf;
557 557 PUWLAN_80211HDR pHdr;
558 558 /*-- fixed fields -----------*/
559   - PWORD pwReason;
  559 + unsigned short *pwReason;
560 560 /*-- info elements ----------*/
561 561  
562 562 } WLAN_FR_DISASSOC, *PWLAN_FR_DISASSOC;
... ... @@ -569,8 +569,8 @@
569 569 unsigned char *pBuf;
570 570 PUWLAN_80211HDR pHdr;
571 571 /*-- fixed fields -----------*/
572   - PWORD pwCapInfo;
573   - PWORD pwListenInterval;
  572 + unsigned short *pwCapInfo;
  573 + unsigned short *pwListenInterval;
574 574 /*-- info elements ----------*/
575 575 PWLAN_IE_SSID pSSID;
576 576 PWLAN_IE_SUPP_RATES pSuppRates;
... ... @@ -590,9 +590,9 @@
590 590 unsigned char *pBuf;
591 591 PUWLAN_80211HDR pHdr;
592 592 /*-- fixed fields -----------*/
593   - PWORD pwCapInfo;
594   - PWORD pwStatus;
595   - PWORD pwAid;
  593 + unsigned short *pwCapInfo;
  594 + unsigned short *pwStatus;
  595 + unsigned short *pwAid;
596 596 /*-- info elements ----------*/
597 597 PWLAN_IE_SUPP_RATES pSuppRates;
598 598 PWLAN_IE_SUPP_RATES pExtSuppRates;
... ... @@ -608,8 +608,8 @@
608 608 PUWLAN_80211HDR pHdr;
609 609  
610 610 /*-- fixed fields -----------*/
611   - PWORD pwCapInfo;
612   - PWORD pwListenInterval;
  611 + unsigned short *pwCapInfo;
  612 + unsigned short *pwListenInterval;
613 613 PIEEE_ADDR pAddrCurrAP;
614 614  
615 615 /*-- info elements ----------*/
... ... @@ -629,9 +629,9 @@
629 629 unsigned char *pBuf;
630 630 PUWLAN_80211HDR pHdr;
631 631 /*-- fixed fields -----------*/
632   - PWORD pwCapInfo;
633   - PWORD pwStatus;
634   - PWORD pwAid;
  632 + unsigned short *pwCapInfo;
  633 + unsigned short *pwStatus;
  634 + unsigned short *pwAid;
635 635 /*-- info elements ----------*/
636 636 PWLAN_IE_SUPP_RATES pSuppRates;
637 637 PWLAN_IE_SUPP_RATES pExtSuppRates;
... ... @@ -662,8 +662,8 @@
662 662 PUWLAN_80211HDR pHdr;
663 663 /*-- fixed fields -----------*/
664 664 PQWORD pqwTimestamp;
665   - PWORD pwBeaconInterval;
666   - PWORD pwCapInfo;
  665 + unsigned short *pwBeaconInterval;
  666 + unsigned short *pwCapInfo;
667 667 /*-- info elements ----------*/
668 668 PWLAN_IE_SSID pSSID;
669 669 PWLAN_IE_SUPP_RATES pSuppRates;
... ... @@ -690,9 +690,9 @@
690 690 unsigned char *pBuf;
691 691 PUWLAN_80211HDR pHdr;
692 692 /*-- fixed fields -----------*/
693   - PWORD pwAuthAlgorithm;
694   - PWORD pwAuthSequence;
695   - PWORD pwStatus;
  693 + unsigned short *pwAuthAlgorithm;
  694 + unsigned short *pwAuthSequence;
  695 + unsigned short *pwStatus;
696 696 /*-- info elements ----------*/
697 697 PWLAN_IE_CHALLENGE pChallenge;
698 698  
... ... @@ -706,7 +706,7 @@
706 706 unsigned char *pBuf;
707 707 PUWLAN_80211HDR pHdr;
708 708 /*-- fixed fields -----------*/
709   - PWORD pwReason;
  709 + unsigned short *pwReason;
710 710  
711 711 /*-- info elements ----------*/
712 712  
drivers/staging/vt6655/aes_ccmp.c
Diff comments   View file @ 15df6c2
... ... @@ -267,8 +267,8 @@
267 267  
268 268  
269 269 pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
270   - if ( WLAN_GET_FC_TODS(*(PWORD)pbyFrame) &&
271   - WLAN_GET_FC_FROMDS(*(PWORD)pbyFrame) ) {
  270 + if ( WLAN_GET_FC_TODS(*(unsigned short *)pbyFrame) &&
  271 + WLAN_GET_FC_FROMDS(*(unsigned short *)pbyFrame) ) {
272 272 bA4 = TRUE;
273 273 pbyIV += 6; // 6 is 802.11 address4
274 274 wHLen += 6;
drivers/staging/vt6655/baseband.c
Diff comments   View file @ 15df6c2
... ... @@ -1849,7 +1849,7 @@
1849 1849 unsigned int cbFrameLength,
1850 1850 WORD wRate,
1851 1851 BYTE byPacketType,
1852   - PWORD pwPhyLen,
  1852 + unsigned short *pwPhyLen,
1853 1853 unsigned char *pbyPhySrv,
1854 1854 unsigned char *pbyPhySgn
1855 1855 )
drivers/staging/vt6655/baseband.h
Diff comments   View file @ 15df6c2
... ... @@ -132,7 +132,7 @@
132 132 unsigned int cbFrameLength,
133 133 WORD wRate,
134 134 BYTE byPacketType,
135   - PWORD pwPhyLen,
  135 + unsigned short *pwPhyLen,
136 136 unsigned char *pbyPhySrv,
137 137 unsigned char *pbyPhySgn
138 138 );
drivers/staging/vt6655/bssdb.c
Diff comments   View file @ 15df6c2
... ... @@ -542,8 +542,8 @@
542 542 TRUE,
543 543 pQuiet->byQuietCount,
544 544 pQuiet->byQuietPeriod,
545   - *((PWORD)pQuiet->abyQuietDuration),
546   - *((PWORD)pQuiet->abyQuietOffset)
  545 + *((unsigned short *)pQuiet->abyQuietDuration),
  546 + *((unsigned short *)pQuiet->abyQuietOffset)
547 547 );
548 548 } else {
549 549 pQuiet = (PWLAN_IE_QUIET)pIE_Quiet;
... ... @@ -551,8 +551,8 @@
551 551 FALSE,
552 552 pQuiet->byQuietCount,
553 553 pQuiet->byQuietPeriod,
554   - *((PWORD)pQuiet->abyQuietDuration),
555   - *((PWORD)pQuiet->abyQuietOffset)
  554 + *((unsigned short *)pQuiet->abyQuietDuration),
  555 + *((unsigned short *)pQuiet->abyQuietOffset)
556 556 );
557 557 }
558 558 }
... ... @@ -719,8 +719,8 @@
719 719 TRUE,
720 720 pQuiet->byQuietCount,
721 721 pQuiet->byQuietPeriod,
722   - *((PWORD)pQuiet->abyQuietDuration),
723   - *((PWORD)pQuiet->abyQuietOffset)
  722 + *((unsigned short *)pQuiet->abyQuietDuration),
  723 + *((unsigned short *)pQuiet->abyQuietOffset)
724 724 );
725 725 } else {
726 726 pQuiet = (PWLAN_IE_QUIET)pIE_Quiet;
... ... @@ -728,8 +728,8 @@
728 728 FALSE,
729 729 pQuiet->byQuietCount,
730 730 pQuiet->byQuietPeriod,
731   - *((PWORD)pQuiet->abyQuietDuration),
732   - *((PWORD)pQuiet->abyQuietOffset)
  731 + *((unsigned short *)pQuiet->abyQuietDuration),
  732 + *((unsigned short *)pQuiet->abyQuietOffset)
733 733 );
734 734 }
735 735 }
... ... @@ -898,7 +898,7 @@
898 898 void
899 899 BSSvUpdateAPNode(
900 900 void *hDeviceContext,
901   - PWORD pwCapInfo,
  901 + unsigned short *pwCapInfo,
902 902 PWLAN_IE_SUPP_RATES pSuppRates,
903 903 PWLAN_IE_SUPP_RATES pExtSuppRates
904 904 )
drivers/staging/vt6655/bssdb.h
Diff comments   View file @ 15df6c2
... ... @@ -324,7 +324,7 @@
324 324 void
325 325 BSSvUpdateAPNode(
326 326 void *hDeviceContext,
327   - PWORD pwCapInfo,
  327 + unsigned short *pwCapInfo,
328 328 PWLAN_IE_SUPP_RATES pItemRates,
329 329 PWLAN_IE_SUPP_RATES pExtSuppRates
330 330 );
drivers/staging/vt6655/card.c
Diff comments   View file @ 15df6c2
... ... @@ -1748,7 +1748,7 @@
1748 1748 if (pDevice->byLocalID > REV_ID_VT3253_B1) {
1749 1749 HIDWORD(qwStartTSF) = HIDWORD(*((PQWORD) (pDevice->pCurrMeasureEID->sReq.abyStartTime)));
1750 1750 LODWORD(qwStartTSF) = LODWORD(*((PQWORD) (pDevice->pCurrMeasureEID->sReq.abyStartTime)));
1751   - wDuration = *((PWORD) (pDevice->pCurrMeasureEID->sReq.abyDuration));
  1751 + wDuration = *((unsigned short *) (pDevice->pCurrMeasureEID->sReq.abyDuration));
1752 1752 wDuration += 1; // 1 TU for channel switching
1753 1753  
1754 1754 if ((LODWORD(qwStartTSF) == 0) && (HIDWORD(qwStartTSF) == 0)) {
drivers/staging/vt6655/datarate.c
Diff comments   View file @ 15df6c2
... ... @@ -200,9 +200,9 @@
200 200 PWLAN_IE_SUPP_RATES pItemRates,
201 201 PWLAN_IE_SUPP_RATES pItemExtRates,
202 202 BOOL bUpdateBasicRate,
203   - PWORD pwMaxBasicRate,
204   - PWORD pwMaxSuppRate,
205   - PWORD pwSuppRate,
  203 + unsigned short *pwMaxBasicRate,
  204 + unsigned short *pwMaxSuppRate,
  205 + unsigned short *pwSuppRate,
206 206 unsigned char *pbyTopCCKRate,
207 207 unsigned char *pbyTopOFDMRate
208 208 )
drivers/staging/vt6655/datarate.h
Diff comments   View file @ 15df6c2
... ... @@ -60,9 +60,9 @@
60 60 PWLAN_IE_SUPP_RATES pItemRates,
61 61 PWLAN_IE_SUPP_RATES pItemExtRates,
62 62 BOOL bUpdateBasicRate,
63   - PWORD pwMaxBasicRate,
64   - PWORD pwMaxSuppRate,
65   - PWORD pwSuppRate,
  63 + unsigned short *pwMaxBasicRate,
  64 + unsigned short *pwMaxSuppRate,
  65 + unsigned short *pwSuppRate,
66 66 unsigned char *pbyTopCCKRate,
67 67 unsigned char *pbyTopOFDMRate
68 68 );
drivers/staging/vt6655/device_main.c
Diff comments   View file @ 15df6c2
... ... @@ -487,7 +487,7 @@
487 487  
488 488 for(ii=1;ii<8;ii++) {
489 489 pDevice->dwRPIs[ii] *= 255;
490   - dwDuration |= *((PWORD) (pDevice->pCurrMeasureEID->sReq.abyDuration));
  490 + dwDuration |= *((unsigned short *) (pDevice->pCurrMeasureEID->sReq.abyDuration));
491 491 dwDuration <<= 10;
492 492 pDevice->dwRPIs[ii] /= dwDuration;
493 493 pDevice->abyRPIs[ii] = (BYTE) pDevice->dwRPIs[ii];
drivers/staging/vt6655/dpc.c
Diff comments   View file @ 15df6c2
... ... @@ -124,7 +124,7 @@
124 124 unsigned char *pbyNewRsr,
125 125 PSKeyItem *pKeyOut,
126 126 int * pbExtIV,
127   - PWORD pwRxTSC15_0,
  127 + unsigned short *pwRxTSC15_0,
128 128 PDWORD pdwRxTSC47_16
129 129 );
130 130  
... ... @@ -138,7 +138,7 @@
138 138 PSKeyItem pKey,
139 139 unsigned char *pbyNewRsr,
140 140 int * pbExtIV,
141   - PWORD pwRxTSC15_0,
  141 + unsigned short *pwRxTSC15_0,
142 142 PDWORD pdwRxTSC47_16
143 143  
144 144 );
... ... @@ -175,7 +175,7 @@
175 175 {
176 176 unsigned char *pbyRxBuffer;
177 177 unsigned int cbHeaderSize = 0;
178   - PWORD pwType;
  178 + unsigned short *pwType;
179 179 PS802_11Header pMACHeader;
180 180 int ii;
181 181  
182 182  
... ... @@ -203,12 +203,12 @@
203 203 }
204 204 else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) {
205 205 cbHeaderSize += 6;
206   - pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize);
  206 + pwType = (unsigned short *) (pbyRxBufferAddr + cbHeaderSize);
207 207 if ((*pwType!= TYPE_PKT_IPX) && (*pwType != cpu_to_le16(0xF380))) {
208 208 }
209 209 else {
210 210 cbHeaderSize -= 8;
211   - pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize);
  211 + pwType = (unsigned short *) (pbyRxBufferAddr + cbHeaderSize);
212 212 if (bIsWEP) {
213 213 if (bExtIV) {
214 214 *pwType = htons(cbPacketSize - WLAN_HDR_ADDR3_LEN - 8); // 8 is IV&ExtIV
... ... @@ -223,7 +223,7 @@
223 223 }
224 224 else {
225 225 cbHeaderSize -= 2;
226   - pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize);
  226 + pwType = (unsigned short *) (pbyRxBufferAddr + cbHeaderSize);
227 227 if (bIsWEP) {
228 228 if (bExtIV) {
229 229 *pwType = htons(cbPacketSize - WLAN_HDR_ADDR3_LEN - 8); // 8 is IV&ExtIV
... ... @@ -353,7 +353,7 @@
353 353 unsigned char *pbyNewRsr;
354 354 unsigned char *pbyRSSI;
355 355 PQWORD pqwTSFTime;
356   - PWORD pwFrameSize;
  356 + unsigned short *pwFrameSize;
357 357 unsigned char *pbyFrame;
358 358 BOOL bDeFragRx = FALSE;
359 359 BOOL bIsWEP = FALSE;
... ... @@ -391,7 +391,7 @@
391 391 pDevice->rx_buf_sz, PCI_DMA_FROMDEVICE);
392 392 #endif
393 393 //PLICE_DEBUG<-
394   - pwFrameSize = (PWORD)(skb->data + 2);
  394 + pwFrameSize = (unsigned short *)(skb->data + 2);
395 395 FrameSize = cpu_to_le16(pCurrRD->m_rd1RD1.wReqCount) - cpu_to_le16(pCurrRD->m_rd0RD0.wResCount);
396 396  
397 397 // Max: 2312Payload + 30HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR
... ... @@ -1170,7 +1170,7 @@
1170 1170 unsigned char *pbyNewRsr,
1171 1171 PSKeyItem *pKeyOut,
1172 1172 int * pbExtIV,
1173   - PWORD pwRxTSC15_0,
  1173 + unsigned short *pwRxTSC15_0,
1174 1174 PDWORD pdwRxTSC47_16
1175 1175 )
1176 1176 {
... ... @@ -1186,8 +1186,8 @@
1186 1186 *pdwRxTSC47_16 = 0;
1187 1187  
1188 1188 pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
1189   - if ( WLAN_GET_FC_TODS(*(PWORD)pbyFrame) &&
1190   - WLAN_GET_FC_FROMDS(*(PWORD)pbyFrame) ) {
  1189 + if ( WLAN_GET_FC_TODS(*(unsigned short *)pbyFrame) &&
  1190 + WLAN_GET_FC_FROMDS(*(unsigned short *)pbyFrame) ) {
1191 1191 pbyIV += 6; // 6 is 802.11 address4
1192 1192 PayloadLen -= 6;
1193 1193 }
... ... @@ -1280,7 +1280,7 @@
1280 1280 if (byDecMode == KEY_CTL_TKIP) {
1281 1281 *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
1282 1282 } else {
1283   - *pwRxTSC15_0 = cpu_to_le16(*(PWORD)pbyIV);
  1283 + *pwRxTSC15_0 = cpu_to_le16(*(unsigned short *)pbyIV);
1284 1284 }
1285 1285 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC0_15: %x\n", *pwRxTSC15_0);
1286 1286  
... ... @@ -1317,7 +1317,7 @@
1317 1317 PSKeyItem pKey,
1318 1318 unsigned char *pbyNewRsr,
1319 1319 int * pbExtIV,
1320   - PWORD pwRxTSC15_0,
  1320 + unsigned short *pwRxTSC15_0,
1321 1321 PDWORD pdwRxTSC47_16
1322 1322 )
1323 1323 {
... ... @@ -1333,8 +1333,8 @@
1333 1333 *pdwRxTSC47_16 = 0;
1334 1334  
1335 1335 pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
1336   - if ( WLAN_GET_FC_TODS(*(PWORD)pbyFrame) &&
1337   - WLAN_GET_FC_FROMDS(*(PWORD)pbyFrame) ) {
  1336 + if ( WLAN_GET_FC_TODS(*(unsigned short *)pbyFrame) &&
  1337 + WLAN_GET_FC_FROMDS(*(unsigned short *)pbyFrame) ) {
1338 1338 pbyIV += 6; // 6 is 802.11 address4
1339 1339 PayloadLen -= 6;
1340 1340 }
... ... @@ -1391,7 +1391,7 @@
1391 1391 if (byDecMode == KEY_CTL_TKIP) {
1392 1392 *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
1393 1393 } else {
1394   - *pwRxTSC15_0 = cpu_to_le16(*(PWORD)pbyIV);
  1394 + *pwRxTSC15_0 = cpu_to_le16(*(unsigned short *)pbyIV);
1395 1395 }
1396 1396 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC0_15: %x\n", *pwRxTSC15_0);
1397 1397  
drivers/staging/vt6655/rxtx.c
Diff comments   View file @ 15df6c2
... ... @@ -745,11 +745,11 @@
745 745 PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead;
746 746 //Get SignalField,ServiceField,Length
747 747 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
748   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
  748 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
749 749 );
750 750 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
751 751 BBvCaculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
752   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
  752 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
753 753 );
754 754 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
755 755 //Get Duration and TimeStamp
756 756  
... ... @@ -771,11 +771,11 @@
771 771 PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead;
772 772 //Get SignalField,ServiceField,Length
773 773 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
774   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
  774 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
775 775 );
776 776 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
777 777 BBvCaculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
778   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
  778 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
779 779 );
780 780 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
781 781 //Get Duration and TimeStamp
... ... @@ -800,7 +800,7 @@
800 800 PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead;
801 801 //Get SignalField,ServiceField,Length
802 802 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
803   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
  803 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
804 804 );
805 805 pBuf->wTransmitLength = cpu_to_le16(wLen);
806 806 //Get Duration and TimeStampOff
... ... @@ -817,7 +817,7 @@
817 817 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
818 818 //Get SignalField,ServiceField,Length
819 819 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
820   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
  820 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
821 821 );
822 822 pBuf->wTransmitLength = cpu_to_le16(wLen);
823 823 //Get Duration and TimeStampOff
... ... @@ -835,7 +835,7 @@
835 835 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
836 836 //Get SignalField,ServiceField,Length
837 837 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
838   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
  838 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
839 839 );
840 840 pBuf->wTransmitLength = cpu_to_le16(wLen);
841 841 //Get Duration and TimeStampOff
842 842  
... ... @@ -883,11 +883,11 @@
883 883 PSRTS_g pBuf = (PSRTS_g)pvRTS;
884 884 //Get SignalField,ServiceField,Length
885 885 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
886   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
  886 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
887 887 );
888 888 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
889 889 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
890   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
  890 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
891 891 );
892 892 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
893 893 //Get Duration
894 894  
... ... @@ -916,11 +916,11 @@
916 916 PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS;
917 917 //Get SignalField,ServiceField,Length
918 918 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
919   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
  919 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
920 920 );
921 921 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
922 922 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
923   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
  923 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a)
924 924 );
925 925 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
926 926  
... ... @@ -958,7 +958,7 @@
958 958 PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
959 959 //Get SignalField,ServiceField,Length
960 960 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
961   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
  961 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
962 962 );
963 963 pBuf->wTransmitLength = cpu_to_le16(wLen);
964 964 //Get Duration
... ... @@ -987,7 +987,7 @@
987 987 PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS;
988 988 //Get SignalField,ServiceField,Length
989 989 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
990   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
  990 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
991 991 );
992 992 pBuf->wTransmitLength = cpu_to_le16(wLen);
993 993 //Get Duration
... ... @@ -1017,7 +1017,7 @@
1017 1017 PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
1018 1018 //Get SignalField,ServiceField,Length
1019 1019 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
1020   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
  1020 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField)
1021 1021 );
1022 1022 pBuf->wTransmitLength = cpu_to_le16(wLen);
1023 1023 //Get Duration
... ... @@ -1077,7 +1077,7 @@
1077 1077 PSCTS_FB pBuf = (PSCTS_FB)pvCTS;
1078 1078 //Get SignalField,ServiceField,Length
1079 1079 BBvCaculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
1080   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
  1080 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
1081 1081 );
1082 1082  
1083 1083  
... ... @@ -1104,7 +1104,7 @@
1104 1104 PSCTS pBuf = (PSCTS)pvCTS;
1105 1105 //Get SignalField,ServiceField,Length
1106 1106 BBvCaculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
1107   - (PWORD)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
  1107 + (unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b)
1108 1108 );
1109 1109 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
1110 1110 //Get CTSDuration_ba
... ... @@ -2703,7 +2703,7 @@
2703 2703 }
2704 2704  
2705 2705 BBvCaculateParameter(pDevice, cbFrameSize, wCurrentRate, byPktType,
2706   - (PWORD)&(wLen), (unsigned char *)&(pTxDataHead->byServiceField), (unsigned char *)&(pTxDataHead->bySignalField)
  2706 + (unsigned short *)&(wLen), (unsigned char *)&(pTxDataHead->byServiceField), (unsigned char *)&(pTxDataHead->bySignalField)
2707 2707 );
2708 2708 pTxDataHead->wTransmitLength = cpu_to_le16(wLen);
2709 2709 //Get TimeStampOff
drivers/staging/vt6655/ttype.h
Diff comments   View file @ 15df6c2
... ... @@ -92,8 +92,6 @@
92 92 // boolean pointer
93 93 typedef unsigned int * PUINT;
94 94  
95   -typedef WORD * PWORD;
96   -
97 95 typedef DWORD * PDWORD;
98 96  
99 97 typedef QWORD * PQWORD;
drivers/staging/vt6655/upc.h
Diff comments   View file @ 15df6c2
... ... @@ -82,7 +82,7 @@
82 82  
83 83  
84 84 #define VNSvInPortW(dwIOAddress, pwData) { \
85   - volatile WORD* pwAddr = ((PWORD)(dwIOAddress)); \
  85 + volatile WORD* pwAddr = ((unsigned short *)(dwIOAddress)); \
86 86 *(pwData) = readw(pwAddr); \
87 87 }
88 88  
... ... @@ -99,7 +99,7 @@
99 99  
100 100  
101 101 #define VNSvOutPortW(dwIOAddress, wData) { \
102   - volatile WORD* pwAddr = ((PWORD)(dwIOAddress)); \
  102 + volatile WORD* pwAddr = ((unsigned short *)(dwIOAddress)); \
103 103 writew((WORD)wData, pwAddr); \
104 104 }
105 105  
drivers/staging/vt6655/vntwifi.c
Diff comments   View file @ 15df6c2
... ... @@ -533,7 +533,7 @@
533 533 VNTWIFIvGetTxRate(
534 534 void *pMgmtHandle,
535 535 unsigned char *pbyDestAddress,
536   - PWORD pwTxDataRate,
  536 + unsigned short *pwTxDataRate,
537 537 unsigned char *pbyACKRate,
538 538 unsigned char *pbyCCKBasicRate,
539 539 unsigned char *pbyOFDMBasicRate
drivers/staging/vt6655/vntwifi.h
Diff comments   View file @ 15df6c2
... ... @@ -240,7 +240,7 @@
240 240 VNTWIFIvGetTxRate(
241 241 void *pMgmtHandle,
242 242 unsigned char *pbyDestAddress,
243   - PWORD pwTxDataRate,
  243 + unsigned short *pwTxDataRate,
244 244 unsigned char *pbyACKRate,
245 245 unsigned char *pbyCCKBasicRate,
246 246 unsigned char *pbyOFDMBasicRate
drivers/staging/vt6655/wcmd.c
Diff comments   View file @ 15df6c2
... ... @@ -1014,7 +1014,7 @@
1014 1014 break;
1015 1015 /*
1016 1016 case WLAN_CMD_DEAUTH:
1017   - pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].wDeAuthenReason = *((PWORD)pbyItem0);
  1017 + pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].wDeAuthenReason = *((unsigned short *)pbyItem0);
1018 1018 break;
1019 1019 */
1020 1020  
drivers/staging/vt6655/wmgr.c
Diff comments   View file @ 15df6c2
... ... @@ -3329,11 +3329,11 @@
3329 3329 // Pairwise Key Cipher Suite
3330 3330 sFrame.pRSNWPA->wPKCount = 0;
3331 3331 // Auth Key Management Suite
3332   - *((PWORD)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len))=0;
  3332 + *((unsigned short *)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len))=0;
3333 3333 sFrame.pRSNWPA->len +=2;
3334 3334  
3335 3335 // RSN Capabilites
3336   - *((PWORD)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len))=0;
  3336 + *((unsigned short *)(sFrame.pBuf + sFrame.len + sFrame.pRSNWPA->len))=0;
3337 3337 sFrame.pRSNWPA->len +=2;
3338 3338 sFrame.len += sFrame.pRSNWPA->len + WLAN_IEHDR_LEN;
3339 3339 }
... ... @@ -3800,7 +3800,7 @@
3800 3800 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
3801 3801 (pMgmt->pCurrBSS != NULL)) {
3802 3802 unsigned int ii;
3803   - PWORD pwPMKID;
  3803 + unsigned short *pwPMKID;
3804 3804  
3805 3805 // WPA IE
3806 3806 sFrame.pRSN = (PWLAN_IE_RSN)(sFrame.pBuf + sFrame.len);
... ... @@ -3865,7 +3865,7 @@
3865 3865 if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && (pDevice->bRoaming == TRUE) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
3866 3866 // RSN PMKID
3867 3867 pbyRSN = &sFrame.pRSN->abyRSN[18];
3868   - pwPMKID = (PWORD)pbyRSN; // Point to PMKID count
  3868 + pwPMKID = (unsigned short *)pbyRSN; // Point to PMKID count
3869 3869 *pwPMKID = 0; // Initialize PMKID count
3870 3870 pbyRSN += 2; // Point to PMKID list
3871 3871 for (ii = 0; ii < pDevice->gsPMKID.BSSIDInfoCount; ii++) {
... ... @@ -4056,7 +4056,7 @@
4056 4056 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
4057 4057 (pMgmt->pCurrBSS != NULL)) {
4058 4058 unsigned int ii;
4059   - PWORD pwPMKID;
  4059 + unsigned short *pwPMKID;
4060 4060  
4061 4061 /* WPA IE */
4062 4062 sFrame.pRSN = (PWLAN_IE_RSN)(sFrame.pBuf + sFrame.len);
... ... @@ -4121,7 +4121,7 @@
4121 4121 if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && (pDevice->bRoaming == TRUE) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
4122 4122 // RSN PMKID
4123 4123 pbyRSN = &sFrame.pRSN->abyRSN[18];
4124   - pwPMKID = (PWORD)pbyRSN; // Point to PMKID count
  4124 + pwPMKID = (unsigned short *)pbyRSN; // Point to PMKID count
4125 4125 *pwPMKID = 0; // Initialize PMKID count
4126 4126 pbyRSN += 2; // Point to PMKID list
4127 4127 for (ii = 0; ii < pDevice->gsPMKID.BSSIDInfoCount; ii++) {
drivers/staging/vt6655/wpa.c
Diff comments   View file @ 15df6c2
... ... @@ -211,7 +211,7 @@
211 211 pBSSList->byDefaultK_as_PK = (*pbyCaps) & WPA_GROUPFLAG;
212 212 pBSSList->byReplayIdx = 2 << ((*pbyCaps >> WPA_REPLAYBITSSHIFT) & WPA_REPLAYBITS);
213 213 pBSSList->sRSNCapObj.bRSNCapExist = TRUE;
214   - pBSSList->sRSNCapObj.wRSNCap = *(PWORD)pbyCaps;
  214 + pBSSList->sRSNCapObj.wRSNCap = *(unsigned short *)pbyCaps;
215 215 //DBG_PRN_GRP14(("pbyCaps: %X\n", *pbyCaps));
216 216 //DBG_PRN_GRP14(("byDefaultK_as_PK: %X\n", pBSSList->byDefaultK_as_PK));
217 217 //DBG_PRN_GRP14(("byReplayIdx: %X\n", pBSSList->byReplayIdx));
drivers/staging/vt6655/wpa2.c
Diff comments   View file @ 15df6c2
... ... @@ -164,7 +164,7 @@
164 164 }
165 165  
166 166 if (pRSN->len >= 8) { // ver(2) + GK(4) + PK count(2)
167   - pBSSNode->wCSSPKCount = *((PWORD) &(pRSN->abyRSN[4]));
  167 + pBSSNode->wCSSPKCount = *((unsigned short *) &(pRSN->abyRSN[4]));
168 168 j = 0;
169 169 pbyOUI = &(pRSN->abyRSN[6]);
170 170  
171 171  
... ... @@ -213,10 +213,10 @@
213 213 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wCSSPKCount: %d\n", pBSSNode->wCSSPKCount);
214 214 }
215 215  
216   - m = *((PWORD) &(pRSN->abyRSN[4]));
  216 + m = *((unsigned short *) &(pRSN->abyRSN[4]));
217 217  
218 218 if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2)
219   - pBSSNode->wAKMSSAuthCount = *((PWORD) &(pRSN->abyRSN[6+4*m]));;
  219 + pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));;
220 220 j = 0;
221 221 pbyOUI = &(pRSN->abyRSN[8+4*m]);
222 222 for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(BYTE)); i++) {
223 223  
... ... @@ -235,10 +235,10 @@
235 235 pBSSNode->wAKMSSAuthCount = (WORD)j;
236 236 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount);
237 237  
238   - n = *((PWORD) &(pRSN->abyRSN[6+4*m]));;
  238 + n = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));;
239 239 if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2)
240 240 pBSSNode->sRSNCapObj.bRSNCapExist = TRUE;
241   - pBSSNode->sRSNCapObj.wRSNCap = *((PWORD) &(pRSN->abyRSN[8+4*m+4*n]));
  241 + pBSSNode->sRSNCapObj.wRSNCap = *((unsigned short *) &(pRSN->abyRSN[8+4*m+4*n]));
242 242 }
243 243 }
244 244 //ignore PMKID lists bcs only (Re)Assocrequest has this field
... ... @@ -270,7 +270,7 @@
270 270 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
271 271 unsigned char *pbyBuffer = NULL;
272 272 unsigned int ii = 0;
273   - PWORD pwPMKID = NULL;
  273 + unsigned short *pwPMKID = NULL;
274 274  
275 275 if (pRSNIEs == NULL) {
276 276 return(0);
... ... @@ -342,7 +342,7 @@
342 342 (pMgmt->bRoaming == TRUE) &&
343 343 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
344 344 // RSN PMKID
345   - pwPMKID = (PWORD)(&pRSNIEs->abyRSN[18]); // Point to PMKID count
  345 + pwPMKID = (unsigned short *)(&pRSNIEs->abyRSN[18]); // Point to PMKID count
346 346 *pwPMKID = 0; // Initialize PMKID count
347 347 pbyBuffer = &pRSNIEs->abyRSN[20]; // Point to PMKID list
348 348 for (ii = 0; ii < pMgmt->gsPMKIDCache.BSSIDInfoCount; ii++) {