diff options
author | David Kilroy <kilroyd@googlemail.com> | 2009-08-05 16:23:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:12:42 -0400 |
commit | 5c9f41e285ad60013f0962746192769f899757be (patch) | |
tree | f834a575208c6b93e84c9ff57df65118399296fe /drivers/net/wireless/orinoco/orinoco.h | |
parent | bb7e43c061ad1e52a4738d5b45595ec9e1638b6a (diff) |
orinoco: use local types for auth alg and sequence length
This helps in the refactorring required to convert the driver to
cfg80211.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco.h')
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h index 2a4eef1b96c..badfc566524 100644 --- a/drivers/net/wireless/orinoco/orinoco.h +++ b/drivers/net/wireless/orinoco/orinoco.h | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #define MAX_SCAN_LEN 4096 | 26 | #define MAX_SCAN_LEN 4096 |
27 | 27 | ||
28 | #define ORINOCO_SEQ_LEN 8 | ||
28 | #define ORINOCO_MAX_KEY_SIZE 14 | 29 | #define ORINOCO_MAX_KEY_SIZE 14 |
29 | #define ORINOCO_MAX_KEYS 4 | 30 | #define ORINOCO_MAX_KEYS 4 |
30 | 31 | ||
@@ -42,6 +43,12 @@ struct orinoco_tkip_key { | |||
42 | u8 rx_mic[MIC_KEYLEN]; | 43 | u8 rx_mic[MIC_KEYLEN]; |
43 | }; | 44 | }; |
44 | 45 | ||
46 | enum orinoco_alg { | ||
47 | ORINOCO_ALG_NONE, | ||
48 | ORINOCO_ALG_WEP, | ||
49 | ORINOCO_ALG_TKIP | ||
50 | }; | ||
51 | |||
45 | typedef enum { | 52 | typedef enum { |
46 | FIRMWARE_TYPE_AGERE, | 53 | FIRMWARE_TYPE_AGERE, |
47 | FIRMWARE_TYPE_INTERSIL, | 54 | FIRMWARE_TYPE_INTERSIL, |
@@ -111,7 +118,8 @@ struct orinoco_private { | |||
111 | 118 | ||
112 | /* Configuration paramaters */ | 119 | /* Configuration paramaters */ |
113 | enum nl80211_iftype iw_mode; | 120 | enum nl80211_iftype iw_mode; |
114 | u16 encode_alg, wep_restrict, tx_key; | 121 | enum orinoco_alg encode_alg; |
122 | u16 wep_restrict, tx_key; | ||
115 | struct orinoco_key keys[ORINOCO_MAX_KEYS]; | 123 | struct orinoco_key keys[ORINOCO_MAX_KEYS]; |
116 | int bitratemode; | 124 | int bitratemode; |
117 | char nick[IW_ESSID_MAX_SIZE+1]; | 125 | char nick[IW_ESSID_MAX_SIZE+1]; |