i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wavelanwifi: Upgrade to FreeBSD 12.

Browse Source
This commit is contained in:
Augustin Cavalier
2019-01-10 20:10:37 -05:00
parent db7b74600c
commit baf68028bf
7 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * 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 #ifndef _IF_WAVELAN_IEEE_H
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c
+7 -7
View File
@@ -46,7 +46,7 @@
* without an NDA (if at all). What they do release is an API library * without an NDA (if at all). What they do release is an API library
* called the HCF (Hardware Control Functions) which is supposed to * called the HCF (Hardware Control Functions) which is supposed to
* do the device-specific operations of a device driver for you. The * 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 * a) extremely gross, b) lacks certain features, particularly support
* for 802.11 frames, and c) is contaminated by the GNU Public License. * for 802.11 frames, and c) is contaminated by the GNU Public License.
* *
@@ -60,7 +60,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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. */ #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 *, static void wi_getradiocaps(struct ieee80211com *, int, int *,
struct ieee80211_channel[]); struct ieee80211_channel[]);
static void wi_set_channel(struct ieee80211com *); static void wi_set_channel(struct ieee80211com *);
static __inline int static __inline int
wi_write_val(struct wi_softc *sc, int rid, u_int16_t val) 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", "(type %d, firmware ver %d)\n",
sc->sc_firmware_type, sc->sc_sta_firmware_ver); sc->sc_firmware_type, sc->sc_sta_firmware_ver);
wi_free(dev); wi_free(dev);
return EOPNOTSUPP; return EOPNOTSUPP;
} }
/* Export info about the device via sysctl */ /* 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) && 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) vap->iv_appie_wpa != NULL)
wi_write_appie(sc, WI_RID_WPA_DATA, vap->iv_appie_wpa); 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); (caddr_t)&frmhdr.wi_ehdr);
frmhdr.wi_ehdr.ether_type = 0; frmhdr.wi_ehdr.ether_type = 0;
wh = mtod(m0, struct ieee80211_frame *); wh = mtod(m0, struct ieee80211_frame *);
frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX); frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX);
if (params && (params->ibp_flags & IEEE80211_BPF_NOACK)) if (params && (params->ibp_flags & IEEE80211_BPF_NOACK))
frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_ALTRTRY); frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_ALTRTRY);
@@ -1557,7 +1557,7 @@ wi_update_promisc(struct ieee80211com *ic)
WI_LOCK(sc); WI_LOCK(sc);
/* XXX handle WEP special case handling? */ /* 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_opmode == IEEE80211_M_MONITOR ||
(ic->ic_promisc > 0))); (ic->ic_promisc > 0)));
WI_UNLOCK(sc); WI_UNLOCK(sc);
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_macio.c
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2013 Justin Hibbits * Copyright (c) 2013 Justin Hibbits
* All rights reserved. * All rights reserved.
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@@ -42,7 +44,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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 <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -39,7 +41,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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 <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * 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 $
*/ */
/* /*
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * 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 #define WI_DELAY 5
src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 2002 * Copyright (c) 2002
* M Warner Losh <[email protected]>. All rights reserved. * M Warner Losh <[email protected]>. All rights reserved.
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@@ -31,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * 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 $
*/ */
/* /*