Index: sys/dev/iwm/if_iwm.c
===================================================================
--- sys/dev/iwm/if_iwm.c	(revision 304880)
+++ sys/dev/iwm/if_iwm.c	(working copy)
@@ -2697,9 +2697,11 @@
 	}
 
 	/* Init Smart FIFO. */
+#if 0
 	error = iwm_mvm_sf_config(sc, IWM_SF_INIT_OFF);
 	if (error != 0)
 		return error;
+#endif
 
 	/* Send TX valid antennas before triggering calibrations */
 	if ((error = iwm_send_tx_ant_cfg(sc, iwm_fw_valid_tx_ant(sc))) != 0) {
@@ -3788,9 +3790,11 @@
 
 	in->in_assoc = 0;
 
+#if 0
 	error = iwm_mvm_sf_config(sc, IWM_SF_FULL_ON);
 	if (error != 0)
 		return error;
+#endif
 
 	error = iwm_allow_mcast(vap, sc);
 	if (error) {
Index: sys/dev/iwm/if_iwm_mac_ctxt.c
===================================================================
--- sys/dev/iwm/if_iwm_mac_ctxt.c	(revision 304879)
+++ sys/dev/iwm/if_iwm_mac_ctxt.c	(working copy)
@@ -280,7 +280,7 @@
 	/*
 	 * XXX should we error out if in_assoc is 1 and ni == NULL?
 	 */
-#if 0
+#if 1
 	if (in->in_assoc) {
 		IEEE80211_ADDR_COPY(cmd->bssid_addr, ni->ni_bssid);
 	} else {