aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/main.c
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2009-08-05 16:23:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:12:42 -0400
commit5c9f41e285ad60013f0962746192769f899757be (patch)
treef834a575208c6b93e84c9ff57df65118399296fe /drivers/net/wireless/orinoco/main.c
parentbb7e43c061ad1e52a4738d5b45595ec9e1638b6a (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/main.c')
-rw-r--r--drivers/net/wireless/orinoco/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index e8c550a61f33..931f7deddb54 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -380,7 +380,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
380 380
381 tx_control = HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX; 381 tx_control = HERMES_TXCTRL_TX_OK | HERMES_TXCTRL_TX_EX;
382 382
383 if (priv->encode_alg == IW_ENCODE_ALG_TKIP) 383 if (priv->encode_alg == ORINOCO_ALG_TKIP)
384 tx_control |= (priv->tx_key << HERMES_MIC_KEY_ID_SHIFT) | 384 tx_control |= (priv->tx_key << HERMES_MIC_KEY_ID_SHIFT) |
385 HERMES_TXCTRL_MIC; 385 HERMES_TXCTRL_MIC;
386 386
@@ -462,7 +462,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
462 } 462 }
463 463
464 /* Calculate Michael MIC */ 464 /* Calculate Michael MIC */
465 if (priv->encode_alg == IW_ENCODE_ALG_TKIP) { 465 if (priv->encode_alg == ORINOCO_ALG_TKIP) {
466 u8 mic_buf[MICHAEL_MIC_LEN + 1]; 466 u8 mic_buf[MICHAEL_MIC_LEN + 1];
467 u8 *mic; 467 u8 *mic;
468 size_t offset; 468 size_t offset;
@@ -2040,7 +2040,7 @@ int orinoco_init(struct orinoco_private *priv)
2040 priv->channel = 0; /* use firmware default */ 2040 priv->channel = 0; /* use firmware default */
2041 2041
2042 priv->promiscuous = 0; 2042 priv->promiscuous = 0;
2043 priv->encode_alg = IW_ENCODE_ALG_NONE; 2043 priv->encode_alg = ORINOCO_ALG_NONE;
2044 priv->tx_key = 0; 2044 priv->tx_key = 0;
2045 priv->wpa_enabled = 0; 2045 priv->wpa_enabled = 0;
2046 priv->tkip_cm_active = 0; 2046 priv->tkip_cm_active = 0;