diff --git a/[refs] b/[refs] index 15daba7b238b..d277f972bc63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43d01c563d271260c1e4fe0a9383c47fae96887f +refs/heads/master: e623157b8d778a63736b0f41c04acc57c4f61ae0 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 9a264379d7b1..6faa7006681a 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -4128,6 +4128,14 @@ ieee80211_sta_scan_result(struct net_device *dev, bss->rsn_ie); } + if (bss && bss->ht_ie) { + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVGENIE; + iwe.u.data.length = bss->ht_ie_len; + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + bss->ht_ie); + } + if (bss && bss->supp_rates_len > 0) { /* display all supported rates in readable format */ char *p = current_ev + IW_EV_LCP_LEN;