Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4fdb056 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Add extra data support to firmware event queueing. 



Firmware events can contain extra data. This patch adds support to
copy this data when it exists.

Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 90d03ff7

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ struct brcmf_event_msg { 
	__be32 datalen;

	u8 addr[ETH_ALEN];

	char ifname[IFNAMSIZ];

	u8 ifidx;

	u8 bsscfgidx;

} __packed;



struct brcm_ethhdr {

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+13 −3
Original line number Diff line number Diff line
@@ -3321,18 +3321,28 @@ static struct brcmf_cfg80211_event_q *brcmf_deq_event( 


static s32

brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, u32 event,

		const struct brcmf_event_msg *msg)

		const struct brcmf_event_msg *msg, void *data)

{

	struct brcmf_cfg80211_event_q *e;

	s32 err = 0;

	ulong flags;

	u32 data_len;

	u32 total_len;



	e = kzalloc(sizeof(struct brcmf_cfg80211_event_q), GFP_ATOMIC);

	total_len = sizeof(struct brcmf_cfg80211_event_q);

	if (data)

		data_len = be32_to_cpu(msg->datalen);

	else

		data_len = 0;

	total_len += data_len;

	e = kzalloc(total_len, GFP_ATOMIC);

	if (!e)

		return -ENOMEM;



	e->etype = event;

	memcpy(&e->emsg, msg, sizeof(struct brcmf_event_msg));

	if (data)

		memcpy(&e->edata, data, data_len);



	spin_lock_irqsave(&cfg_priv->evt_q_lock, flags);

	list_add_tail(&e->evt_q_list, &cfg_priv->evt_q_list);
@@ -3501,7 +3511,7 @@ brcmf_cfg80211_event(struct net_device *ndev, 
	u32 event_type = be32_to_cpu(e->event_type);

	struct brcmf_cfg80211_priv *cfg_priv = ndev_to_cfg(ndev);



	if (!brcmf_enq_event(cfg_priv, event_type, e))

	if (!brcmf_enq_event(cfg_priv, event_type, e, data))

		schedule_work(&cfg_priv->event_work);

}