diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
| commit | 96b88fb850cc419171f926ad04650ec509e9f543 (patch) | |
| tree | 5bf9537bde467534608b3acdbfa5f7726ede8c3f /drivers/net/wireless/ipw2200.h | |
| parent | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
| download | linux-96b88fb850cc419171f926ad04650ec509e9f543.tar.gz linux-96b88fb850cc419171f926ad04650ec509e9f543.tar.bz2 linux-96b88fb850cc419171f926ad04650ec509e9f543.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless/ipw2200.h')
| -rw-r--r-- | drivers/net/wireless/ipw2200.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index 5b00882133f9..e9cf32bf3e31 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h @@ -1654,12 +1654,12 @@ static const long ipw_frequencies[] = { #define IPW_MAX_CONFIG_RETRIES 10 -static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr) +static inline u32 frame_hdr_len(struct ieee80211_hdr_4addr *hdr) { u32 retval; u16 fc; - retval = sizeof(struct ieee80211_hdr); + retval = sizeof(struct ieee80211_hdr_3addr); fc = le16_to_cpu(hdr->frame_ctl); /* |