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

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

brcmfmac: change return type of brcmf_sdio_hdparser 



Use int instead of bool as the return type of function
brcmf_sdio_hdparser to explicitly describe error returns.

Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd67dc83

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

+23 −24
Original line number Original line Diff line number Diff line
@@ -1037,7 +1037,7 @@ static void brcmf_sdbrcm_free_glom(struct brcmf_sdio *bus) 
	}

	}

}

}





static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header,

static int brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header,

			       struct brcmf_sdio_read *rd,

			       struct brcmf_sdio_read *rd,

			       enum brcmf_sdio_frmtype type)

			       enum brcmf_sdio_frmtype type)

{

{
@@ -1054,26 +1054,26 @@ static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header, 
	/* All zero means no more to read */

	/* All zero means no more to read */

	if (!(len | checksum)) {

	if (!(len | checksum)) {

		bus->rxpending = false;

		bus->rxpending = false;

		return false;

		return -ENODATA;

	}

	}

	if ((u16)(~(len ^ checksum))) {

	if ((u16)(~(len ^ checksum))) {

		brcmf_dbg(ERROR, "HW header checksum error\n");

		brcmf_dbg(ERROR, "HW header checksum error\n");

		bus->sdcnt.rx_badhdr++;

		bus->sdcnt.rx_badhdr++;

		brcmf_sdbrcm_rxfail(bus, false, false);

		brcmf_sdbrcm_rxfail(bus, false, false);

		return false;

		return -EIO;

	}

	}

	if (len < SDPCM_HDRLEN) {

	if (len < SDPCM_HDRLEN) {

		brcmf_dbg(ERROR, "HW header length error\n");

		brcmf_dbg(ERROR, "HW header length error\n");

		return false;

		return -EPROTO;

	}

	}

	if (type == BRCMF_SDIO_FT_SUPER &&

	if (type == BRCMF_SDIO_FT_SUPER &&

	    (roundup(len, bus->blocksize) != rd->len)) {

	    (roundup(len, bus->blocksize) != rd->len)) {

		brcmf_dbg(ERROR, "HW superframe header length error\n");

		brcmf_dbg(ERROR, "HW superframe header length error\n");

		return false;

		return -EPROTO;

	}

	}

	if (type == BRCMF_SDIO_FT_SUB && len > rd->len) {

	if (type == BRCMF_SDIO_FT_SUB && len > rd->len) {

		brcmf_dbg(ERROR, "HW subframe header length error\n");

		brcmf_dbg(ERROR, "HW subframe header length error\n");

		return false;

		return -EPROTO;

	}

	}

	rd->len = len;

	rd->len = len;
@@ -1091,7 +1091,7 @@ static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header, 
	    SDPCM_GLOMDESC(&header[SDPCM_FRAMETAG_LEN])) {

	    SDPCM_GLOMDESC(&header[SDPCM_FRAMETAG_LEN])) {

		brcmf_dbg(ERROR, "Glom descriptor found in superframe head\n");

		brcmf_dbg(ERROR, "Glom descriptor found in superframe head\n");

		rd->len = 0;

		rd->len = 0;

		return false;

		return -EINVAL;

	}

	}

	rx_seq = SDPCM_PACKET_SEQUENCE(&header[SDPCM_FRAMETAG_LEN]);

	rx_seq = SDPCM_PACKET_SEQUENCE(&header[SDPCM_FRAMETAG_LEN]);

	rd->channel = SDPCM_PACKET_CHANNEL(&header[SDPCM_FRAMETAG_LEN]);

	rd->channel = SDPCM_PACKET_CHANNEL(&header[SDPCM_FRAMETAG_LEN]);
