brcmfmac: change return type for brcmf_rollback_toq() to void (88f656fa) · Commits · 戴 / test

The function brcmf_rollback_toq() is already called in error path and its result should not override the initial error value. As the function releases the sk_buff there is no need to return anything so change return type to void. Reviewed-by:

Hante Meuleman <meuleman@broadcom.com> Reviewed-by:

Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by:

Arend van Spriel <arend@broadcom.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -1574,7 +1574,7 @@ static int brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo,
		return rc;
		}

		static int
		static void
		brcmf_fws_rollback_toq(struct brcmf_fws_info fws, struct sk_buff skb)
		{
		/*
		@@ -1654,7 +1654,6 @@ fail:
		fws->stats.rollback_failed++;
		} else
		fws->stats.rollback_success++;
		return rc;
		}

		static int brcmf_fws_consume_credit(struct brcmf_fws_info *fws, int fifo,
		@@ -1733,7 +1732,7 @@ static int brcmf_fws_commit_skb(struct brcmf_fws_info *fws, int fifo,
		return rc;

		rollback:
		rc = brcmf_fws_rollback_toq(fws, skb);
		brcmf_fws_rollback_toq(fws, skb);
		return rc;
		}

Admin message