Skip to content

Commit 066214a

Browse files
committed
Merge branch 'bits/080-wifi' into asahi-wip
2 parents 7b79964 + 8671d1b commit 066214a

32 files changed

Lines changed: 4170 additions & 1106 deletions

drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ brcmfmac-objs += \
2525
btcoex.o \
2626
vendor.o \
2727
pno.o \
28-
xtlv.o
28+
join_param.o \
29+
scan_param.o \
30+
xtlv.o \
31+
interface_create.o
32+
2933
brcmfmac-$(CONFIG_BRCMFMAC_PROTO_BCDC) += \
3034
bcdc.o \
3135
fwsignal.o

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ struct brcmf_bus_ops {
107107
void (*debugfs_create)(struct device *dev);
108108
int (*reset)(struct device *dev);
109109
void (*remove)(struct device *dev);
110+
void (*d2h_mb_rx)(struct device *dev, u32 data);
110111
};
111112

112113

@@ -286,6 +287,15 @@ static inline void brcmf_bus_remove(struct brcmf_bus *bus)
286287
bus->ops->remove(bus->dev);
287288
}
288289

290+
static inline
291+
void brcmf_bus_d2h_mb_rx(struct brcmf_bus *bus, u32 data)
292+
{
293+
if (!bus->ops->d2h_mb_rx)
294+
return;
295+
296+
return bus->ops->d2h_mb_rx(bus->dev, data);
297+
}
298+
289299
/*
290300
* interface functions from common layer
291301
*/

0 commit comments

Comments
 (0)