diff options
| author | sam <sam@FreeBSD.org> | 2003-06-28 06:17:26 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2003-06-28 06:17:26 +0000 |
| commit | 83c82ef638b47ee2a19f6c9f361dc79d8fefdea2 (patch) | |
| tree | 6f38a1a79d998c20ed7651406ffd556fe4858396 /sys/dev/an | |
| parent | 11ef034744518ddd1e6510fa963c27e85ca457a1 (diff) | |
| download | FreeBSD-src-83c82ef638b47ee2a19f6c9f361dc79d8fefdea2.zip FreeBSD-src-83c82ef638b47ee2a19f6c9f361dc79d8fefdea2.tar.gz | |
update for new 802.11 support
Diffstat (limited to 'sys/dev/an')
| -rw-r--r-- | sys/dev/an/if_an.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c index 9d6c568..e799986 100644 --- a/sys/dev/an/if_an.c +++ b/sys/dev/an/if_an.c @@ -116,9 +116,11 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if_dl.h> #include <net/if_types.h> -#include <net/if_ieee80211.h> #include <net/if_media.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_ioctl.h> + #ifdef INET #include <netinet/in.h> #include <netinet/in_systm.h> @@ -788,7 +790,7 @@ an_attach(sc, unit, flags) ADD(IFM_AUTO, IFM_IEEE80211_ADHOC); for (i = 0; i < nrate; i++) { r = sc->an_caps.an_rates[i]; - mword = ieee80211_rate2media(r, IEEE80211_T_DS); + mword = ieee80211_rate2media(NULL, r, IEEE80211_T_DS); if (mword == 0) continue; printf("%s%d%sMbps", (i != 0 ? " " : ""), @@ -3072,10 +3074,8 @@ an_media_change(ifp) else sc->an_config.an_opmode = AN_OPMODE_INFRASTRUCTURE_STATION; - sc->an_tx_rate = - ieee80211_media2rate( - IFM_SUBTYPE(sc->an_ifmedia.ifm_cur->ifm_media), - IEEE80211_T_DS); + sc->an_tx_rate = ieee80211_media2rate( + IFM_SUBTYPE(sc->an_ifmedia.ifm_cur->ifm_media)); if (orate != sc->an_tx_rate) { /* Read the current configuration */ @@ -3124,8 +3124,8 @@ an_media_status(ifp, imr) if (sc->an_config.an_opmode == AN_OPMODE_IBSS_ADHOC) imr->ifm_active |= IFM_IEEE80211_ADHOC; - imr->ifm_active |= ieee80211_rate2media(status.an_current_tx_rate, - IEEE80211_T_DS); + imr->ifm_active |= ieee80211_rate2media(NULL, + status.an_current_tx_rate, IEEE80211_T_DS); imr->ifm_status = IFM_AVALID; if (status.an_opmode & AN_STATUS_OPMODE_ASSOCIATED) imr->ifm_status |= IFM_ACTIVE; |
