Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98e5f404 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: Change set_tkip to use orinoco_private instead of hermes_t 



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: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8e638267

drivers/net/wireless/orinoco/hw.c

+3 −2
Original line number Diff line number Diff line
@@ -677,8 +677,8 @@ int __orinoco_hw_setup_enc(struct orinoco_private *priv) 
 * rsc must be 8 bytes

 * tsc must be 8 bytes or NULL

 */

int __orinoco_hw_set_tkip_key(hermes_t *hw, int key_idx, int set_tx,

			      u8 *key, u8 *rsc, u8 *tsc)

int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,

			      int set_tx, u8 *key, u8 *rsc, u8 *tsc)

{

	struct {

		__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 tsc[IW_ENCODE_SEQ_MAX_SIZE];

	} __attribute__ ((packed)) buf;

	hermes_t *hw = &priv->hw;

	int ret;

	int err;

	int k;

drivers/net/wireless/orinoco/hw.h

+2 −2
Original line number Diff line number Diff line
@@ -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_setup_wepkeys(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,

			      u8 *key, u8 *rsc, u8 *tsc);

int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,

			      int set_tx, u8 *key, u8 *rsc, u8 *tsc);

int orinoco_clear_tkip_key(struct orinoco_private *priv, int key_idx);

int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,

				    struct dev_addr_list *mc_list,

drivers/net/wireless/orinoco/wext.c

+1 −2
Original line number Diff line number Diff line
@@ -1079,7 +1079,6 @@ static int orinoco_ioctl_set_encodeext(struct net_device *dev, 


		case IW_ENCODE_ALG_TKIP:

		{

			hermes_t *hw = &priv->hw;

			u8 *tkip_iv = NULL;



			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)

				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,

				 (u8 *) &priv->tkip_key[idx],

				 tkip_iv, NULL);