aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/cfg80211.h4
-rw-r--r--net/wireless/nl80211.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 779e3008df4d..96876d366c6a 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -421,6 +421,7 @@ struct station_parameters {
421 * @STATION_INFO_RX_BITRATE: @rxrate fields are filled 421 * @STATION_INFO_RX_BITRATE: @rxrate fields are filled
422 * @STATION_INFO_BSS_PARAM: @bss_param filled 422 * @STATION_INFO_BSS_PARAM: @bss_param filled
423 * @STATION_INFO_CONNECTED_TIME: @connected_time filled 423 * @STATION_INFO_CONNECTED_TIME: @connected_time filled
424 * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
424 */ 425 */
425enum station_info_flags { 426enum station_info_flags {
426 STATION_INFO_INACTIVE_TIME = 1<<0, 427 STATION_INFO_INACTIVE_TIME = 1<<0,
@@ -439,7 +440,8 @@ enum station_info_flags {
439 STATION_INFO_SIGNAL_AVG = 1<<13, 440 STATION_INFO_SIGNAL_AVG = 1<<13,
440 STATION_INFO_RX_BITRATE = 1<<14, 441 STATION_INFO_RX_BITRATE = 1<<14,
441 STATION_INFO_BSS_PARAM = 1<<15, 442 STATION_INFO_BSS_PARAM = 1<<15,
442 STATION_INFO_CONNECTED_TIME = 1<<16 443 STATION_INFO_CONNECTED_TIME = 1<<16,
444 STATION_INFO_ASSOC_REQ_IES = 1<<17
443}; 445};
444 446
445/** 447/**
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ca7697701076..253e56319d7e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2236,7 +2236,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
2236 } 2236 }
2237 nla_nest_end(msg, sinfoattr); 2237 nla_nest_end(msg, sinfoattr);
2238 2238
2239 if (sinfo->assoc_req_ies) 2239 if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES)
2240 NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len, 2240 NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
2241 sinfo->assoc_req_ies); 2241 sinfo->assoc_req_ies);
2242 2242