Date: Mon, 25 May 2015 18:50:26 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283537 - in head/sys/dev: ath bwi bwn if_ndis ipw iwi malo mwl ral usb/wlan wi wpi wtap Message-ID: <201505251850.t4PIoQrc090574@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon May 25 18:50:26 2015 New Revision: 283537 URL: https://svnweb.freebsd.org/changeset/base/283537 Log: Set ic_softc in all 802.11 drivers. Not required right now, but will be used quite soon. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/dev/ath/if_ath.c head/sys/dev/bwi/if_bwi.c head/sys/dev/bwn/if_bwn.c head/sys/dev/if_ndis/if_ndis.c head/sys/dev/ipw/if_ipw.c head/sys/dev/iwi/if_iwi.c head/sys/dev/malo/if_malo.c head/sys/dev/mwl/if_mwl.c head/sys/dev/ral/rt2560.c head/sys/dev/ral/rt2661.c head/sys/dev/ral/rt2860.c head/sys/dev/usb/wlan/if_rsu.c head/sys/dev/usb/wlan/if_rum.c head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_uath.c head/sys/dev/usb/wlan/if_upgt.c head/sys/dev/usb/wlan/if_ural.c head/sys/dev/usb/wlan/if_urtw.c head/sys/dev/usb/wlan/if_urtwn.c head/sys/dev/usb/wlan/if_zyd.c head/sys/dev/wi/if_wi.c head/sys/dev/wpi/if_wpi.c head/sys/dev/wtap/if_wtap.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/ath/if_ath.c Mon May 25 18:50:26 2015 (r283537) @@ -592,6 +592,7 @@ ath_attach(u_int16_t devid, struct ath_s goto bad; } ic = ifp->if_l2com; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(sc->sc_dev); /* set these up early for if_printf use */ Modified: head/sys/dev/bwi/if_bwi.c ============================================================================== --- head/sys/dev/bwi/if_bwi.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/bwi/if_bwi.c Mon May 25 18:50:26 2015 (r283537) @@ -507,6 +507,7 @@ bwi_attach(struct bwi_softc *sc) ieee80211_init_channels(ic, NULL, &bands); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_caps = IEEE80211_C_STA | IEEE80211_C_SHSLOT | Modified: head/sys/dev/bwn/if_bwn.c ============================================================================== --- head/sys/dev/bwn/if_bwn.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/bwn/if_bwn.c Mon May 25 18:50:26 2015 (r283537) @@ -1058,6 +1058,7 @@ bwn_attach_post(struct bwn_softc *sc) ic = ifp->if_l2com; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(sc->sc_dev); /* XXX not right but it's not used anywhere important */ ic->ic_phytype = IEEE80211_T_OFDM; Modified: head/sys/dev/if_ndis/if_ndis.c ============================================================================== --- head/sys/dev/if_ndis/if_ndis.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/if_ndis/if_ndis.c Mon May 25 18:50:26 2015 (r283537) @@ -738,6 +738,7 @@ ndis_attach(dev) ifp->if_ioctl = ndis_ioctl_80211; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_DS; Modified: head/sys/dev/ipw/if_ipw.c ============================================================================== --- head/sys/dev/ipw/if_ipw.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/ipw/if_ipw.c Mon May 25 18:50:26 2015 (r283537) @@ -286,6 +286,7 @@ ipw_attach(device_t dev) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_DS; Modified: head/sys/dev/iwi/if_iwi.c ============================================================================== --- head/sys/dev/iwi/if_iwi.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/iwi/if_iwi.c Mon May 25 18:50:26 2015 (r283537) @@ -364,6 +364,7 @@ iwi_attach(device_t dev) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ Modified: head/sys/dev/malo/if_malo.c ============================================================================== --- head/sys/dev/malo/if_malo.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/malo/if_malo.c Mon May 25 18:50:26 2015 (r283537) @@ -276,6 +276,7 @@ malo_attach(uint16_t devid, struct malo_ IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(sc->malo_dev); /* XXX not right but it's not used anywhere important */ ic->ic_phytype = IEEE80211_T_OFDM; Modified: head/sys/dev/mwl/if_mwl.c ============================================================================== --- head/sys/dev/mwl/if_mwl.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/mwl/if_mwl.c Mon May 25 18:50:26 2015 (r283537) @@ -413,6 +413,7 @@ mwl_attach(uint16_t devid, struct mwl_so IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(sc->sc_dev); /* XXX not right but it's not used anywhere important */ ic->ic_phytype = IEEE80211_T_OFDM; Modified: head/sys/dev/ral/rt2560.c ============================================================================== --- head/sys/dev/ral/rt2560.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/ral/rt2560.c Mon May 25 18:50:26 2015 (r283537) @@ -273,6 +273,7 @@ rt2560_attach(device_t dev, int id) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ Modified: head/sys/dev/ral/rt2661.c ============================================================================== --- head/sys/dev/ral/rt2661.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/ral/rt2661.c Mon May 25 18:50:26 2015 (r283537) @@ -274,6 +274,7 @@ rt2661_attach(device_t dev, int id) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ Modified: head/sys/dev/ral/rt2860.c ============================================================================== --- head/sys/dev/ral/rt2860.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/ral/rt2860.c Mon May 25 18:50:26 2015 (r283537) @@ -315,6 +315,7 @@ rt2860_attach(device_t dev, int id) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ Modified: head/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- head/sys/dev/usb/wlan/if_rsu.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_rsu.c Mon May 25 18:50:26 2015 (r283537) @@ -355,6 +355,7 @@ rsu_attach(device_t self) ifp->if_hwassist = CSUM_TCP; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(self); ic->ic_phytype = IEEE80211_T_OFDM; /* Not only, but not used. */ ic->ic_opmode = IEEE80211_M_STA; /* Default to BSS mode. */ Modified: head/sys/dev/usb/wlan/if_rum.c ============================================================================== --- head/sys/dev/usb/wlan/if_rum.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_rum.c Mon May 25 18:50:26 2015 (r283537) @@ -488,6 +488,7 @@ rum_attach(device_t self) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(self); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_run.c Mon May 25 18:50:26 2015 (r283537) @@ -776,6 +776,7 @@ run_attach(device_t self) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(self); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ Modified: head/sys/dev/usb/wlan/if_uath.c ============================================================================== --- head/sys/dev/usb/wlan/if_uath.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_uath.c Mon May 25 18:50:26 2015 (r283537) @@ -442,6 +442,7 @@ uath_attach(device_t dev) ic = ifp->if_l2com; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ Modified: head/sys/dev/usb/wlan/if_upgt.c ============================================================================== --- head/sys/dev/usb/wlan/if_upgt.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_upgt.c Mon May 25 18:50:26 2015 (r283537) @@ -341,6 +341,7 @@ upgt_attach(device_t dev) ic = ifp->if_l2com; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; Modified: head/sys/dev/usb/wlan/if_ural.c ============================================================================== --- head/sys/dev/usb/wlan/if_ural.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_ural.c Mon May 25 18:50:26 2015 (r283537) @@ -473,6 +473,7 @@ ural_attach(device_t self) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(self); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ Modified: head/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtw.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_urtw.c Mon May 25 18:50:26 2015 (r283537) @@ -881,6 +881,7 @@ urtw_attach(device_t dev) ic = ifp->if_l2com; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ Modified: head/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtwn.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_urtwn.c Mon May 25 18:50:26 2015 (r283537) @@ -442,6 +442,7 @@ urtwn_attach(device_t self) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(self); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ Modified: head/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- head/sys/dev/usb/wlan/if_zyd.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/usb/wlan/if_zyd.c Mon May 25 18:50:26 2015 (r283537) @@ -388,6 +388,7 @@ zyd_attach(device_t dev) ic = ifp->if_l2com; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; Modified: head/sys/dev/wi/if_wi.c ============================================================================== --- head/sys/dev/wi/if_wi.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/wi/if_wi.c Mon May 25 18:50:26 2015 (r283537) @@ -345,6 +345,7 @@ wi_attach(device_t dev) IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_phytype = IEEE80211_T_DS; ic->ic_opmode = IEEE80211_M_STA; Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/wpi/if_wpi.c Mon May 25 18:50:26 2015 (r283537) @@ -453,6 +453,7 @@ wpi_attach(device_t dev) ic = ifp->if_l2com; ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = device_get_nameunit(dev); ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ Modified: head/sys/dev/wtap/if_wtap.c ============================================================================== --- head/sys/dev/wtap/if_wtap.c Mon May 25 17:06:52 2015 (r283536) +++ head/sys/dev/wtap/if_wtap.c Mon May 25 18:50:26 2015 (r283537) @@ -797,6 +797,7 @@ wtap_attach(struct wtap_softc *sc, const IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_softc = sc; ic->ic_name = sc->name; ic->ic_phytype = IEEE80211_T_DS; ic->ic_opmode = IEEE80211_M_MBSS;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505251850.t4PIoQrc090574>