diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 00:48:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 00:48:33 -0700 |
| commit | 5d8c397f304e1363f8ff9749b08172eb59e6534a (patch) | |
| tree | 57ff502553918aa7309b7375e983f27f719e7b28 /drivers/net/wireless/wl3501.h | |
| parent | 44757223cd77f6e332dfa0b043c67df7b665bc19 (diff) | |
| parent | ceeec3dc375e3b0618f16b34efc56fe093918f8b (diff) | |
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 8636d930678..b5719437e98 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)); /* |