adapter->ps_info.dtim_interval_duration = bss->dtim_period;
                adapter->ps_info.listen_interval = conf->listen_interval;
 
-       /* If U-APSD is updated, send ps parameters to firmware */
-       if (bss->assoc) {
-               if (common->uapsd_bitmap) {
-                       rsi_dbg(INFO_ZONE, "Configuring UAPSD\n");
-                       rsi_conf_uapsd(adapter, vif);
+               /* If U-APSD is updated, send ps parameters to firmware */
+               if (bss->assoc) {
+                       if (common->uapsd_bitmap) {
+                               rsi_dbg(INFO_ZONE, "Configuring UAPSD\n");
+                               rsi_conf_uapsd(adapter, vif);
+                       }
+               } else {
+                       common->uapsd_bitmap = 0;
                }
-       } else {
-               common->uapsd_bitmap = 0;
-       }
        }
 
        if (changed & BSS_CHANGED_CQM) {