PERFORCE change 112678 for review
Kip Macy
kmacy at FreeBSD.org
Sun Jan 7 22:20:10 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=112678
Change 112678 by kmacy at kmacy_storage:sam_wifi on 2007/01/08 06:19:25
make compile
Affected files ...
.. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#2 edit
Differences ...
==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#2 (text+ko) ====
@@ -447,7 +447,6 @@
IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ;
}
- ic->ic_ibss_chan = &ic->ic_channels[0];
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
ifp->if_softc = sc;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
@@ -979,11 +978,14 @@
switch (nstate) {
case IEEE80211_S_SCAN:
+ /* make the link LED blink while we're scanning */
+ wpi_set_led(sc, WPI_LED_LINK, 20, 2);
+ break;
+#if 0
+
ieee80211_node_table_reset(&ic->ic_scan);
ic->ic_flags |= IEEE80211_F_SCAN | IEEE80211_F_ASCAN;
- /* make the link LED blink while we're scanning */
- wpi_set_led(sc, WPI_LED_LINK, 20, 2);
if ((error = wpi_scan(sc,IEEE80211_CHAN_G)) != 0) {
device_printf(sc->sc_dev, "could not initiate scan\n");
@@ -994,7 +996,7 @@
ic->ic_state = nstate;
return 0;
-
+#endif
case IEEE80211_S_AUTH:
sc->config.state &= ~htole16(WPI_STATE_ASSOCIATED);
sc->config.filter &= ~htole32(WPI_FILTER_BSS);
@@ -1420,7 +1422,7 @@
ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh);
/* send the frame to the 802.11 layer */
- ieee80211_input(ic, m, ni, stat->rssi, 0);
+ ieee80211_input(ic, m, ni, stat->rssi, 0, 0);
/* release node reference */
ieee80211_free_node(ni);
@@ -1582,7 +1584,6 @@
if (wpi_scan(sc, IEEE80211_CHAN_A) == 0)
break;
}
- ieee80211_end_scan(ic);
break;
}
}
@@ -1970,7 +1971,6 @@
}
}
- ieee80211_watchdog(&sc->sc_ic);
skip:
mtx_unlock(&sc->sc_mtx);
@@ -2393,8 +2393,8 @@
hdr->mask = htole32(0xffffffff);
hdr->magic1 = htole32(1 << 13);
- hdr->esslen = ic->ic_des_esslen;
- memcpy(hdr->essid, ic->ic_des_essid, ic->ic_des_esslen);
+ hdr->esslen = ic->ic_des_ssid[0].len;
+ memcpy(hdr->essid, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len);
/*
* Build a probe request frame. Most of the following code is a
@@ -2414,11 +2414,11 @@
/* add essid IE */
*frm++ = IEEE80211_ELEMID_SSID;
- *frm++ = ic->ic_des_esslen;
- memcpy(frm, ic->ic_des_essid, ic->ic_des_esslen);
- frm += ic->ic_des_esslen;
+ *frm++ = ic->ic_des_ssid[0].len;
+ memcpy(frm, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len);
+ frm += ic->ic_des_ssid[0].len;
- mode = ieee80211_chan2mode(ic, ic->ic_ibss_chan);
+ mode = ieee80211_chan2mode(ic->ic_curchan);
rs = &ic->ic_sup_rates[mode];
/* add supported rates IE */
@@ -2547,9 +2547,9 @@
// IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl));
IEEE80211_ADDR_COPY(sc->config.myaddr, ic->ic_myaddr);
/*set default channel*/
- sc->config.chan = ieee80211_chan2ieee(ic, ic->ic_ibss_chan);
+ sc->config.chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
sc->config.flags = htole32(WPI_CONFIG_TSF);
- if (IEEE80211_IS_CHAN_2GHZ(ic->ic_ibss_chan)) {
+ if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) {
sc->config.flags |= htole32(WPI_CONFIG_AUTO |
WPI_CONFIG_24GHZ);
}
@@ -2570,6 +2570,8 @@
sc->config.mode = WPI_MODE_MONITOR;
sc->config.filter |= htole32(WPI_FILTER_MULTICAST |
WPI_FILTER_CTL | WPI_FILTER_PROMISC);
+ case IEEE80211_M_WDS:
+ device_printf(sc->sc_dev, "warning WDS not handled");
break;
}
sc->config.cck_mask = 0x0f; /* not yet negotiated */
More information about the p4-projects
mailing list