adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-01 05:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

orinoco: Change set_tkip to use orinoco_private instead of hermes_t

Browse source 
hw.h does not include hermes.h, and none of the other functions
requires types from that file. Also hermes_t is a (discouraged) typedef
so we can't add a forward declaration. Therefore change this function to
use orinoco_private.

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Kilroy 2009-06-18 23:21:25 +01:00 committed by John W. Linville
parent 8e638267a8
commit 98e5f40448
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/wireless/orinoco/hw.c
View file

@ -677,8 +677,8 @@ int __orinoco_hw_setup_enc(struct orinoco_private *priv)
* rsc must be 8 bytes * rsc must be 8 bytes
* tsc must be 8 bytes or NULL * tsc must be 8 bytes or NULL
*/ */
int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx, int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
u8 *key, u8 *rsc, u8 *tsc) int set_tx, u8 *key, u8 *rsc, u8 *tsc)
{ {
struct { struct {
__le16 idx; __le16 idx;
@ -688,6 +688,7 @@ int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx,
u8 rx_mic[MIC_KEYLEN]; u8 rx_mic[MIC_KEYLEN];
u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; u8 tsc[IW_ENCODE_SEQ_MAX_SIZE];
} __attribute__ ((packed)) buf; } __attribute__ ((packed)) buf;
hermes_t *hw = &priv->hw;
int ret; int ret;
int err; int err;
int k; int k;

4
drivers/net/wireless/orinoco/hw.h
View file

@ -35,8 +35,8 @@ int orinoco_hw_get_act_bitrate(struct orinoco_private *priv, int *bitrate);
int __orinoco_hw_set_wap(struct orinoco_private *priv); int __orinoco_hw_set_wap(struct orinoco_private *priv);
int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv); int __orinoco_hw_setup_wepkeys(struct orinoco_private *priv);
int __orinoco_hw_setup_enc(struct orinoco_private *priv); int __orinoco_hw_setup_enc(struct orinoco_private *priv);
int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx, int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
u8 *key, u8 *rsc, u8 *tsc); int set_tx, u8 *key, u8 *rsc, u8 *tsc);
int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx); int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx);
int __orinoco_hw_set_multicast_list(struct orinoco_private *priv, int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,
struct dev_addr_list *mc_list, struct dev_addr_list *mc_list,

3
drivers/net/wireless/orinoco/wext.c
View file

@ -1079,7 +1079,6 @@ static int orinoco_ioctl_set_encodeext(struct net_device *dev,
case IW_ENCODE_ALG_TKIP: case IW_ENCODE_ALG_TKIP:
{ {
hermes_t *hw = &priv->hw;
u8 *tkip_iv = NULL; u8 *tkip_iv = NULL;
if (!priv->has_wpa || if (!priv->has_wpa ||
@ -1094,7 +1093,7 @@ static int orinoco_ioctl_set_encodeext(struct net_device *dev,
if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID)
tkip_iv = &ext->rx_seq[0]; tkip_iv = &ext->rx_seq[0];
err = __orinoco_hw_set_tkip_key(hw, idx, err = __orinoco_hw_set_tkip_key(priv, idx,
ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY, ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY,
(u8 *) &priv->tkip_key[idx], (u8 *) &priv->tkip_key[idx],
tkip_iv, NULL); tkip_iv, NULL);