Date: Thu, 3 Apr 2008 21:08:30 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 139293 for review Message-ID: <200804032108.m33L8UmZ029563@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=139293 Change 139293 by thompsa@thompsa_burger on 2008/04/03 21:07:30 Always use the internal media routines so nuke the arguments to ieee80211_media_init. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#36 edit .. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#38 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#36 (text+ko) ==== @@ -205,8 +205,7 @@ * available channels as active, and pick a default * channel if not already specified. */ - ieee80211_media_init(ic, - ieee80211com_media_change, ieee80211com_media_status); + ieee80211_media_init(ic); ic->ic_update_mcast = null_update_mcast; ic->ic_update_promisc = null_update_promisc; @@ -933,8 +932,7 @@ } void -ieee80211_media_init(struct ieee80211com *ic, - ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) +ieee80211_media_init(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; int maxrate; @@ -955,7 +953,7 @@ * the set of available modes. */ maxrate = ieee80211_media_setup(ic, &ic->ic_media, ic->ic_caps, 1, - media_change, media_stat); + ieee80211com_media_change, ieee80211com_media_status); /* NB: strip explicit mode; we're actually in autoselect */ ifmedia_set(&ic->ic_media, media_status(ic->ic_opmode, ic->ic_curchan) &~ IFM_MMASK); ==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#12 (text+ko) ==== @@ -391,8 +391,7 @@ memset(&ic->ic_channels[ic->ic_nchans], 0, (IEEE80211_CHAN_MAX - ic->ic_nchans) * sizeof(struct ieee80211_channel)); - ieee80211_media_init(ic, ic->ic_media.ifm_change, - ic->ic_media.ifm_status); + ieee80211_media_init(ic); /* * Invalidate channel-related state. ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#38 (text+ko) ==== @@ -540,8 +540,7 @@ void ieee80211_announce(struct ieee80211com *); void ieee80211_announce_channels(struct ieee80211com *); void ieee80211_drain(struct ieee80211com *); -void ieee80211_media_init(struct ieee80211com *, - ifm_change_cb_t, ifm_stat_cb_t); +void ieee80211_media_init(struct ieee80211com *); struct ieee80211com *ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]); int ieee80211_media_change(struct ifnet *); void ieee80211_media_status(struct ifnet *, struct ifmediareq *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804032108.m33L8UmZ029563>