diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:57:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:57:33 -0400 |
| commit | 4c925f452cfd16c690209e96821ee094e09a2404 (patch) | |
| tree | 4b4ba76aa81b3627142787262fd2f8049dd3662d /drivers/net | |
| parent | 51a730d758ae4052e10ca7e06336f10af598c4fc (diff) | |
| parent | 66b04a80eea60cabf9d89fd34deb3234a740052f (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ipw2100.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h index 0cc5746dd4f1..bb31fa03f69f 100644 --- a/drivers/net/wireless/ipw2100.h +++ b/drivers/net/wireless/ipw2100.h | |||
| @@ -885,7 +885,7 @@ struct ipw2100_priv { | |||
| 885 | 885 | ||
| 886 | 886 | ||
| 887 | 887 | ||
| 888 | #define IPW_HEADER_802_11_SIZE sizeof(struct ieee80211_header_data) | 888 | #define IPW_HEADER_802_11_SIZE sizeof(struct ieee80211_hdr_3addr) |
| 889 | #define IPW_MAX_80211_PAYLOAD_SIZE 2304U | 889 | #define IPW_MAX_80211_PAYLOAD_SIZE 2304U |
| 890 | #define IPW_MAX_802_11_PAYLOAD_LENGTH 2312 | 890 | #define IPW_MAX_802_11_PAYLOAD_LENGTH 2312 |
| 891 | #define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH 1536 | 891 | #define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH 1536 |
| @@ -900,7 +900,7 @@ struct ipw2100_priv { | |||
| 900 | IPW_802_11_FCS_LENGTH) | 900 | IPW_802_11_FCS_LENGTH) |
| 901 | 901 | ||
| 902 | #define IPW_802_11_PAYLOAD_OFFSET \ | 902 | #define IPW_802_11_PAYLOAD_OFFSET \ |
| 903 | (sizeof(struct ieee80211_header_data) + \ | 903 | (sizeof(struct ieee80211_hdr_3addr) + \ |
| 904 | sizeof(struct ieee80211_snap_hdr)) | 904 | sizeof(struct ieee80211_snap_hdr)) |
| 905 | 905 | ||
| 906 | struct ipw2100_rx { | 906 | struct ipw2100_rx { |