svn commit: r318213 - head/sys/dev/iwm
Adrian Chadd
adrian at FreeBSD.org
Fri May 12 05:21:03 UTC 2017
Author: adrian
Date: Fri May 12 05:21:02 2017
New Revision: 318213
URL: https://svnweb.freebsd.org/changeset/base/318213
Log:
[if_iwm] Get rid of another usage of the IWM_DEFAULT_MACID/_COLOR constant.
Obtained from: dragonflybsd.git c009badecf7b1389cd86adde9fd35f6113c75b5b
Modified:
head/sys/dev/iwm/if_iwm.c
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Fri May 12 05:19:08 2017 (r318212)
+++ head/sys/dev/iwm/if_iwm.c Fri May 12 05:21:02 2017 (r318213)
@@ -3895,6 +3895,7 @@ iwm_mvm_send_add_sta_cmd_status(struct i
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
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++) {
More information about the svn-src-head
mailing list