diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2019-01-17 01:28:00 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2019-01-17 01:28:00 +0000 |
| commit | 19dc333eea9963be141db29c5c0dbc783f7a0ecd (patch) | |
| tree | 6af8bf5fccd48a81a6a4e8ed535147b5485f1110 | |
| parent | f8f165d2e010345c4d77d0ab106e2355341517f9 (diff) | |
Enable bwfm(4) in RAMDISK_CD
ok deraadt
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_bwfm_pci.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 3f04fb9705f..c2a472d65d8 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.173 2018/08/31 00:09:13 jmatthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.174 2019/01/17 01:27:59 mlarkin Exp $ machine amd64 maxusers 4 @@ -128,6 +128,7 @@ rsu* at uhub? # Realtek RTL8188SU/RTL8191SU/RTL8192SU uath* at uhub? # Atheros AR5005UG/AR5005UX otus* at uhub? # Atheros AR9001U athn* at uhub? # Atheros AR9002U +bwfm* at uhub? # Broadcom FullMAC pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard @@ -189,6 +190,7 @@ sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus rtsx* at pci? # Realtek SD Card Reader sdmmc* at rtsx? # SD/MMC bus +bwfm* at sdmmc? # Broadcom FullMAC de* at pci? # DC21X4X-based ethernet fxp* at pci? # EtherExpress 10/100B ethernet @@ -238,6 +240,7 @@ ale* at pci? # Attansic L1E Ethernet lii* at pci? # Attansic L2 Ethernet jme* at pci? # JMicron JMC250/JMC260 Ethernet bnxt* at pci? # Broadcom BCM573xx, BCM574xx +bwfm* at pci? # Broadcom FullMAC acx* at pci? # TI ACX100/ACX111 (802.11b/g) acx* at cardbus? # TI ACX100/ACX111 (802.11b/g) diff --git a/sys/dev/pci/if_bwfm_pci.c b/sys/dev/pci/if_bwfm_pci.c index ff109c17e5b..6d19f7ce6c2 100644 --- a/sys/dev/pci/if_bwfm_pci.c +++ b/sys/dev/pci/if_bwfm_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwfm_pci.c,v 1.27 2018/08/20 18:58:06 patrick Exp $ */ +/* $OpenBSD: if_bwfm_pci.c,v 1.28 2019/01/17 01:27:59 mlarkin Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se> @@ -1543,7 +1543,9 @@ int bwfm_pci_flowring_lookup(struct bwfm_pci_softc *sc, struct mbuf *m) { struct ieee80211com *ic = &sc->sc_sc.sc_ic; +#ifndef IEEE80211_STA_ONLY uint8_t *da = mtod(m, uint8_t *); +#endif int flowid, prio, fifo; int i, found; @@ -1599,7 +1601,9 @@ bwfm_pci_flowring_create(struct bwfm_pci_softc *sc, struct mbuf *m) { struct ieee80211com *ic = &sc->sc_sc.sc_ic; struct bwfm_cmd_flowring_create cmd; +#ifndef IEEE80211_STA_ONLY uint8_t *da = mtod(m, uint8_t *); +#endif struct bwfm_pci_msgring *ring; int flowid, prio, fifo; int i, found; @@ -1655,7 +1659,9 @@ void bwfm_pci_flowring_create_cb(struct bwfm_softc *bwfm, void *arg) { struct bwfm_pci_softc *sc = (void *)bwfm; +#ifndef IEEE80211_STA_ONLY struct ieee80211com *ic = &sc->sc_sc.sc_ic; +#endif struct bwfm_cmd_flowring_create *cmd = arg; struct msgbuf_tx_flowring_create_req *req; struct bwfm_pci_msgring *ring; |