diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/wlags49_h2/README.ubuntu | 10 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/TODO | 10 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/hcf.c | 20 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/mdd.h | 4 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/sta_h2.c | 2 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/sta_h25.c | 2 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_enc.h | 2 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_internal.h | 2 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_main.c | 14 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_netdev.c | 10 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.c | 4 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_wext.c | 22 |
12 files changed, 51 insertions, 51 deletions
diff --git a/drivers/staging/wlags49_h2/README.ubuntu b/drivers/staging/wlags49_h2/README.ubuntu index f1483c419a8..bfad7dc7725 100644 --- a/drivers/staging/wlags49_h2/README.ubuntu +++ b/drivers/staging/wlags49_h2/README.ubuntu | |||
@@ -46,12 +46,12 @@ If you have a card using the HERMES II.5 chip you have to make | |||
46 | changes to the Makefile and uncomment -DHERMES25. This will build | 46 | changes to the Makefile and uncomment -DHERMES25. This will build |
47 | driver wlags49_h25_cs. | 47 | driver wlags49_h25_cs. |
48 | 48 | ||
49 | Note: You can detemine the type with command "pccardctrl info" | 49 | Note: You can determine the type with command "pccardctrl info" |
50 | MANIFID: 0156,0002 = HERMES - not supported by this driver | 50 | MANIFID: 0156,0002 = HERMES - not supported by this driver |
51 | MANIFID: 0156,0003 = HERMES II (Wireless B) | 51 | MANIFID: 0156,0003 = HERMES II (Wireless B) |
52 | MANIFID: 0156,0004 = HERMES II.5 (Wireless B/G) | 52 | MANIFID: 0156,0004 = HERMES II.5 (Wireless B/G) |
53 | 53 | ||
54 | After succesfull compile type command | 54 | After successful compile type command |
55 | 55 | ||
56 | sudo make install | 56 | sudo make install |
57 | 57 | ||
@@ -93,7 +93,7 @@ have to "open" the device first to get a handle and after "close" no | |||
93 | changed; the former ioctl functions are now called before "open" and | 93 | changed; the former ioctl functions are now called before "open" and |
94 | after "close", which was not expected. One of the problems was enable/ | 94 | after "close", which was not expected. One of the problems was enable/ |
95 | disable of interrupts in the HCF. Interrupt handling starts at "open" | 95 | disable of interrupts in the HCF. Interrupt handling starts at "open" |
96 | so if a former "ioctl" routinge is called before "open" or after "close" | 96 | so if a former "ioctl" routine is called before "open" or after "close" |
97 | then nothing should be done with interrupt switching in the HCF. Once | 97 | then nothing should be done with interrupt switching in the HCF. Once |
98 | this was solved most HCF_ASSERTS went away. | 98 | this was solved most HCF_ASSERTS went away. |
99 | 99 | ||
@@ -120,8 +120,8 @@ include the man page. Even though setting parameters on the module | |||
120 | does not work anymore but it provides some information about all the | 120 | does not work anymore but it provides some information about all the |
121 | settings. | 121 | settings. |
122 | 122 | ||
123 | I have not have personal contact with Agere, but others have. Agere | 123 | I have no personal contact with Agere, but others have. Agere |
124 | agreed to make their software available under the BSD licence. | 124 | agreed to make their software available under the BSD license. |
125 | This driver is based on the 7.22 version. | 125 | This driver is based on the 7.22 version. |
126 | 126 | ||
127 | The following was mailed by Agere to Andrey Borzenkov about this: | 127 | The following was mailed by Agere to Andrey Borzenkov about this: |
diff --git a/drivers/staging/wlags49_h2/TODO b/drivers/staging/wlags49_h2/TODO index 94032b6ac2b..f1a45611b23 100644 --- a/drivers/staging/wlags49_h2/TODO +++ b/drivers/staging/wlags49_h2/TODO | |||
@@ -1,4 +1,4 @@ | |||
1 | First of all, the best thing would be that this driver becomes obsolte by | 1 | First of all, the best thing would be that this driver becomes obsolete by |
2 | adding support for Hermes II and Hermes II.5 cards to the existing orinoco | 2 | adding support for Hermes II and Hermes II.5 cards to the existing orinoco |
3 | driver. The orinoco driver currently only supports Hermes I based cards. | 3 | driver. The orinoco driver currently only supports Hermes I based cards. |
4 | Since this will not happen by magic and has not happened until now this | 4 | Since this will not happen by magic and has not happened until now this |
@@ -10,11 +10,11 @@ list. | |||
10 | 10 | ||
11 | TODO: | 11 | TODO: |
12 | - verify against a Hermes II.5 card | 12 | - verify against a Hermes II.5 card |
13 | - verify with WPA encription (both with H2 and H2.5 cards) | 13 | - verify with WPA encryption (both with H2 and H2.5 cards) |
14 | - sometimes the card does not initialize correctly, retry mechanisms | 14 | - sometimes the card does not initialize correctly, retry mechanisms |
15 | are build in to catch most cases but not all | 15 | are built in to catch most cases but not all |
16 | - once the driver runs it is very stable, but I have the impression | 16 | - once the driver runs it is very stable, but I have the impression |
17 | some the crittical sections take to long | 17 | that some of the critical sections take some time. |
18 | - the driver is split into a Hermes II and a Hermes II.5 part, it | 18 | - the driver is split into a Hermes II and a Hermes II.5 part, it |
19 | would be nice to handle both with one module instead of two | 19 | would be nice to handle both with one module instead of two |
20 | - review by the wireless developer community | 20 | - review by the wireless developer community |
@@ -25,7 +25,7 @@ TODO: | |||
25 | DONE: | 25 | DONE: |
26 | - verified against a Hermes II card (Thomson Speedtouch 110 PCMCIA | 26 | - verified against a Hermes II card (Thomson Speedtouch 110 PCMCIA |
27 | card) | 27 | card) |
28 | - verified with WEP encription | 28 | - verified with WEP encryption |
29 | 29 | ||
30 | Please send any patches or complaints about this driver to Greg | 30 | Please send any patches or complaints about this driver to Greg |
31 | Kroah-Hartman <greg@kroah.com> and Cc: Henk de Groot <pe1dnn@amsat.org> | 31 | Kroah-Hartman <greg@kroah.com> and Cc: Henk de Groot <pe1dnn@amsat.org> |
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c index 423544634ae..4aac26d486f 100644 --- a/drivers/staging/wlags49_h2/hcf.c +++ b/drivers/staging/wlags49_h2/hcf.c | |||
@@ -508,7 +508,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
508 | * - HCF_ACT_INT_FORCE_ON enable interrupt generation by WaveLAN NIC | 508 | * - HCF_ACT_INT_FORCE_ON enable interrupt generation by WaveLAN NIC |
509 | * - HCF_ACT_INT_OFF disable interrupt generation by WaveLAN NIC | 509 | * - HCF_ACT_INT_OFF disable interrupt generation by WaveLAN NIC |
510 | * - HCF_ACT_INT_ON compensate 1 HCF_ACT_INT_OFF, enable interrupt generation if balance reached | 510 | * - HCF_ACT_INT_ON compensate 1 HCF_ACT_INT_OFF, enable interrupt generation if balance reached |
511 | * - HCF_ACT_PRS_SCAN Hermes Probe Respons Scan (F102) command | 511 | * - HCF_ACT_PRS_SCAN Hermes Probe Response Scan (F102) command |
512 | * - HCF_ACT_RX_ACK acknowledge non-DMA receiver to Hermes | 512 | * - HCF_ACT_RX_ACK acknowledge non-DMA receiver to Hermes |
513 | * - HCF_ACT_SCAN Hermes Inquire Scan (F101) command (non-WARP only) | 513 | * - HCF_ACT_SCAN Hermes Inquire Scan (F101) command (non-WARP only) |
514 | * - HCF_ACT_SLEEP DDS Sleep request | 514 | * - HCF_ACT_SLEEP DDS Sleep request |
@@ -571,7 +571,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
571 | * The F/W is wokenup by the HCF when the NIC Interrupts mode are disabled, i.e. at the first HCF_ACT_INT_OFF | 571 | * The F/W is wokenup by the HCF when the NIC Interrupts mode are disabled, i.e. at the first HCF_ACT_INT_OFF |
572 | * after going into sleep. | 572 | * after going into sleep. |
573 | * | 573 | * |
574 | * The following Miscellanuous actions are defined: | 574 | * The following Miscellaneous actions are defined: |
575 | * | 575 | * |
576 | * o HCF_ACT_RX_ACK: Receiver Acknowledgement (non-DMA, non-USB mode only) | 576 | * o HCF_ACT_RX_ACK: Receiver Acknowledgement (non-DMA, non-USB mode only) |
577 | * Acking the receiver, frees the NIC memory used to hold the Rx frame and allows the F/W to | 577 | * Acking the receiver, frees the NIC memory used to hold the Rx frame and allows the F/W to |
@@ -579,7 +579,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
579 | * If the MSF does not need access (any longer) to the current frame, e.g. because it is rejected based on the | 579 | * If the MSF does not need access (any longer) to the current frame, e.g. because it is rejected based on the |
580 | * look ahead or copied to another buffer, the receiver may be acked. Acking earlier is assumed to have the | 580 | * look ahead or copied to another buffer, the receiver may be acked. Acking earlier is assumed to have the |
581 | * potential of improving the performance. | 581 | * potential of improving the performance. |
582 | * If the MSF does not explitly ack te receiver, the acking is done implicitly if: | 582 | * If the MSF does not explicitly ack the receiver, the acking is done implicitly if: |
583 | * - the received frame fits in the look ahead buffer, by the hcf_service_nic call that reported the Rx frame | 583 | * - the received frame fits in the look ahead buffer, by the hcf_service_nic call that reported the Rx frame |
584 | * - if not in the above step, by hcf_rcv_msg (assuming hcf_rcv_msg is called) | 584 | * - if not in the above step, by hcf_rcv_msg (assuming hcf_rcv_msg is called) |
585 | * - if neither of the above implicit acks nor an explicit ack by the MSF, by the first hcf_service_nic after | 585 | * - if neither of the above implicit acks nor an explicit ack by the MSF, by the first hcf_service_nic after |
@@ -591,9 +591,9 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
591 | * The Inquire Tallies command requests the F/W to provide its current set of tallies. | 591 | * The Inquire Tallies command requests the F/W to provide its current set of tallies. |
592 | * See also hcf_get_info with CFG_TALLIES as parameter. | 592 | * See also hcf_get_info with CFG_TALLIES as parameter. |
593 | * | 593 | * |
594 | * o HCF_ACT_PRS_SCAN: Inquire Probe Respons Scan command | 594 | * o HCF_ACT_PRS_SCAN: Inquire Probe Response Scan command |
595 | * This command is only operational if the F/W is enabled. | 595 | * This command is only operational if the F/W is enabled. |
596 | * The Probe Respons Scan command starts a scan sequence. | 596 | * The Probe Response Scan command starts a scan sequence. |
597 | * The HCF puts the result of this action in an MSF defined buffer (see CFG_RID_LOG_STRCT). | 597 | * The HCF puts the result of this action in an MSF defined buffer (see CFG_RID_LOG_STRCT). |
598 | * | 598 | * |
599 | * o HCF_ACT_SCAN: Inquire Scan command | 599 | * o HCF_ACT_SCAN: Inquire Scan command |
@@ -606,7 +606,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
606 | * - NIC interrupts are not disabled while required by parameter action. | 606 | * - NIC interrupts are not disabled while required by parameter action. |
607 | * - an invalid code is specified in parameter action. | 607 | * - an invalid code is specified in parameter action. |
608 | * - HCF_ACT_INT_ON commands outnumber the HCF_ACT_INT_OFF commands. | 608 | * - HCF_ACT_INT_ON commands outnumber the HCF_ACT_INT_OFF commands. |
609 | * - reentrancy, may be caused by calling hcf_functions without adequate protection against NIC interrupts or | 609 | * - reentrancy, may be caused by calling hcf_functions without adequate protection against NIC interrupts or |
610 | * multi-threading | 610 | * multi-threading |
611 | * | 611 | * |
612 | * - Since the HCF does not maintain status information relative to the F/W enabled state, it is not asserted | 612 | * - Since the HCF does not maintain status information relative to the F/W enabled state, it is not asserted |
@@ -625,7 +625,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = { | |||
625 | * change in HREG_EV_STAT matching a bit in HREG_INT_EN, i.e. not if invoked as result of another device | 625 | * change in HREG_EV_STAT matching a bit in HREG_INT_EN, i.e. not if invoked as result of another device |
626 | * generating an interrupt on the shared interrupt line. | 626 | * generating an interrupt on the shared interrupt line. |
627 | * Note 1: it has been observed that under certain adverse conditions on certain platforms the writing of | 627 | * Note 1: it has been observed that under certain adverse conditions on certain platforms the writing of |
628 | * HREG_INT_EN can apparently fail, therefor it is paramount that HREG_INT_EN is written again with 0 for | 628 | * HREG_INT_EN can apparently fail, therefore it is paramount that HREG_INT_EN is written again with 0 for |
629 | * each and every call to HCF_ACT_INT_OFF. | 629 | * each and every call to HCF_ACT_INT_OFF. |
630 | * Note 2: it has been observed that under certain H/W & S/W architectures this logic is called when there is | 630 | * Note 2: it has been observed that under certain H/W & S/W architectures this logic is called when there is |
631 | * no NIC at all. To cater for this, the value of HREG_INT_EN is validated. If the unused bit 0x0100 is set, | 631 | * no NIC at all. To cater for this, the value of HREG_INT_EN is validated. If the unused bit 0x0100 is set, |
@@ -902,7 +902,7 @@ hcf_action( IFBP ifbp, hcf_16 action ) | |||
902 | * - A command other than Continue, Enable, Disable, Connect or Disconnect is given. | 902 | * - A command other than Continue, Enable, Disable, Connect or Disconnect is given. |
903 | * - An invalid combination of the subfields is given or a bit outside the subfields is given. | 903 | * - An invalid combination of the subfields is given or a bit outside the subfields is given. |
904 | * - any return code besides HCF_SUCCESS. | 904 | * - any return code besides HCF_SUCCESS. |
905 | * - reentrancy, may be caused by calling a hcf_function without adequate protection against NIC interrupts or | 905 | * - reentrancy, may be caused by calling a hcf_function without adequate protection against NIC interrupts or |
906 | * multi-threading | 906 | * multi-threading |
907 | * | 907 | * |
908 | *.DIAGRAM | 908 | *.DIAGRAM |
@@ -1030,7 +1030,7 @@ hcf_cntl( IFBP ifbp, hcf_16 cmd ) | |||
1030 | * hcf_connect passes the MSF-defined location of the IFB to the HCF and grants or revokes access right for the | 1030 | * hcf_connect passes the MSF-defined location of the IFB to the HCF and grants or revokes access right for the |
1031 | * HCF to the IFB. Revoking is done by specifying HCF_DISCONNECT rather than an I/O address for the parameter | 1031 | * HCF to the IFB. Revoking is done by specifying HCF_DISCONNECT rather than an I/O address for the parameter |
1032 | * io_base. Every call of hcf_connect in "connect" mode, must eventually be followed by a call of hcf_connect | 1032 | * io_base. Every call of hcf_connect in "connect" mode, must eventually be followed by a call of hcf_connect |
1033 | * in "disconnect" mode. Clalling hcf_connect in "connect"/"disconnect" mode can not be nested. | 1033 | * in "disconnect" mode. Calling hcf_connect in "connect"/"disconnect" mode can not be nested. |
1034 | * The IFB address must be used as a handle with all subsequent HCF-function calls and the HCF uses the IFB | 1034 | * The IFB address must be used as a handle with all subsequent HCF-function calls and the HCF uses the IFB |
1035 | * address as a handle when it performs a call(back) of an MSF-function (i.e. msf_assert). | 1035 | * address as a handle when it performs a call(back) of an MSF-function (i.e. msf_assert). |
1036 | * | 1036 | * |
@@ -1058,7 +1058,7 @@ hcf_cntl( IFBP ifbp, hcf_16 cmd ) | |||
1058 | * specification for S/W reset | 1058 | * specification for S/W reset |
1059 | * Note 2: it turns out that on some H/W constellations, the clock to access the EEProm is not lowered | 1059 | * Note 2: it turns out that on some H/W constellations, the clock to access the EEProm is not lowered |
1060 | * to an appropriate frequency by HREG_IO_SRESET. By giving an HCMD_INI first, this problem is worked around. | 1060 | * to an appropriate frequency by HREG_IO_SRESET. By giving an HCMD_INI first, this problem is worked around. |
1061 | *2b: Experimentally it is determined over a wide range of F/W versions that waiting for the for Cmd bit in | 1061 | *2b: Experimentally it is determined over a wide range of F/W versions that are waiting for the for Cmd bit in |
1062 | * Ev register gives a workable strategy. The available documentation does not give much clues. | 1062 | * Ev register gives a workable strategy. The available documentation does not give much clues. |
1063 | *4: clear and initialize the IFB | 1063 | *4: clear and initialize the IFB |
1064 | * The HCF house keeping info is designed such that zero is the appropriate initial value for as much as | 1064 | * The HCF house keeping info is designed such that zero is the appropriate initial value for as much as |
diff --git a/drivers/staging/wlags49_h2/mdd.h b/drivers/staging/wlags49_h2/mdd.h index 48aa108be77..0c914971c1e 100644 --- a/drivers/staging/wlags49_h2/mdd.h +++ b/drivers/staging/wlags49_h2/mdd.h | |||
@@ -652,7 +652,7 @@ XX1( CFG_SCAN, SCAN_RS_STRCT, scan_result[32] ) /*Scan results * | |||
652 | #define CFG_CNF_WDS_ADDR6 0xFC16 //[AP] Port 6 MAC Adrs of corresponding WDS Link node | 652 | #define CFG_CNF_WDS_ADDR6 0xFC16 //[AP] Port 6 MAC Adrs of corresponding WDS Link node |
653 | #define CFG_CNF_PM_MCAST_BUF 0xFC17 //[AP] Switch for PM buffereing of Multicast Messages | 653 | #define CFG_CNF_PM_MCAST_BUF 0xFC17 //[AP] Switch for PM buffereing of Multicast Messages |
654 | #define CFG_CNF_MCAST_PM_BUF CFG_CNF_PM_MCAST_BUF //name does not match H-II spec | 654 | #define CFG_CNF_MCAST_PM_BUF CFG_CNF_PM_MCAST_BUF //name does not match H-II spec |
655 | #define CFG_CNF_REJECT_ANY 0xFC18 //[AP] Switch for PM buffereing of Multicast Messages | 655 | #define CFG_CNF_REJECT_ANY 0xFC18 //[AP] Switch for PM buffering of Multicast Messages |
656 | 656 | ||
657 | #define CFG_CNF_ENCRYPTION 0xFC20 //select en/de-cryption of Tx/Rx messages | 657 | #define CFG_CNF_ENCRYPTION 0xFC20 //select en/de-cryption of Tx/Rx messages |
658 | #define CFG_CNF_AUTHENTICATION 0xFC21 //[STA] selects Authentication algorithm | 658 | #define CFG_CNF_AUTHENTICATION 0xFC21 //[STA] selects Authentication algorithm |
@@ -1004,7 +1004,7 @@ XX1( CFG_SCAN, SCAN_RS_STRCT, scan_result[32] ) /*Scan results * | |||
1004 | #define CFG_CURRENT_LINK_STATUS 0x090B //Latest link status got through 0xF200 LinkEvent | 1004 | #define CFG_CURRENT_LINK_STATUS 0x090B //Latest link status got through 0xF200 LinkEvent |
1005 | 1005 | ||
1006 | /*============================================================ INFORMATION FRAMES =========================*/ | 1006 | /*============================================================ INFORMATION FRAMES =========================*/ |
1007 | #define CFG_INFO_FRAME_MIN 0xF000 //lowest value representing an Informatio Frame | 1007 | #define CFG_INFO_FRAME_MIN 0xF000 //lowest value representing an Information Frame |
1008 | 1008 | ||
1009 | #define CFG_TALLIES 0xF100 //Communications Tallies | 1009 | #define CFG_TALLIES 0xF100 //Communications Tallies |
1010 | #define CFG_SCAN 0xF101 //Scan results | 1010 | #define CFG_SCAN 0xF101 //Scan results |
diff --git a/drivers/staging/wlags49_h2/sta_h2.c b/drivers/staging/wlags49_h2/sta_h2.c index f9a38523724..00dffe2ed8f 100644 --- a/drivers/staging/wlags49_h2/sta_h2.c +++ b/drivers/staging/wlags49_h2/sta_h2.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | 27 | ||
28 | #include "hcfcfg.h" // to get hcf_16 etc defined as well as | 28 | #include "hcfcfg.h" // to get hcf_16 etc defined as well as |
29 | // possible settings which inluence mdd.h or dhf.h | 29 | // possible settings which influence mdd.h or dhf.h |
30 | #include "mdd.h" //to get COMP_ID_STA etc defined | 30 | #include "mdd.h" //to get COMP_ID_STA etc defined |
31 | #include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord, | 31 | #include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord, |
32 | 32 | ||
diff --git a/drivers/staging/wlags49_h2/sta_h25.c b/drivers/staging/wlags49_h2/sta_h25.c index 86ca1cdd849..5b6f670d8ef 100644 --- a/drivers/staging/wlags49_h2/sta_h25.c +++ b/drivers/staging/wlags49_h2/sta_h25.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | 26 | ||
27 | #include "hcfcfg.h" // to get hcf_16 etc defined as well as | 27 | #include "hcfcfg.h" // to get hcf_16 etc defined as well as |
28 | // possible settings which inluence mdd.h or dhf.h | 28 | // possible settings which influence mdd.h or dhf.h |
29 | #include "mdd.h" //to get COMP_ID_STA etc defined | 29 | #include "mdd.h" //to get COMP_ID_STA etc defined |
30 | #include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord, | 30 | #include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord, |
31 | 31 | ||
diff --git a/drivers/staging/wlags49_h2/wl_enc.h b/drivers/staging/wlags49_h2/wl_enc.h index 46629f3b112..1804611276b 100644 --- a/drivers/staging/wlags49_h2/wl_enc.h +++ b/drivers/staging/wlags49_h2/wl_enc.h | |||
@@ -106,7 +106,7 @@ ENCSTRCT, *PENCSTRCT; | |||
106 | 106 | ||
107 | 107 | ||
108 | /******************************************************************************* | 108 | /******************************************************************************* |
109 | * function prrottypes | 109 | * function prototypes |
110 | ******************************************************************************/ | 110 | ******************************************************************************/ |
111 | int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen ); | 111 | int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen ); |
112 | 112 | ||
diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h index 480814e9ae7..b2307816414 100644 --- a/drivers/staging/wlags49_h2/wl_internal.h +++ b/drivers/staging/wlags49_h2/wl_internal.h | |||
@@ -838,7 +838,7 @@ typedef struct dma_strct | |||
838 | DESC_STRCT *rx_packet[NUM_RX_DESC]; | 838 | DESC_STRCT *rx_packet[NUM_RX_DESC]; |
839 | DESC_STRCT *rx_reclaim_desc, *tx_reclaim_desc; // Descriptors for host-reclaim purposes (see HCF) | 839 | DESC_STRCT *rx_reclaim_desc, *tx_reclaim_desc; // Descriptors for host-reclaim purposes (see HCF) |
840 | int tx_rsc_ind; // DMA Tx resource indicator is maintained in the MSF, not in the HCF | 840 | int tx_rsc_ind; // DMA Tx resource indicator is maintained in the MSF, not in the HCF |
841 | int rx_rsc_ind; // Also added rx rsource indicator so that cleanup can be performed if alloc fails | 841 | int rx_rsc_ind; // Also added rx resource indicator so that cleanup can be performed if alloc fails |
842 | int status; | 842 | int status; |
843 | } DMA_STRCT; | 843 | } DMA_STRCT; |
844 | 844 | ||
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index bb3733f2f78..f5f120a6246 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c | |||
@@ -63,7 +63,7 @@ | |||
63 | * constant definitions | 63 | * constant definitions |
64 | ******************************************************************************/ | 64 | ******************************************************************************/ |
65 | 65 | ||
66 | /* Allow support for calling system fcns to access F/W iamge file */ | 66 | /* Allow support for calling system fcns to access F/W image file */ |
67 | #define __KERNEL_SYSCALLS__ | 67 | #define __KERNEL_SYSCALLS__ |
68 | 68 | ||
69 | /******************************************************************************* | 69 | /******************************************************************************* |
@@ -1163,7 +1163,7 @@ int rc; | |||
1163 | CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.version_major ), | 1163 | CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.version_major ), |
1164 | CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.version_minor )); | 1164 | CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.version_minor )); |
1165 | 1165 | ||
1166 | /* now we wil get the MAC address of the card */ | 1166 | /* now we will get the MAC address of the card */ |
1167 | lp->ltvRecord.len = 4; | 1167 | lp->ltvRecord.len = 4; |
1168 | if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ) { | 1168 | if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ) { |
1169 | lp->ltvRecord.typ = CFG_NIC_MAC_ADDR; | 1169 | lp->ltvRecord.typ = CFG_NIC_MAC_ADDR; |
@@ -1374,7 +1374,7 @@ int wl_put_ltv_init( struct wl_private *lp ) | |||
1374 | lp->ltvRecord.len = 2; | 1374 | lp->ltvRecord.len = 2; |
1375 | lp->ltvRecord.typ = CFG_CNTL_OPT; | 1375 | lp->ltvRecord.typ = CFG_CNTL_OPT; |
1376 | 1376 | ||
1377 | /* The Card Services build must ALWAYS configure for 16-bit I/O. PCI or | 1377 | /* The Card Services build must ALWAYS be configured for 16-bit I/O. PCI or |
1378 | CardBus can be set to either 16/32 bit I/O, or Bus Master DMA, but only | 1378 | CardBus can be set to either 16/32 bit I/O, or Bus Master DMA, but only |
1379 | for Hermes-2.5 */ | 1379 | for Hermes-2.5 */ |
1380 | #ifdef BUS_PCMCIA | 1380 | #ifdef BUS_PCMCIA |
@@ -2474,7 +2474,7 @@ void wl_resume(struct net_device *dev) | |||
2474 | * | 2474 | * |
2475 | * DESCRIPTION: | 2475 | * DESCRIPTION: |
2476 | * | 2476 | * |
2477 | * This function perfroms a check on the device and calls wl_remove() if | 2477 | * This function performs a check on the device and calls wl_remove() if |
2478 | * necessary. This function can be used for all bus types, but exists mostly | 2478 | * necessary. This function can be used for all bus types, but exists mostly |
2479 | * for the benefit of the Card Services driver, as there are times when | 2479 | * for the benefit of the Card Services driver, as there are times when |
2480 | * wl_remove() does not get called. | 2480 | * wl_remove() does not get called. |
@@ -2596,7 +2596,7 @@ int wl_enable( struct wl_private *lp ) | |||
2596 | lp->portState = WVLAN_PORT_STATE_ENABLED; //;?bad mnemonic, NIC iso PORT | 2596 | lp->portState = WVLAN_PORT_STATE_ENABLED; //;?bad mnemonic, NIC iso PORT |
2597 | #ifdef ENABLE_DMA | 2597 | #ifdef ENABLE_DMA |
2598 | if ( lp->use_dma ) { | 2598 | if ( lp->use_dma ) { |
2599 | wl_pci_dma_hcf_supply( lp ); //;?always succes? | 2599 | wl_pci_dma_hcf_supply( lp ); //;?always successful? |
2600 | } | 2600 | } |
2601 | #endif | 2601 | #endif |
2602 | } | 2602 | } |
@@ -2874,7 +2874,7 @@ int wl_mbx( struct wl_private *lp ) | |||
2874 | * DESCRIPTION: | 2874 | * DESCRIPTION: |
2875 | * | 2875 | * |
2876 | * This function will perform the tedious task of endian translating all | 2876 | * This function will perform the tedious task of endian translating all |
2877 | * fields withtin a mailbox message which need translating. | 2877 | * fields within a mailbox message which need translating. |
2878 | * | 2878 | * |
2879 | * PARAMETERS: | 2879 | * PARAMETERS: |
2880 | * | 2880 | * |
@@ -2989,7 +2989,7 @@ void wl_endian_translate_mailbox( ltv_t *ltv ) | |||
2989 | * | 2989 | * |
2990 | * DESCRIPTION: | 2990 | * DESCRIPTION: |
2991 | * | 2991 | * |
2992 | * This function will process the mailbox data. | 2992 | * This function processes the mailbox data. |
2993 | * | 2993 | * |
2994 | * PARAMETERS: | 2994 | * PARAMETERS: |
2995 | * | 2995 | * |
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index cc5614137f7..fb421407e10 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c | |||
@@ -1599,7 +1599,7 @@ void wl_wds_device_dealloc( struct wl_private *lp ) | |||
1599 | * DESCRIPTION: | 1599 | * DESCRIPTION: |
1600 | * | 1600 | * |
1601 | * Used to start the netif queues of all the "virtual" network devices | 1601 | * Used to start the netif queues of all the "virtual" network devices |
1602 | * which repesent the WDS ports. | 1602 | * which represent the WDS ports. |
1603 | * | 1603 | * |
1604 | * PARAMETERS: | 1604 | * PARAMETERS: |
1605 | * | 1605 | * |
@@ -1634,7 +1634,7 @@ void wl_wds_netif_start_queue( struct wl_private *lp ) | |||
1634 | * DESCRIPTION: | 1634 | * DESCRIPTION: |
1635 | * | 1635 | * |
1636 | * Used to stop the netif queues of all the "virtual" network devices | 1636 | * Used to stop the netif queues of all the "virtual" network devices |
1637 | * which repesent the WDS ports. | 1637 | * which represent the WDS ports. |
1638 | * | 1638 | * |
1639 | * PARAMETERS: | 1639 | * PARAMETERS: |
1640 | * | 1640 | * |
@@ -1669,7 +1669,7 @@ void wl_wds_netif_stop_queue( struct wl_private *lp ) | |||
1669 | * DESCRIPTION: | 1669 | * DESCRIPTION: |
1670 | * | 1670 | * |
1671 | * Used to wake the netif queues of all the "virtual" network devices | 1671 | * Used to wake the netif queues of all the "virtual" network devices |
1672 | * which repesent the WDS ports. | 1672 | * which represent the WDS ports. |
1673 | * | 1673 | * |
1674 | * PARAMETERS: | 1674 | * PARAMETERS: |
1675 | * | 1675 | * |
@@ -1704,7 +1704,7 @@ void wl_wds_netif_wake_queue( struct wl_private *lp ) | |||
1704 | * DESCRIPTION: | 1704 | * DESCRIPTION: |
1705 | * | 1705 | * |
1706 | * Used to signal the network layer that carrier is present on all of the | 1706 | * Used to signal the network layer that carrier is present on all of the |
1707 | * "virtual" network devices which repesent the WDS ports. | 1707 | * "virtual" network devices which represent the WDS ports. |
1708 | * | 1708 | * |
1709 | * PARAMETERS: | 1709 | * PARAMETERS: |
1710 | * | 1710 | * |
@@ -1737,7 +1737,7 @@ void wl_wds_netif_carrier_on( struct wl_private *lp ) | |||
1737 | * DESCRIPTION: | 1737 | * DESCRIPTION: |
1738 | * | 1738 | * |
1739 | * Used to signal the network layer that carrier is NOT present on all of | 1739 | * Used to signal the network layer that carrier is NOT present on all of |
1740 | * the "virtual" network devices which repesent the WDS ports. | 1740 | * the "virtual" network devices which represent the WDS ports. |
1741 | * | 1741 | * |
1742 | * PARAMETERS: | 1742 | * PARAMETERS: |
1743 | * | 1743 | * |
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 457c7ed3707..a09c3ac793a 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c | |||
@@ -223,7 +223,7 @@ int wl_adapter_init_module( void ) | |||
223 | ******************************************************************************/ | 223 | ******************************************************************************/ |
224 | void wl_adapter_cleanup_module( void ) | 224 | void wl_adapter_cleanup_module( void ) |
225 | { | 225 | { |
226 | //;?how comes wl_adapter_cleanup_module is located in a seemingly pci specific module | 226 | //;?how come wl_adapter_cleanup_module is located in a seemingly pci specific module |
227 | DBG_FUNC( "wl_adapter_cleanup_module" ); | 227 | DBG_FUNC( "wl_adapter_cleanup_module" ); |
228 | DBG_ENTER( DbgInfo ); | 228 | DBG_ENTER( DbgInfo ); |
229 | 229 | ||
@@ -899,7 +899,7 @@ int wl_pci_dma_free_tx_packet( struct pci_dev *pdev, struct wl_private *lp, | |||
899 | * DESCRIPTION: | 899 | * DESCRIPTION: |
900 | * | 900 | * |
901 | * Allocates a single Rx packet, consisting of two descriptors and one | 901 | * Allocates a single Rx packet, consisting of two descriptors and one |
902 | * contiguous buffer. THe buffer starts with the hermes-specific header. | 902 | * contiguous buffer. The buffer starts with the hermes-specific header. |
903 | * One descriptor points at the start, the other at offset 0x3a of the | 903 | * One descriptor points at the start, the other at offset 0x3a of the |
904 | * buffer. | 904 | * buffer. |
905 | * | 905 | * |
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index cef12f7f31b..f553366cccc 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c | |||
@@ -606,7 +606,7 @@ retry: | |||
606 | if (retries < 10) { | 606 | if (retries < 10) { |
607 | retries++; | 607 | retries++; |
608 | 608 | ||
609 | /* Holding the lock too long, make a gap to allow other processes */ | 609 | /* Holding the lock too long, makes a gap to allow other processes */ |
610 | wl_unlock(lp, &flags); | 610 | wl_unlock(lp, &flags); |
611 | wl_lock( lp, &flags ); | 611 | wl_lock( lp, &flags ); |
612 | 612 | ||
@@ -618,7 +618,7 @@ retry: | |||
618 | goto out_unlock; | 618 | goto out_unlock; |
619 | } | 619 | } |
620 | 620 | ||
621 | /* Holding the lock too long, make a gap to allow other processes */ | 621 | /* Holding the lock too long, makes a gap to allow other processes */ |
622 | wl_unlock(lp, &flags); | 622 | wl_unlock(lp, &flags); |
623 | wl_lock( lp, &flags ); | 623 | wl_lock( lp, &flags ); |
624 | 624 | ||
@@ -631,7 +631,7 @@ retry: | |||
631 | } | 631 | } |
632 | } | 632 | } |
633 | 633 | ||
634 | /* Holding the lock too long, make a gap to allow other processes */ | 634 | /* Holding the lock too long, makes a gap to allow other processes */ |
635 | wl_unlock(lp, &flags); | 635 | wl_unlock(lp, &flags); |
636 | wl_lock( lp, &flags ); | 636 | wl_lock( lp, &flags ); |
637 | 637 | ||
@@ -694,7 +694,7 @@ retry: | |||
694 | 694 | ||
695 | /* Encryption */ | 695 | /* Encryption */ |
696 | 696 | ||
697 | /* Holding the lock too long, make a gap to allow other processes */ | 697 | /* Holding the lock too long, makes a gap to allow other processes */ |
698 | wl_unlock(lp, &flags); | 698 | wl_unlock(lp, &flags); |
699 | wl_lock( lp, &flags ); | 699 | wl_lock( lp, &flags ); |
700 | 700 | ||
@@ -721,7 +721,7 @@ retry: | |||
721 | 721 | ||
722 | // Retry Limits and Lifetime - NOT SUPPORTED | 722 | // Retry Limits and Lifetime - NOT SUPPORTED |
723 | 723 | ||
724 | /* Holding the lock too long, make a gap to allow other processes */ | 724 | /* Holding the lock too long, makes a gap to allow other processes */ |
725 | wl_unlock(lp, &flags); | 725 | wl_unlock(lp, &flags); |
726 | wl_lock( lp, &flags ); | 726 | wl_lock( lp, &flags ); |
727 | 727 | ||
@@ -2646,7 +2646,7 @@ retry: | |||
2646 | 2646 | ||
2647 | DBG_TRACE( DbgInfo, "CFG_SCAN_CHANNEL result : 0x%x\n", status ); | 2647 | DBG_TRACE( DbgInfo, "CFG_SCAN_CHANNEL result : 0x%x\n", status ); |
2648 | 2648 | ||
2649 | // Holding the lock too long, make a gap to allow other processes | 2649 | // Holding the lock too long, makes a gap to allow other processes |
2650 | wl_unlock(lp, &flags); | 2650 | wl_unlock(lp, &flags); |
2651 | wl_lock( lp, &flags ); | 2651 | wl_lock( lp, &flags ); |
2652 | 2652 | ||
@@ -2657,7 +2657,7 @@ retry: | |||
2657 | DBG_TRACE( DbgInfo, "Reset card to recover, attempt: %d\n", retries ); | 2657 | DBG_TRACE( DbgInfo, "Reset card to recover, attempt: %d\n", retries ); |
2658 | wl_reset( dev ); | 2658 | wl_reset( dev ); |
2659 | 2659 | ||
2660 | // Holding the lock too long, make a gap to allow other processes | 2660 | // Holding the lock too long, makes a gap to allow other processes |
2661 | wl_unlock(lp, &flags); | 2661 | wl_unlock(lp, &flags); |
2662 | wl_lock( lp, &flags ); | 2662 | wl_lock( lp, &flags ); |
2663 | 2663 | ||
@@ -2674,7 +2674,7 @@ retry: | |||
2674 | 2674 | ||
2675 | status = hcf_put_info( &( lp->hcfCtx ), (LTVP)&( lp->ltvRecord )); | 2675 | status = hcf_put_info( &( lp->hcfCtx ), (LTVP)&( lp->ltvRecord )); |
2676 | 2676 | ||
2677 | // Holding the lock too long, make a gap to allow other processes | 2677 | // Holding the lock too long, makes a gap to allow other processes |
2678 | wl_unlock(lp, &flags); | 2678 | wl_unlock(lp, &flags); |
2679 | wl_lock( lp, &flags ); | 2679 | wl_lock( lp, &flags ); |
2680 | 2680 | ||
@@ -2682,7 +2682,7 @@ retry: | |||
2682 | 2682 | ||
2683 | /* Initiate the scan */ | 2683 | /* Initiate the scan */ |
2684 | /* NOTE: Using HCF_ACT_SCAN has been removed, as using HCF_ACT_ACS_SCAN to | 2684 | /* NOTE: Using HCF_ACT_SCAN has been removed, as using HCF_ACT_ACS_SCAN to |
2685 | retrieve probe responses must always be used to support WPA */ | 2685 | retrieve probe response must always be used to support WPA */ |
2686 | status = hcf_action( &( lp->hcfCtx ), HCF_ACT_ACS_SCAN ); | 2686 | status = hcf_action( &( lp->hcfCtx ), HCF_ACT_ACS_SCAN ); |
2687 | 2687 | ||
2688 | if( status == HCF_SUCCESS ) { | 2688 | if( status == HCF_SUCCESS ) { |
@@ -3055,7 +3055,7 @@ static void flush_tx(struct wl_private *lp) | |||
3055 | * Make sure that there is no data queued up in the firmware | 3055 | * Make sure that there is no data queued up in the firmware |
3056 | * before setting the TKIP keys. If this check is not | 3056 | * before setting the TKIP keys. If this check is not |
3057 | * performed, some data may be sent out with incorrect MIC | 3057 | * performed, some data may be sent out with incorrect MIC |
3058 | * and cause synchronizarion errors with the AP | 3058 | * and cause synchronization errors with the AP |
3059 | */ | 3059 | */ |
3060 | /* Check every 1ms for 100ms */ | 3060 | /* Check every 1ms for 100ms */ |
3061 | for (count = 0; count < 100; count++) { | 3061 | for (count = 0; count < 100; count++) { |
@@ -3655,7 +3655,7 @@ void wl_wext_event_ap( struct net_device *dev ) | |||
3655 | this event BEFORE sending the association event, as there are timing | 3655 | this event BEFORE sending the association event, as there are timing |
3656 | issues with the hostap supplicant. The supplicant will attempt to process | 3656 | issues with the hostap supplicant. The supplicant will attempt to process |
3657 | an EAPOL-Key frame from an AP before receiving this information, which | 3657 | an EAPOL-Key frame from an AP before receiving this information, which |
3658 | is required properly process the said frame. */ | 3658 | is required for a proper processed frame. */ |
3659 | wl_wext_event_assoc_ie( dev ); | 3659 | wl_wext_event_assoc_ie( dev ); |
3660 | 3660 | ||
3661 | /* Get the BSSID */ | 3661 | /* Get the BSSID */ |