diff options
Diffstat (limited to 'net/ieee80211/ieee80211_crypt_ccmp.c')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_ccmp.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c index 1e6644b133d..d3b5cdee69e 100644 --- a/net/ieee80211/ieee80211_crypt_ccmp.c +++ b/net/ieee80211/ieee80211_crypt_ccmp.c @@ -119,7 +119,7 @@ static inline void xor_block(u8 * b, u8 * a, size_t len)  }  static void ccmp_init_blocks(struct crypto_tfm *tfm, -			     struct ieee80211_hdr *hdr, +			     struct ieee80211_hdr_4addr *hdr,  			     u8 * pn, size_t dlen, u8 * b0, u8 * auth, u8 * s0)  {  	u8 *pos, qc = 0; @@ -196,7 +196,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)  	struct ieee80211_ccmp_data *key = priv;  	int data_len, i, blocks, last, len;  	u8 *pos, *mic; -	struct ieee80211_hdr *hdr; +	struct ieee80211_hdr_4addr *hdr;  	u8 *b0 = key->tx_b0;  	u8 *b = key->tx_b;  	u8 *e = key->tx_e; @@ -229,7 +229,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)  	*pos++ = key->tx_pn[1];  	*pos++ = key->tx_pn[0]; -	hdr = (struct ieee80211_hdr *)skb->data; +	hdr = (struct ieee80211_hdr_4addr *)skb->data;  	ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);  	blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN; @@ -258,7 +258,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)  {  	struct ieee80211_ccmp_data *key = priv;  	u8 keyidx, *pos; -	struct ieee80211_hdr *hdr; +	struct ieee80211_hdr_4addr *hdr;  	u8 *b0 = key->rx_b0;  	u8 *b = key->rx_b;  	u8 *a = key->rx_a; @@ -272,7 +272,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)  		return -1;  	} -	hdr = (struct ieee80211_hdr *)skb->data; +	hdr = (struct ieee80211_hdr_4addr *)skb->data;  	pos = skb->data + hdr_len;  	keyidx = pos[3];  	if (!(keyidx & (1 << 5))) {  |