diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2020-06-11 11:27:45 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2020-06-11 11:27:45 +0000 |
| commit | 0a134950a0c0c483bcc44b0ea5787297c12dbceb (patch) | |
| tree | f206f2dafbfdac4f2bd2b35fc0f98804a84cdb1a /sys/dev/pci/if_iwm.c | |
| parent | 49a6d9d8c94a9e45ebc01e049ca416f525559da9 (diff) | |
In iwn(4), iwm(4), and iwx(4), don't set the interface's MAC address again
while building a scan command for the firmware. This isn't the right place
to set our address, which has already been set during driver initialization.
ok mpi@ kettenis@
Diffstat (limited to 'sys/dev/pci/if_iwm.c')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 69c252f4e8a..3a75d07a60a 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.311 2020/06/02 02:26:36 jmatthew Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.312 2020/06/11 11:27:44 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -5610,7 +5610,6 @@ int iwm_fill_probe_req(struct iwm_softc *sc, struct iwm_scan_probe_req *preq) { struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = IC2IFP(ic); struct ieee80211_frame *wh = (struct ieee80211_frame *)preq->buf; struct ieee80211_rateset *rs; size_t remain = sizeof(preq->buf); @@ -5628,7 +5627,6 @@ iwm_fill_probe_req(struct iwm_softc *sc, struct iwm_scan_probe_req *preq) wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ; wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; - IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); IEEE80211_ADDR_COPY(wh->i_addr1, etherbroadcastaddr); IEEE80211_ADDR_COPY(wh->i_addr2, ic->ic_myaddr); IEEE80211_ADDR_COPY(wh->i_addr3, etherbroadcastaddr); |