From 409209dc6cba8a8202e9b3e578a3dc8e3ebfc3c6 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 7 Jul 2009 03:56:06 +0200
Subject: [PATCH] --- yaml --- r: 158950 b: refs/heads/master c:
 c238c8ac63f2d33ea5e7c0b9e9e0ccd8ae9a34e4 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 66c2f144d44c..acffd9d74967 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78485475618cf9f1c70dc7f15e8deafa8b6074ab
+refs/heads/master: c238c8ac63f2d33ea5e7c0b9e9e0ccd8ae9a34e4
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 71847d3c2640..fe49833242d7 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/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];