Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aironetwifi: Upgrade to FreeBSD 12.

Browse Source
This commit is contained in:
Augustin Cavalier 2019-01-07 21:06:36 -05:00
parent 908c8ced92
commit 2e07eed8ae
7 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/drivers/network/wlan/Jamfile
View File

@ -1,7 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel drivers network wlan ;
# FreeBSD 11.1 drivers
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan aironetwifi ;
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan atheroswifi ;
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan broadcom43xx ;
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2100 ;
@ -17,4 +16,5 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network wlan wavelanwifi ;
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2200 ;
# FreeBSD 12 drivers
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan aironetwifi ;
SubInclude HAIKU_TOP src add-ons kernel drivers network wlan idualwifi7260 ;

4
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_aironet_ieee.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. 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/an/if_aironet_ieee.h 139749 2005-01-06 01:43:34Z imp $
* $FreeBSD: releng/12.0/sys/dev/an/if_aironet_ieee.h 325966 2017-11-18 14:26:50Z pfg $
*/
#ifndef _IF_AIRONET_IEEE_H

22
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
@ -38,7 +40,7 @@
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/an/if_an.c 315221 2017-03-14 02:06:03Z pfg $");
__FBSDID("$FreeBSD: releng/12.0/sys/dev/an/if_an.c 331797 2018-03-30 18:50:13Z brooks $");
/*
* The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
@ -1932,7 +1934,8 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
error = 0;
break;
case SIOCGAIRONET:
error = copyin(ifr->ifr_data, &sc->areq, sizeof(sc->areq));
error = copyin(ifr_data_get_ptr(ifr), &sc->areq,
sizeof(sc->areq));
if (error != 0)
break;
AN_LOCK(sc);
@ -1961,13 +1964,15 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
break;
}
AN_UNLOCK(sc);
error = copyout(&sc->areq, ifr->ifr_data, sizeof(sc->areq));
error = copyout(&sc->areq, ifr_data_get_ptr(ifr),
sizeof(sc->areq));
break;
case SIOCSAIRONET:
if ((error = priv_check(td, PRIV_DRIVER)))
goto out;
AN_LOCK(sc);
error = copyin(ifr->ifr_data, &sc->areq, sizeof(sc->areq));
error = copyin(ifr_data_get_ptr(ifr), &sc->areq,
sizeof(sc->areq));
if (error != 0)
break;
an_setdef(sc, &sc->areq);
@ -1976,7 +1981,8 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
case SIOCGPRIVATE_0: /* used by Cisco client utility */
if ((error = priv_check(td, PRIV_DRIVER)))
goto out;
error = copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl));
error = copyin(ifr_data_get_ptr(ifr), &l_ioctl,
sizeof(l_ioctl));
if (error)
goto out;
mode = l_ioctl.command;
@ -1994,13 +2000,15 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
AN_UNLOCK(sc);
if (!error) {
/* copy out the updated command info */
error = copyout(&l_ioctl, ifr->ifr_data, sizeof(l_ioctl));
error = copyout(&l_ioctl, ifr_data_get_ptr(ifr),
sizeof(l_ioctl));
}
break;
case SIOCGPRIVATE_1: /* used by Cisco client utility */
if ((error = priv_check(td, PRIV_DRIVER)))
goto out;
error = copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl));
error = copyin(ifr_data_get_ptr(ifr), &l_ioctl,
sizeof(l_ioctl));
if (error)
goto out;
l_ioctl.command = 0;

5
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_isa.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
@ -38,7 +40,7 @@
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/an/if_an_isa.c 199756 2009-11-24 16:54:54Z jhb $");
__FBSDID("$FreeBSD: releng/12.0/sys/dev/an/if_an_isa.c 327102 2017-12-23 06:49:27Z imp $");
#include "opt_inet.h"
@ -148,3 +150,4 @@ static devclass_t an_isa_devclass;
DRIVER_MODULE(an, isa, an_isa_driver, an_isa_devclass, 0, 0);
MODULE_DEPEND(an, isa, 1, 1, 1);
MODULE_DEPEND(an, wlan, 1, 1, 1);
ISA_PNP_INFO(an_ids);

4
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pccard.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
@ -38,7 +40,7 @@
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/an/if_an_pccard.c 292079 2015-12-11 05:27:56Z imp $");
__FBSDID("$FreeBSD: releng/12.0/sys/dev/an/if_an_pccard.c 325966 2017-11-18 14:26:50Z pfg $");
#include "opt_inet.h"

6
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
@ -31,7 +33,7 @@
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/an/if_an_pci.c 299544 2016-05-12 17:47:30Z scottl $");
__FBSDID("$FreeBSD: releng/12.0/sys/dev/an/if_an_pci.c 338948 2018-09-26 17:12:14Z imp $");
/*
* This is a PCI shim for the Aironet PC4500/4800 wireless network
@ -271,5 +273,7 @@ static driver_t an_pci_driver = {
static devclass_t an_devclass;
DRIVER_MODULE(an, pci, an_pci_driver, an_devclass, 0, 0);
MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, an,
an_devs, nitems(an_devs) - 1);
MODULE_DEPEND(an, pci, 1, 1, 1);
MODULE_DEPEND(an, wlan, 1, 1, 1);

4
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_anreg.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. 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/an/if_anreg.h 299544 2016-05-12 17:47:30Z scottl $
* $FreeBSD: releng/12.0/sys/dev/an/if_anreg.h 325966 2017-11-18 14:26:50Z pfg $
*/
#define AN_TIMEOUT 65536