Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268406
b: refs/heads/master
c: 2a83cb0
h: refs/heads/master
v: v3
  • Loading branch information
David Kilroy authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent ead9701 commit dd56893
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7c22429923c393853687266cd9d99c13c688f0a1
refs/heads/master: 2a83cb015647be5ddd2522764e0672f593644718
28 changes: 14 additions & 14 deletions trunk/drivers/staging/wlags49_h2/mdd.h
Original file line number Diff line number Diff line change
Expand Up @@ -893,20 +893,20 @@ XX1( CFG_SCAN, SCAN_RS_STRCT, scan_result[32] ) /*Scan results *

//HFS_TX_CNTL
/* Note that the HCF_.... System Constants influence the HFS_.... values below
* H-I H-I | H-II H-II H-II.5
* WPA | WPA
* HFS_TX_CNTL_TX_OK 0002 0002 | 0002 0002 N/A <<<<<<<<deprecated
* HFS_TX_CNTL_TX_EX 0004 0004 | 0004 0004 N/A
* HFS_TX_CNTL_MIC N/A 0010 | N/A 0010 N/A
* HFS_TX_CNTL_TID N/A N/A | N/A N/A 000F
* HFS_TX_CNTL_SERVICE_CLASS N/A N/A | N/A N/A 00C0
* HFS_TX_CNTL_PORT 0700 0700 | 0700 0700 0700
* HFS_TX_CNTL_MIC_KEY_ID 1800 1800 | 0000 1800 N/A
* HFS_TX_CNTL_CKIP 0000 0000 | 0000 2000 2000
* HFS_TX_CNTL_TX_DELAY 4000 4000 | 4000 4000 N/A
* HFS_TX_CNTL_ACTION N/A N/A | N/A N/A 4000
* ==== ==== | ==== ==== ====
* 5F06 5F16 | 4706 7F06 67CF
* H-I H-I | H-II H-II H-II.5
* WPA | WPA
* HFS_TX_CNTL_TX_OK 0002 0002 | 0002 0002 N/A <<<<<<<<deprecated
* HFS_TX_CNTL_TX_EX 0004 0004 | 0004 0004 N/A
* HFS_TX_CNTL_MIC N/A 0010 | N/A 0010 N/A
* HFS_TX_CNTL_TID N/A N/A | N/A N/A 000F
* HFS_TX_CNTL_SERVICE_CLASS N/A N/A | N/A N/A 00C0
* HFS_TX_CNTL_PORT 0700 0700 | 0700 0700 0700
* HFS_TX_CNTL_MIC_KEY_ID 1800 1800 | 0000 1800 N/A
* HFS_TX_CNTL_CKIP 0000 0000 | 0000 2000 2000
* HFS_TX_CNTL_TX_DELAY 4000 4000 | 4000 4000 N/A
* HFS_TX_CNTL_ACTION N/A N/A | N/A N/A 4000
* ==== ==== | ==== ==== ====
* 5F06 5F16 | 4706 7F06 67CF
*
* HCF_TX_CNTL_MASK specifies the bits allowed on the Host I/F
* note: bit 0x4000 has different meaning for H-II and H-II.5
Expand Down

0 comments on commit dd56893

Please sign in to comment.