diff options
| author |   stsp <stsp@openbsd.org> | 2020-06-11 11:27:44 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2020-06-11 11:27:44 +0000 |
| commit | 3f8949270847f94d3a2b70e8d4487fc3c8045f8f (patch) | |
| tree | 7f55bdeb03fa8c73e77c62747c5baff3194fd166 /sys/dev/pci/if_iwx.c | |
| parent | Fix a crash when completing sessions, from Anindya Mukherjee. (diff) | |
| download | wireguard-openbsd-3f8949270847f94d3a2b70e8d4487fc3c8045f8f.tar.xz wireguard-openbsd-3f8949270847f94d3a2b70e8d4487fc3c8045f8f.zip | |
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_iwx.c')
| -rw-r--r-- | sys/dev/pci/if_iwx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index b1a373951ee..b5cc5abfc62 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.25 2020/06/11 08:30:03 stsp Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.26 2020/06/11 11:27:44 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -4856,7 +4856,6 @@ int iwx_fill_probe_req(struct iwx_softc *sc, struct iwx_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); @@ -4874,7 +4873,6 @@ iwx_fill_probe_req(struct iwx_softc *sc, struct iwx_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); |