Attachment 153983 Details for Bug 197143 – Copy correct addresses to node.macaddr / rxon.myaddr

[patch] Copy correct addresses to node.macaddr / rxon.myaddr

patch-wpi0.diff (text/plain), 1.91 KB, created by Andriy Voskoboinyk on 2015-03-08 00:11:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-03-08 00:11:01 UTC

Size: 1.91 KB

patch

obsolete

>Index: sys/dev/wpi/if_wpi.c
>===================================================================
>--- sys/dev/wpi/if_wpi.c	(revision 278764)
>+++ sys/dev/wpi/if_wpi.c	(working copy)
>@@ -2926,7 +2926,7 @@
> 		return EINVAL;
> 
> 	memset(&node, 0, sizeof node);
>-	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_bssid);
>+	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr);
> 	node.id = wn->id;
> 	node.plcp = (ic->ic_curmode == IEEE80211_MODE_11A) ?
> 	    wpi_ridx_to_plcp[WPI_RIDX_OFDM6] : wpi_ridx_to_plcp[WPI_RIDX_CCK1];
>@@ -2993,7 +2993,7 @@
> 	}
> 
> 	memset(&node, 0, sizeof node);
>-	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_bssid);
>+	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr);
> 	node.count = 1;
> 
> 	error = wpi_cmd(sc, WPI_CMD_DEL_NODE, &node, sizeof node, 1);
>@@ -3404,6 +3404,7 @@
> {
> 	struct ifnet *ifp = sc->sc_ifp;
> 	struct ieee80211com *ic = ifp->if_l2com;
>+	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
> 	uint32_t flags;
> 	int error;
> 
>@@ -3425,7 +3426,7 @@
> 
> 	/* Configure adapter. */
> 	memset(&sc->rxon, 0, sizeof (struct wpi_rxon));
>-	IEEE80211_ADDR_COPY(sc->rxon.myaddr, IF_LLADDR(ifp));
>+	IEEE80211_ADDR_COPY(sc->rxon.myaddr, vap->iv_myaddr);
> 
> 	/* Set default channel. */
> 	sc->rxon.chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
>@@ -3559,6 +3560,7 @@
> 	struct ifnet *ifp = sc->sc_ifp;
> 	struct ieee80211com *ic = ifp->if_l2com;
> 	struct ieee80211_scan_state *ss = ic->ic_scan;
>+	struct ieee80211vap *vap = ss->ss_vap;
> 	struct wpi_scan_hdr *hdr;
> 	struct wpi_cmd_data *tx;
> 	struct wpi_scan_essid *essids;
>@@ -3645,7 +3647,7 @@
> 		IEEE80211_FC0_SUBTYPE_PROBE_REQ;
> 	wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
> 	IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr);
>-	IEEE80211_ADDR_COPY(wh->i_addr2, IF_LLADDR(ifp));
>+	IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
> 	IEEE80211_ADDR_COPY(wh->i_addr3, ifp->if_broadcastaddr);
> 	*(uint16_t *)&wh->i_dur[0] = 0;	/* filled by h/w */
> 	*(uint16_t *)&wh->i_seq[0] = 0;	/* filled by h/w */

Actions: View | Diff

Attachments on bug 197143: 152282 | 152662 | 152977 | 153911 | 153977 | 153983 | 153985 | 153999 | 154000 | 154002 | 154006 | 154007 | 154009 | 154010 | 154011 | 154013 | 154015 | 154016 | 154017 | 154019 | 154020 | 154021 | 154022 | 154024 | 154026 | 154030 | 154032 | 154033 | 154328 | 154329 | 154330 | 154332 | 154334 | 154335 | 154336 | 154337 | 154338 | 154340 | 154341 | 154343 | 154346 | 154347 | 154348 | 154349 | 154350 | 154351 | 154352 | 154353 | 154354 | 154355 | 154356 | 154357 | 154358 | 154359 | 154360 | 154361 | 154362 | 154363 | 154364 | 154365 | 154366 | 154368 | 154369 | 154370 | 154371 | 154372 | 154373 | 154374 | 154375 | 154378 | 154379 | 154380 | 154381 | 154382 | 154383 | 154384 | 155332 | 155333 | 156164 | 156165 | 156166 | 156167 | 156168 | 156169 | 156170 | 156171 | 156172 | 156173 | 156174 | 156175 | 156176 | 156177 | 156178 | 156179 | 156180 | 156181 | 156182 | 156183 | 156184 | 156185 | 156186 | 156187 | 156188 | 156189 | 156190 | 156191 | 156192 | 156193 | 156194 | 156195