cfg80211: dont use union for wext
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 7 Jul 2009 01:56:06 +0000 (03:56 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jul 2009 19:02:31 +0000 (15:02 -0400)
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>
include/net/cfg80211.h

index 71847d3c264043d3937a8f4e607ac14b116ddfbf..fe49833242d771dc5fa22d9eb7e379fac38d48c9 100644 (file)
@@ -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];