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

brcm80211: fmac: change function rx_frame parameter 



Change parameter to device pointer for bus layer interface function
brcmf_rx_frame. 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 b63487ed

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

+3 −3
Original line number Diff line number Diff line
@@ -712,16 +712,16 @@ extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, 
			 struct sk_buff *pkt, int prec);



/* Receive frame for delivery to OS.  Callee disposes of rxp. */

extern void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,

extern void brcmf_rx_frame(struct device *dev, int ifidx,

			   struct sk_buff_head *rxlist);

static inline void brcmf_rx_packet(struct brcmf_pub *drvr, int ifidx,

static inline void brcmf_rx_packet(struct device *dev, int ifidx,

				   struct sk_buff *pkt)

{

	struct sk_buff_head q;



	skb_queue_head_init(&q);

	skb_queue_tail(&q, pkt);

	brcmf_rx_frame(drvr, ifidx, &q);

	brcmf_rx_frame(dev, ifidx, &q);

}



/* Return pointer to interface name */

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

+3 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int brcmf_host_event(struct brcmf_pub *drvr, int *ifidx, 
	return bcmerror;

}



void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,

void brcmf_rx_frame(struct device *dev, int ifidx,

		    struct sk_buff_head *skb_list)

{

	unsigned char *eth;
@@ -390,6 +390,8 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, 
	struct sk_buff *skb, *pnext;

	struct brcmf_if *ifp;

	struct brcmf_event_msg event;

	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_sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq) 
		/* sent any remaining packets up */

		if (bus->glom.qlen) {

			up(&bus->sdsem);

			brcmf_rx_frame(bus->drvr, ifidx, &bus->glom);

			brcmf_rx_frame(bus->sdiodev->dev, ifidx, &bus->glom);

			down(&bus->sdsem);

		}
@@ -2062,7 +2062,7 @@ deliver: 


		/* Unlock during rx call */

		up(&bus->sdsem);

		brcmf_rx_packet(bus->drvr, ifidx, pkt);

		brcmf_rx_packet(bus->sdiodev->dev, ifidx, pkt);

		down(&bus->sdsem);

	}

	rxcount = maxframes - rxleft;

CRA Git | Maintained and supported by SUSTech CRA and CCSE