brcmf_err("SET SSID error (%d)\n", err);
                        goto exit;
                }
+
+               if (settings->hidden_ssid) {
+                       err = brcmf_fil_iovar_int_set(ifp, "closednet", 1);
+                       if (err) {
+                               brcmf_err("closednet error (%d)\n", err);
+                               goto exit;
+                       }
+               }
+
                brcmf_dbg(TRACE, "AP mode configuration complete\n");
        } else if (dev_role == NL80211_IFTYPE_P2P_GO) {
                err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
                        return err;
                }
 
+               /* First BSS doesn't get a full reset */
+               if (ifp->bsscfgidx == 0)
+                       brcmf_fil_iovar_int_set(ifp, "closednet", 0);
+
                memset(&join_params, 0, sizeof(join_params));
                err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
                                             &join_params, sizeof(join_params));