diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h index 88330b684c..751edb6d2d 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/wi/if_wavelan_ieee.h 298955 2016-05-03 03:41:25Z pfg $ + * $FreeBSD: releng/12.0/sys/dev/wi/if_wavelan_ieee.h 325966 2017-11-18 14:26:50Z pfg $ */ #ifndef _IF_WAVELAN_IEEE_H diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c index 5dec5445e1..f9068da5e4 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c @@ -46,7 +46,7 @@ * without an NDA (if at all). What they do release is an API library * called the HCF (Hardware Control Functions) which is supposed to * do the device-specific operations of a device driver for you. The - * publicly available version of the HCF library (the 'HCF Light') is + * publicly available version of the HCF library (the 'HCF Light') is * a) extremely gross, b) lacks certain features, particularly support * for 802.11 frames, and c) is contaminated by the GNU Public License. * @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/wi/if_wi.c 300292 2016-05-20 08:58:06Z avos $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/wi/if_wi.c 333813 2018-05-18 20:13:34Z mmacy $"); #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -160,7 +160,7 @@ static void wi_scan_end(struct ieee80211com *); static void wi_getradiocaps(struct ieee80211com *, int, int *, struct ieee80211_channel[]); static void wi_set_channel(struct ieee80211com *); - + static __inline int wi_write_val(struct wi_softc *sc, int rid, u_int16_t val) { @@ -272,7 +272,7 @@ wi_attach(device_t dev) "(type %d, firmware ver %d)\n", sc->sc_firmware_type, sc->sc_sta_firmware_ver); wi_free(dev); - return EOPNOTSUPP; + return EOPNOTSUPP; } /* Export info about the device via sysctl */ @@ -889,7 +889,7 @@ wi_newstate_hostap(struct ieee80211vap *vap, enum ieee80211_state nstate, int ar } if ((sc->sc_flags & WI_FLAGS_HAS_WPASUPPORT) && - (vap->iv_flags & IEEE80211_F_WPA) && + (vap->iv_flags & IEEE80211_F_WPA) && vap->iv_appie_wpa != NULL) wi_write_appie(sc, WI_RID_WPA_DATA, vap->iv_appie_wpa); @@ -1061,7 +1061,7 @@ wi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m0, (caddr_t)&frmhdr.wi_ehdr); frmhdr.wi_ehdr.ether_type = 0; wh = mtod(m0, struct ieee80211_frame *); - + frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX); if (params && (params->ibp_flags & IEEE80211_BPF_NOACK)) frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_ALTRTRY); @@ -1557,7 +1557,7 @@ wi_update_promisc(struct ieee80211com *ic) WI_LOCK(sc); /* XXX handle WEP special case handling? */ - wi_write_val(sc, WI_RID_PROMISC, + wi_write_val(sc, WI_RID_PROMISC, (ic->ic_opmode == IEEE80211_M_MONITOR || (ic->ic_promisc > 0))); WI_UNLOCK(sc); diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_macio.c b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_macio.c index fb49fb4041..2abc6add60 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_macio.c +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_macio.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2013 Justin Hibbits * All rights reserved. * Copyright (c) 1997, 1998, 1999 @@ -42,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/wi/if_wi_macio.c 287197 2015-08-27 08:56:39Z glebius $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/wi/if_wi_macio.c 325966 2017-11-18 14:26:50Z pfg $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c index 73b06eec34..5edf11e04f 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. * @@ -39,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: releng/11.1/sys/dev/wi/if_wi_pccard.c 292079 2015-12-11 05:27:56Z imp $"); +__FBSDID("$FreeBSD: releng/12.0/sys/dev/wi/if_wi_pccard.c 325966 2017-11-18 14:26:50Z pfg $"); #include #include diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c index 7e8d517e5d..ff35d133ba 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/wi/if_wi_pci.c 315483 2017-03-18 13:58:25Z kevlo $ + * $FreeBSD: releng/12.0/sys/dev/wi/if_wi_pci.c 325966 2017-11-18 14:26:50Z pfg $ */ /* diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h index fcaab5021d..e6ea058a95 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. * @@ -29,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/wi/if_wireg.h 298955 2016-05-03 03:41:25Z pfg $ + * $FreeBSD: releng/12.0/sys/dev/wi/if_wireg.h 325966 2017-11-18 14:26:50Z pfg $ */ #define WI_DELAY 5 diff --git a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h index c34e0987d6..e395216c57 100644 --- a/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h +++ b/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 2002 * M Warner Losh . All rights reserved. * Copyright (c) 1997, 1998, 1999 @@ -31,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/11.1/sys/dev/wi/if_wivar.h 300238 2016-05-19 22:14:35Z avos $ + * $FreeBSD: releng/12.0/sys/dev/wi/if_wivar.h 325966 2017-11-18 14:26:50Z pfg $ */ /*