@@ -1102,18 +1102,18 @@ static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header, 
		bus->sdcnt.rx_toolong++;

		bus->sdcnt.rx_toolong++;

		brcmf_sdbrcm_rxfail(bus, false, false);

		brcmf_sdbrcm_rxfail(bus, false, false);

		rd->len = 0;

		rd->len = 0;

		return false;

		return -EPROTO;

	}

	}

	if (type == BRCMF_SDIO_FT_SUPER && rd->channel != SDPCM_GLOM_CHANNEL) {

	if (type == BRCMF_SDIO_FT_SUPER && rd->channel != SDPCM_GLOM_CHANNEL) {

		brcmf_dbg(ERROR, "Wrong channel for superframe\n");

		brcmf_dbg(ERROR, "Wrong channel for superframe\n");

		rd->len = 0;

		rd->len = 0;

		return false;

		return -EINVAL;

	}

	}

	if (type == BRCMF_SDIO_FT_SUB && rd->channel != SDPCM_DATA_CHANNEL &&

	if (type == BRCMF_SDIO_FT_SUB && rd->channel != SDPCM_DATA_CHANNEL &&

	    rd->channel != SDPCM_EVENT_CHANNEL) {

	    rd->channel != SDPCM_EVENT_CHANNEL) {

		brcmf_dbg(ERROR, "Wrong channel for subframe\n");

		brcmf_dbg(ERROR, "Wrong channel for subframe\n");

		rd->len = 0;

		rd->len = 0;

		return false;

		return -EINVAL;

	}

	}

	rd->dat_offset = SDPCM_DOFFSET_VALUE(&header[SDPCM_FRAMETAG_LEN]);

	rd->dat_offset = SDPCM_DOFFSET_VALUE(&header[SDPCM_FRAMETAG_LEN]);

	if (rd->dat_offset < SDPCM_HDRLEN || rd->dat_offset > rd->len) {

	if (rd->dat_offset < SDPCM_HDRLEN || rd->dat_offset > rd->len) {
@@ -1121,7 +1121,7 @@ static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header, 
		bus->sdcnt.rx_badhdr++;

		bus->sdcnt.rx_badhdr++;

		brcmf_sdbrcm_rxfail(bus, false, false);

		brcmf_sdbrcm_rxfail(bus, false, false);

		rd->len = 0;

		rd->len = 0;

		return false;

		return -ENXIO;

	}

	}

	if (rd->seq_num != rx_seq) {

	if (rd->seq_num != rx_seq) {

		brcmf_dbg(ERROR, "seq %d: sequence number error, expect %d\n",

		brcmf_dbg(ERROR, "seq %d: sequence number error, expect %d\n",
@@ -1131,7 +1131,7 @@ static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header, 
	}

	}

	/* no need to check the reset for subframe */

	/* no need to check the reset for subframe */

	if (type == BRCMF_SDIO_FT_SUB)

	if (type == BRCMF_SDIO_FT_SUB)

		return true;

		return 0;

	rd->len_nxtfrm = header[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];

	rd->len_nxtfrm = header[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];

	if (rd->len_nxtfrm << 4 > MAX_RX_DATASZ) {

	if (rd->len_nxtfrm << 4 > MAX_RX_DATASZ) {

		/* only warm for NON glom packet */

		/* only warm for NON glom packet */
@@ -1155,7 +1155,7 @@ static bool brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header, 
	}

	}

	bus->tx_max = tx_seq_max;

	bus->tx_max = tx_seq_max;





	return true;

	return 0;

}

}





static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)

static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
@@ -1323,7 +1323,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq) 
		rd_new.seq_num = rxseq;

		rd_new.seq_num = rxseq;

		rd_new.len = dlen;

		rd_new.len = dlen;

		sdio_claim_host(bus->sdiodev->func[1]);

		sdio_claim_host(bus->sdiodev->func[1]);

		errcode = -!brcmf_sdio_hdparser(bus, pfirst->data, &rd_new,

		errcode = brcmf_sdio_hdparser(bus, pfirst->data, &rd_new,

					      BRCMF_SDIO_FT_SUPER);

					      BRCMF_SDIO_FT_SUPER);

		sdio_release_host(bus->sdiodev->func[1]);

		sdio_release_host(bus->sdiodev->func[1]);

		bus->cur_read.len = rd_new.len_nxtfrm << 4;

		bus->cur_read.len = rd_new.len_nxtfrm << 4;
@@ -1342,8 +1342,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq) 
			rd_new.len = pnext->len;

			rd_new.len = pnext->len;

			rd_new.seq_num = rxseq++;

			rd_new.seq_num = rxseq++;

			sdio_claim_host(bus->sdiodev->func[1]);

			sdio_claim_host(bus->sdiodev->func[1]);

			errcode = -!brcmf_sdio_hdparser(bus, pnext->data,

			errcode = brcmf_sdio_hdparser(bus, pnext->data, &rd_new,

							   &rd_new,

						      BRCMF_SDIO_FT_SUB);

						      BRCMF_SDIO_FT_SUB);

			sdio_release_host(bus->sdiodev->func[1]);

			sdio_release_host(bus->sdiodev->func[1]);

			brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),

			brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
@@ -1612,7 +1611,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes) 
					   bus->rxhdr, SDPCM_HDRLEN,

					   bus->rxhdr, SDPCM_HDRLEN,

					   "RxHdr:\n");

					   "RxHdr:\n");





			if (!brcmf_sdio_hdparser(bus, bus->rxhdr, rd,

			if (brcmf_sdio_hdparser(bus, bus->rxhdr, rd,

						BRCMF_SDIO_FT_NORMAL)) {

						BRCMF_SDIO_FT_NORMAL)) {

				sdio_release_host(bus->sdiodev->func[1]);

				sdio_release_host(bus->sdiodev->func[1]);

				if (!bus->rxpending)

				if (!bus->rxpending)
@@ -1679,7 +1678,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes) 
			memcpy(bus->rxhdr, pkt->data, SDPCM_HDRLEN);

			memcpy(bus->rxhdr, pkt->data, SDPCM_HDRLEN);

			rd_new.seq_num = rd->seq_num;

			rd_new.seq_num = rd->seq_num;

			sdio_claim_host(bus->sdiodev->func[1]);

			sdio_claim_host(bus->sdiodev->func[1]);

			if (!brcmf_sdio_hdparser(bus, bus->rxhdr, &rd_new,

			if (brcmf_sdio_hdparser(bus, bus->rxhdr, &rd_new,

						BRCMF_SDIO_FT_NORMAL)) {

						BRCMF_SDIO_FT_NORMAL)) {

				rd->len = 0;

				rd->len = 0;

				brcmu_pkt_buf_free_skb(pkt);

				brcmu_pkt_buf_free_skb(pkt);