Author: korli Date: 2011-04-11 20:02:34 +0200 (Mon, 11 Apr 2011) New Revision: 41219 Changeset: https://dev.haiku-os.org/changeset/41219 Modified: haiku/vendor/freebsd/current/dev/malo/if_malo.c haiku/vendor/freebsd/current/dev/malo/if_malo_pci.c Log: updating to FreeBSD 8.2 release Modified: haiku/vendor/freebsd/current/dev/malo/if_malo.c =================================================================== --- haiku/vendor/freebsd/current/dev/malo/if_malo.c 2011-04-11 18:02:27 UTC (rev 41218) +++ haiku/vendor/freebsd/current/dev/malo/if_malo.c 2011-04-11 18:02:34 UTC (rev 41219) @@ -275,8 +275,8 @@ ifp->if_watchdog = malo_watchdog; ifp->if_ioctl = malo_ioctl; ifp->if_init = malo_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; @@ -2099,7 +2099,7 @@ * payload prior to constructing the header. */ m = bf->bf_m; - data = mtod(m, uint8_t *);; + data = mtod(m, uint8_t *); hdrlen = ieee80211_anyhdrsize(data + sizeof(uint16_t)); off = sizeof(uint16_t) + sizeof(struct ieee80211_frame_addr4); Modified: haiku/vendor/freebsd/current/dev/malo/if_malo_pci.c =================================================================== --- haiku/vendor/freebsd/current/dev/malo/if_malo_pci.c 2011-04-11 18:02:27 UTC (rev 41218) +++ haiku/vendor/freebsd/current/dev/malo/if_malo_pci.c 2011-04-11 18:02:34 UTC (rev 41219) @@ -371,4 +371,4 @@ DRIVER_MODULE(malo, pci, malo_pci_driver, malo_devclass, 0, 0); MODULE_VERSION(malo, 1); MODULE_DEPEND(malo, wlan, 1, 1, 1); /* 802.11 media layer */ -MODULE_DEPEND(malo, malofw_fw, 1, 1, 1); +MODULE_DEPEND(malo, firmware, 1, 1, 1);