summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-07 03:56:06 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:02:31 -0400
commitc238c8ac63f2d33ea5e7c0b9e9e0ccd8ae9a34e4 (patch)
treec1153e29df9ae06fa5d2a7539aa24edc97af9122
parent78485475618cf9f1c70dc7f15e8deafa8b6074ab (diff)
downloadkernel-crypto-c238c8ac63f2d33ea5e7c0b9e9e0ccd8ae9a34e4.tar.gz
kernel-crypto-c238c8ac63f2d33ea5e7c0b9e9e0ccd8ae9a34e4.tar.xz
kernel-crypto-c238c8ac63f2d33ea5e7c0b9e9e0ccd8ae9a34e4.zip
cfg80211: dont use union for wext
Otherwise it becomes very hard to reset the structs correctly since wext can be configured while the interface is down. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/net/cfg80211.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 71847d3c264..fe49833242d 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1270,10 +1270,8 @@ struct wireless_dev {
#ifdef CONFIG_WIRELESS_EXT
/* wext data */
struct {
- union {
- struct cfg80211_ibss_params ibss;
- struct cfg80211_connect_params connect;
- };
+ struct cfg80211_ibss_params ibss;
+ struct cfg80211_connect_params connect;
u8 *ie;
size_t ie_len;
u8 bssid[ETH_ALEN];