Commit d5625ee6 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: change function proto_hdrpull parameter 



Change parameter to device pointer for bus layer interface function
brcmf_proto_hdrpull This is part of the fullmac bus interface
refactoring.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 228bb43d

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

+3 −1
Original line number Diff line number Diff line
@@ -376,10 +376,12 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx, 
	BDC_SET_IF_IDX(h, ifidx);

}



int brcmf_proto_hdrpull(struct brcmf_pub *drvr, int *ifidx,

int brcmf_proto_hdrpull(struct device *dev, int *ifidx,

			struct sk_buff *pktbuf)

{

	struct brcmf_proto_bdc_header *h;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	brcmf_dbg(TRACE, "Enter\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success) 
	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	brcmf_proto_hdrpull(drvr, &ifidx, txp);

	brcmf_proto_hdrpull(dev, &ifidx, txp);



	eh = (struct ethhdr *)(txp->data);

	type = ntohs(eh->h_proto);

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ extern void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx, 
				struct sk_buff *txp);



/* Remove any protocol-specific data header. */

extern int brcmf_proto_hdrpull(struct brcmf_pub *, int *ifidx,

extern int brcmf_proto_hdrpull(struct device *dev, int *ifidx,

			       struct sk_buff *rxp);



/* Use protocol to issue command to dongle */

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

+4 −3
Original line number Diff line number Diff line
@@ -1437,8 +1437,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq) 
				skb_unlink(pfirst, &bus->glom);

				brcmu_pkt_buf_free_skb(pfirst);

				continue;

			} else if (brcmf_proto_hdrpull(bus->drvr, &ifidx,

						       pfirst) != 0) {

			} else if (brcmf_proto_hdrpull(bus->sdiodev->dev,

						       &ifidx, pfirst) != 0) {

				brcmf_dbg(ERROR, "rx protocol error\n");

				bus->drvr->rx_errors++;

				skb_unlink(pfirst, &bus->glom);
@@ -2053,7 +2053,8 @@ deliver: 
		if (pkt->len == 0) {

			brcmu_pkt_buf_free_skb(pkt);

			continue;

		} else if (brcmf_proto_hdrpull(bus->drvr, &ifidx, pkt) != 0) {

		} else if (brcmf_proto_hdrpull(bus->sdiodev->dev, &ifidx,

			   pkt) != 0) {

			brcmf_dbg(ERROR, "rx protocol error\n");

			brcmu_pkt_buf_free_skb(pkt);

			bus->drvr->rx_errors++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE