diff --git a/[refs] b/[refs] index 7f993fee2b9a..ed586883828a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37659ff8e1d8d1f9c86bdb974d41479ccd001213 +refs/heads/master: 1d1b535969ca5572d87a6fcac49e1e1a31241b99 diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c index 892b5f96a427..c9d00187e790 100644 --- a/trunk/net/mac80211/ieee80211_sta.c +++ b/trunk/net/mac80211/ieee80211_sta.c @@ -3878,8 +3878,8 @@ ieee80211_sta_scan_result(struct net_device *dev, bss->ssid); } - if (bss->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS - || bss_mesh_cfg(bss))) { + if (bss->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS) + || bss_mesh_cfg(bss)) { memset(&iwe, 0, sizeof(iwe)); iwe.cmd = SIOCGIWMODE; if (bss_mesh_cfg(bss))