View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-4 / +6 lines)
Lines 2926-2932 Link Here
2926
		return EINVAL;
2926
		return EINVAL;
2927
2927
2928
	memset(&node, 0, sizeof node);
2928
	memset(&node, 0, sizeof node);
2929
	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_bssid);
2929
	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr);
2930
	node.id = wn->id;
2930
	node.id = wn->id;
2931
	node.plcp = (ic->ic_curmode == IEEE80211_MODE_11A) ?
2931
	node.plcp = (ic->ic_curmode == IEEE80211_MODE_11A) ?
2932
	    wpi_ridx_to_plcp[WPI_RIDX_OFDM6] : wpi_ridx_to_plcp[WPI_RIDX_CCK1];
2932
	    wpi_ridx_to_plcp[WPI_RIDX_OFDM6] : wpi_ridx_to_plcp[WPI_RIDX_CCK1];
Lines 2993-2999 Link Here
2993
	}
2993
	}
2994
2994
2995
	memset(&node, 0, sizeof node);
2995
	memset(&node, 0, sizeof node);
2996
	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_bssid);
2996
	IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr);
2997
	node.count = 1;
2997
	node.count = 1;
2998
2998
2999
	error = wpi_cmd(sc, WPI_CMD_DEL_NODE, &node, sizeof node, 1);
2999
	error = wpi_cmd(sc, WPI_CMD_DEL_NODE, &node, sizeof node, 1);
Lines 3404-3409 Link Here
3404
{
3404
{
3405
	struct ifnet *ifp = sc->sc_ifp;
3405
	struct ifnet *ifp = sc->sc_ifp;
3406
	struct ieee80211com *ic = ifp->if_l2com;
3406
	struct ieee80211com *ic = ifp->if_l2com;
3407
	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
3407
	uint32_t flags;
3408
	uint32_t flags;
3408
	int error;
3409
	int error;
3409
3410
Lines 3425-3431 Link Here
3425
3426
3426
	/* Configure adapter. */
3427
	/* Configure adapter. */
3427
	memset(&sc->rxon, 0, sizeof (struct wpi_rxon));
3428
	memset(&sc->rxon, 0, sizeof (struct wpi_rxon));
3428
	IEEE80211_ADDR_COPY(sc->rxon.myaddr, IF_LLADDR(ifp));
3429
	IEEE80211_ADDR_COPY(sc->rxon.myaddr, vap->iv_myaddr);
3429
3430
3430
	/* Set default channel. */
3431
	/* Set default channel. */
3431
	sc->rxon.chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
3432
	sc->rxon.chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
Lines 3559-3564 Link Here
3559
	struct ifnet *ifp = sc->sc_ifp;
3560
	struct ifnet *ifp = sc->sc_ifp;
3560
	struct ieee80211com *ic = ifp->if_l2com;
3561
	struct ieee80211com *ic = ifp->if_l2com;
3561
	struct ieee80211_scan_state *ss = ic->ic_scan;
3562
	struct ieee80211_scan_state *ss = ic->ic_scan;
3563
	struct ieee80211vap *vap = ss->ss_vap;
3562
	struct wpi_scan_hdr *hdr;
3564
	struct wpi_scan_hdr *hdr;
3563
	struct wpi_cmd_data *tx;
3565
	struct wpi_cmd_data *tx;
3564
	struct wpi_scan_essid *essids;
3566
	struct wpi_scan_essid *essids;
Lines 3645-3651 Link Here
3645
		IEEE80211_FC0_SUBTYPE_PROBE_REQ;
3647
		IEEE80211_FC0_SUBTYPE_PROBE_REQ;
3646
	wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
3648
	wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
3647
	IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr);
3649
	IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr);
3648
	IEEE80211_ADDR_COPY(wh->i_addr2, IF_LLADDR(ifp));
3650
	IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
3649
	IEEE80211_ADDR_COPY(wh->i_addr3, ifp->if_broadcastaddr);
3651
	IEEE80211_ADDR_COPY(wh->i_addr3, ifp->if_broadcastaddr);
3650
	*(uint16_t *)&wh->i_dur[0] = 0;	/* filled by h/w */
3652
	*(uint16_t *)&wh->i_dur[0] = 0;	/* filled by h/w */
3651
	*(uint16_t *)&wh->i_seq[0] = 0;	/* filled by h/w */
3653
	*(uint16_t *)&wh->i_seq[0] = 0;	/* filled by h/w */

Return to bug 197143