Merge master.kernel.org:/home/rmk/linux-2.6-arm

[deliverable/linux.git] / drivers / net / wireless / wl3501.h

diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index b5719437e981a680ec655863e89bed5ce88379ec..65ceb088f7000c9e06b371605857302d59beeeff 100644 (file)
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr {
 
 struct wl3501_80211_tx_hdr {
        struct wl3501_80211_tx_plcp_hdr pclp_hdr;
-       struct ieee80211_hdr            mac_hdr;
+       struct ieee80211_hdr_4addr              mac_hdr;
 } __attribute__ ((packed));
 
 /*
@@ -609,6 +609,8 @@ struct wl3501_card {
        struct net_device_stats         stats;
        struct iw_statistics            wstats;
        struct iw_spy_data              spy_data;
+       struct iw_public_data           wireless_data;
        struct dev_node_t               node;
+       struct pcmcia_device            *p_dev;
 };
 #endif