diff options
| author | David Kilroy <kilroyd@googlemail.com> | 2009-08-05 21:23:28 +0100 |
|---|---|---|
| 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) | |
| download | talos-obmc-linux-5c9f41e285ad60013f0962746192769f899757be.tar.gz talos-obmc-linux-5c9f41e285ad60013f0962746192769f899757be.zip | |
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 2a4eef1b96cc..badfc5665242 100644 --- a/drivers/net/wireless/orinoco/orinoco.h +++ b/drivers/net/wireless/orinoco/orinoco.h @@ -25,6 +25,7 @@ #define MAX_SCAN_LEN 4096 +#define ORINOCO_SEQ_LEN 8 #define ORINOCO_MAX_KEY_SIZE 14 #define ORINOCO_MAX_KEYS 4 @@ -42,6 +43,12 @@ struct orinoco_tkip_key { u8 rx_mic[MIC_KEYLEN]; }; +enum orinoco_alg { + ORINOCO_ALG_NONE, + ORINOCO_ALG_WEP, + ORINOCO_ALG_TKIP +}; + typedef enum { FIRMWARE_TYPE_AGERE, FIRMWARE_TYPE_INTERSIL, @@ -111,7 +118,8 @@ struct orinoco_private { /* Configuration paramaters */ enum nl80211_iftype iw_mode; - u16 encode_alg, wep_restrict, tx_key; + enum orinoco_alg encode_alg; + u16 wep_restrict, tx_key; struct orinoco_key keys[ORINOCO_MAX_KEYS]; int bitratemode; char nick[IW_ESSID_MAX_SIZE+1]; |
