path: root/net
diff options
authorJouni Malinen <>2011-08-08 12:11:52 +0300
committerRohan Somvanshi <>2012-02-03 05:54:47 -0800
commitd09473cbe8bf2146ee99178050d9ba698131f80e (patch)
treef97f32ae92d51757bef8be916b7652494f327e01 /net
parenta40d6bc718dcfc910150f357c5f2a0e1f62b63ed (diff)
cfg80211/nl80211: Send AssocReq IEs to user space in AP mode
When user space SME/MLME (e.g., hostapd) is not used in AP mode, the IEs from the (Re)Association Request frame that was processed in firmware need to be made available for user space (e.g., RSN IE for hostapd). Allow this to be done with cfg80211_new_sta(). (cherry picked from commit d692df224b8605095cb7f770c1c99d3150834daf from Signed-off-by: Jouni Malinen <> Acked-by: Johannes Berg <> Signed-off-by: John W. Linville <> Signed-off-by: Dmitry Shmidt <> Signed-off-by: Varun Wadekar <> Change-Id: I211171ca4953832cc998402c149ecf3fc429f9e6 Reviewed-on: http://git-master/r/78886 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'net')
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a5c132045ba4..bbf42aa22031 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);