From 2863c11c8f9db3eedc2f5346260286cf3e5a54ff Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Fri, 12 May 2017 05:21:02 +0000 Subject: [PATCH] [if_iwm] Get rid of another usage of the IWM_DEFAULT_MACID/_COLOR constant. Obtained from: dragonflybsd.git c009badecf7b1389cd86adde9fd35f6113c75b5b --- sys/dev/iwm/if_iwm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 14ad2320725..46c04c7af93 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -3895,6 +3895,7 @@ iwm_mvm_send_add_sta_cmd_status(struct iwm_softc *sc, static int iwm_mvm_sta_send_to_fw(struct iwm_softc *sc, struct iwm_node *in, int update) { + struct iwm_vap *ivp = IWM_VAP(in->in_ni.ni_vap); struct iwm_mvm_add_sta_cmd add_sta_cmd; int ret; uint32_t status; @@ -3903,8 +3904,7 @@ iwm_mvm_sta_send_to_fw(struct iwm_softc *sc, struct iwm_node *in, int update) add_sta_cmd.sta_id = IWM_STATION_ID; add_sta_cmd.mac_id_n_color - = htole32(IWM_FW_CMD_ID_AND_COLOR(IWM_DEFAULT_MACID, - IWM_DEFAULT_COLOR)); + = htole32(IWM_FW_CMD_ID_AND_COLOR(ivp->id, ivp->color)); if (!update) { int ac; for (ac = 0; ac < WME_NUM_AC; ac++) {