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

Commit b073ac1f authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: proto: add callback for queuing TX data 



So far our core code was calling brcmf_fws_process_skb which wasn't
a proper thing to do. If case of devices using msgbuf protocol fwsignal
shouldn't be used. It was an unnecessary extra layer simply calling
a protocol specifix txdata function.

Please note we already have txdata callback, but it's used for calls
between bcdc and fwsignal so it couldn't be simply used there.

This makes core code more generic (instead of bcdc/fwsignal specific).

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9766cb70

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c

+12 −0
Original line number Diff line number Diff line
@@ -326,6 +326,17 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pub *drvr, bool do_fws, 
	return 0;

}



static int brcmf_proto_bcdc_tx_queue_data(struct brcmf_pub *drvr, int ifidx,

					  struct sk_buff *skb)

{

	struct brcmf_if *ifp = brcmf_get_ifp(drvr, ifidx);



	if (!brcmf_fws_queue_skbs(drvr->fws))

		return brcmf_proto_txdata(drvr, ifidx, 0, skb);



	return brcmf_fws_process_skb(ifp, skb);

}



static int

brcmf_proto_bcdc_txdata(struct brcmf_pub *drvr, int ifidx, u8 offset,

			struct sk_buff *pktbuf)
@@ -375,6 +386,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) 
	drvr->proto->hdrpull = brcmf_proto_bcdc_hdrpull;

	drvr->proto->query_dcmd = brcmf_proto_bcdc_query_dcmd;

	drvr->proto->set_dcmd = brcmf_proto_bcdc_set_dcmd;

	drvr->proto->tx_queue_data = brcmf_proto_bcdc_tx_queue_data;

	drvr->proto->txdata = brcmf_proto_bcdc_txdata;

	drvr->proto->configure_addr_mode = brcmf_proto_bcdc_configure_addr_mode;

	drvr->proto->delete_peer = brcmf_proto_bcdc_delete_peer;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+7 −1
Original line number Diff line number Diff line
@@ -239,7 +239,13 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, 
	if (eh->h_proto == htons(ETH_P_PAE))

		atomic_inc(&ifp->pend_8021x_cnt);



	ret = brcmf_fws_process_skb(ifp, skb);

	/* determine the priority */

	if ((skb->priority == 0) || (skb->priority > 7))

		skb->priority = cfg80211_classify8021d(skb, NULL);



	ret = brcmf_proto_tx_queue_data(drvr, ifp->ifidx, skb);

	if (ret < 0)

		brcmf_txfinalize(ifp, skb, false);



done:

	if (ret) {

drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c

+5 −10
Original line number Diff line number Diff line
@@ -2100,16 +2100,6 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) 
	int rc = 0;



	brcmf_dbg(DATA, "tx proto=0x%X\n", ntohs(eh->h_proto));

	/* determine the priority */

	if ((skb->priority == 0) || (skb->priority > 7))

		skb->priority = cfg80211_classify8021d(skb, NULL);



	if (fws->avoid_queueing) {

		rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb);

		if (rc < 0)

			brcmf_txfinalize(ifp, skb, false);

		return rc;

	}



	/* set control buffer information */

	skcb->if_flags = 0;
@@ -2442,6 +2432,11 @@ void brcmf_fws_deinit(struct brcmf_pub *drvr) 
	kfree(fws);

}



bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws)

{

	return !fws->avoid_queueing;

}



bool brcmf_fws_fc_active(struct brcmf_fws_info *fws)

{

	if (!fws->creditmap_received)

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


int brcmf_fws_init(struct brcmf_pub *drvr);

void brcmf_fws_deinit(struct brcmf_pub *drvr);

bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws);

bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);

void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);

int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c

+3 −3
Original line number Diff line number Diff line
@@ -782,8 +782,8 @@ static int brcmf_msgbuf_schedule_txdata(struct brcmf_msgbuf *msgbuf, u32 flowid, 
}





static int brcmf_msgbuf_txdata(struct brcmf_pub *drvr, int ifidx,

			       u8 offset, struct sk_buff *skb)

static int brcmf_msgbuf_tx_queue_data(struct brcmf_pub *drvr, int ifidx,

				      struct sk_buff *skb)

{

	struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;

	struct brcmf_flowring *flow = msgbuf->flow;
@@ -1467,7 +1467,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr) 
	drvr->proto->hdrpull = brcmf_msgbuf_hdrpull;

	drvr->proto->query_dcmd = brcmf_msgbuf_query_dcmd;

	drvr->proto->set_dcmd = brcmf_msgbuf_set_dcmd;

	drvr->proto->txdata = brcmf_msgbuf_txdata;

	drvr->proto->tx_queue_data = brcmf_msgbuf_tx_queue_data;

	drvr->proto->configure_addr_mode = brcmf_msgbuf_configure_addr_mode;

	drvr->proto->delete_peer = brcmf_msgbuf_delete_peer;

	drvr->proto->add_tdls_peer = brcmf_msgbuf_add_tdls_peer;