diff options
| author | Jouni Malinen <jkmaline@cc.hut.fi> | 2005-07-30 20:43:19 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-31 00:28:02 -0400 |
| commit | ebed67d2847a9d299b47eeb5d82744671ab2b198 (patch) | |
| tree | 9565c6fdaa7745669ec11087e259544cc6b31d2f /drivers/net/wireless/hostap/hostap_crypt_ccmp.c | |
| parent | f3b10e1636dec053f4874d593e3de5d46da48a5f (diff) | |
| download | linux-ebed67d2847a9d299b47eeb5d82744671ab2b198.tar.gz linux-ebed67d2847a9d299b47eeb5d82744671ab2b198.tar.bz2 linux-ebed67d2847a9d299b47eeb5d82744671ab2b198.zip | |
[PATCH] hostap: Start using net/ieee80211.h
Preparations for starting to use net/ieee80211 instead of private
IEEE 802.11 implementation. Include net/ieee80211.h and
net/ieee80211_crypt.h into files that will be needed these in the
future. Remove duplicate definitions from hostap_common.h and
rename WLAN_FC_GET_{TYPE,STYPE} macros for now sinc net/ieee80211.h
is using incompatible definitions. This will be resolved in the
future by updating Host AP to use the versions that do not shift
type/stype.
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_crypt_ccmp.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_crypt_ccmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_crypt_ccmp.c b/drivers/net/wireless/hostap/hostap_crypt_ccmp.c index ad26aac2d5fe..9e18340f7a38 100644 --- a/drivers/net/wireless/hostap/hostap_crypt_ccmp.c +++ b/drivers/net/wireless/hostap/hostap_crypt_ccmp.c @@ -151,8 +151,8 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, fc = le16_to_cpu(hdr->frame_control); a4_included = ((fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) == (WLAN_FC_TODS | WLAN_FC_FROMDS)); - qc_included = ((WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_DATA) && - (WLAN_FC_GET_STYPE(fc) & 0x08)); + qc_included = ((HOSTAP_FC_GET_TYPE(fc) == WLAN_FC_TYPE_DATA) && + (HOSTAP_FC_GET_STYPE(fc) & 0x08)); aad_len = 22; if (a4_included) aad_len += 6; |