projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[powerpc.git]
/
drivers
/
net
/
wireless
/
wl3501.h
diff --git
a/drivers/net/wireless/wl3501.h
b/drivers/net/wireless/wl3501.h
index
8636d93
..
4303c50
100644
(file)
--- a/
drivers/net/wireless/wl3501.h
+++ b/
drivers/net/wireless/wl3501.h
@@
-2,7
+2,7
@@
#define __WL3501_H__
#include <linux/spinlock.h>
#define __WL3501_H__
#include <linux/spinlock.h>
-#include
"ieee802_11.h"
+#include
<net/ieee80211.h>
/* define for WLA 2.0 */
#define WL3501_BLKSZ 256
/* 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 wl3501_80211_tx_hdr {
struct wl3501_80211_tx_plcp_hdr pclp_hdr;
- struct ieee802
_11_hdr
mac_hdr;
+ struct ieee802
11_hdr_4addr
mac_hdr;
} __attribute__ ((packed));
/*
} __attribute__ ((packed));
/*
@@
-609,6
+609,7
@@
struct wl3501_card {
struct net_device_stats stats;
struct iw_statistics wstats;
struct iw_spy_data spy_data;
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;
};
#endif
struct dev_node_t node;
};
#endif