浏览代码

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>
Johannes Berg 16 年之前
父节点
当前提交
c238c8ac63
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      include/net/cfg80211.h

+ 2 - 4
include/net/cfg80211.h

@@ -1270,10 +1270,8 @@ struct wireless_dev {
 #ifdef CONFIG_WIRELESS_EXT
 #ifdef CONFIG_WIRELESS_EXT
 	/* wext data */
 	/* wext data */
 	struct {
 	struct {
-		union {
-			struct cfg80211_ibss_params ibss;
-			struct cfg80211_connect_params connect;
-		};
+		struct cfg80211_ibss_params ibss;
+		struct cfg80211_connect_params connect;
 		u8 *ie;
 		u8 *ie;
 		size_t ie_len;
 		size_t ie_len;
 		u8 bssid[ETH_ALEN];
 		u8 bssid[ETH_ALEN];