2 files changed, 12 insertions, 0 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 44e72cc13055..779e3008df4d 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -531,6 +531,11 @@ struct sta_bss_parameters {
  *      This number should increase every time the list of stations
  *      changes, i.e. when a station is added or removed, so that
  *      userspace can tell whether it got a consistent snapshot.
+ * @assoc_req_ies: IEs from (Re)Association Request.
+ *      This is used only when in AP mode with drivers that do not use
+ *      user space MLME/SME implementation. The information is provided for
+ *      the cfg80211_new_sta() calls to notify user space of the IEs.
+ * @assoc_req_ies_len: Length of assoc_req_ies buffer in octets.
  */
 struct station_info {
         u32 filled;
@@ -553,6 +558,9 @@ struct station_info {
         struct sta_bss_parameters bss_param;
 
         int generation;
+
+        const u8 *assoc_req_ies;
+        size_t assoc_req_ies_len;
 };
 
 /**
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3b5dc9186071..ca7697701076 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2236,6 +2236,10 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
         }
         nla_nest_end(msg, sinfoattr);
 
+        if (sinfo->assoc_req_ies)
+                NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
+                        sinfo->assoc_req_ies);
+
         return genlmsg_end(msg, hdr);
 
  nla_put_failure: