diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:02:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:02:58 -0400 |
| commit | 6cd15a9daf826115356f9403494c76e5aafa7793 (patch) | |
| tree | 3ab9372fca7974dcb4c3c25fa5dc6f267cddeef9 /drivers/net/wireless/wl3501.h | |
| parent | ff1d2767d5a43c85f944e86a45284b721f66196c (diff) | |
| parent | 43f66a6ce8da299344cf1bc2ac2311889cc88555 (diff) | |
| download | talos-op-linux-6cd15a9daf826115356f9403494c76e5aafa7793.tar.gz talos-op-linux-6cd15a9daf826115356f9403494c76e5aafa7793.zip | |
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
Diffstat (limited to 'drivers/net/wireless/wl3501.h')
| -rw-r--r-- | drivers/net/wireless/wl3501.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h index 8636d9306785..b5719437e981 100644 --- a/drivers/net/wireless/wl3501.h +++ b/drivers/net/wireless/wl3501.h @@ -2,7 +2,7 @@ #define __WL3501_H__ #include <linux/spinlock.h> -#include "ieee802_11.h" +#include <net/ieee80211.h> /* define for WLA 2.0 */ #define WL3501_BLKSZ 256 @@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr { struct wl3501_80211_tx_hdr { struct wl3501_80211_tx_plcp_hdr pclp_hdr; - struct ieee802_11_hdr mac_hdr; + struct ieee80211_hdr mac_hdr; } __attribute__ ((packed)); /* |
