Author: korli Date: 2011-04-11 20:03:07 +0200 (Mon, 11 Apr 2011) New Revision: 41224 Changeset: https://dev.haiku-os.org/changeset/41224 Modified: haiku/vendor/freebsd/current/dev/mwl/if_mwl.c haiku/vendor/freebsd/current/dev/mwl/if_mwl_pci.c Log: updating to FreeBSD 8.2 release Modified: haiku/vendor/freebsd/current/dev/mwl/if_mwl.c =================================================================== --- haiku/vendor/freebsd/current/dev/mwl/if_mwl.c 2011-04-11 18:03:02 UTC (rev 41223) +++ haiku/vendor/freebsd/current/dev/mwl/if_mwl.c 2011-04-11 18:03:07 UTC (rev 41224) @@ -404,8 +404,8 @@ ifp->if_watchdog = mwl_watchdog; ifp->if_ioctl = mwl_ioctl; ifp->if_init = mwl_init; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); + ifp->if_snd.ifq_drv_maxlen = ifqmaxlen; IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; Modified: haiku/vendor/freebsd/current/dev/mwl/if_mwl_pci.c =================================================================== --- haiku/vendor/freebsd/current/dev/mwl/if_mwl_pci.c 2011-04-11 18:03:02 UTC (rev 41223) +++ haiku/vendor/freebsd/current/dev/mwl/if_mwl_pci.c 2011-04-11 18:03:07 UTC (rev 41224) @@ -204,7 +204,7 @@ BUS_SPACE_MAXADDR, /* maxsize */ MWL_TXDESC, /* nsegments */ BUS_SPACE_MAXADDR, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ &sc->sc_dmat)) { @@ -313,4 +313,4 @@ DRIVER_MODULE(mwl, pci, mwl_pci_driver, mwl_devclass, 0, 0); MODULE_VERSION(mwl, 1); MODULE_DEPEND(mwl, wlan, 1, 1, 1); /* 802.11 media layer */ -MODULE_DEPEND(mwl, mwlfw_fw, 1, 1, 1); /* firmware */ +MODULE_DEPEND(mwl, firmware, 1, 1, 1);