---

yaml --- r: 158950 b: refs/heads/master c: c238c8a h: refs/heads/master v: v3
git-mirror · Jul 10, 2009 · 409209d · 409209d
1 parent d2d6601
commit 409209d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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];