diff options
author | Arend van Spriel <arend@broadcom.com> | 2013-04-17 15:25:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-22 15:20:23 -0400 |
commit | 88f656fa10563688978c8269ffb11ceb83a56ba2 (patch) | |
tree | 3b433fa4ea152f3e2f106ed61b1f8591afb1d6fe | |
parent | 67994fa24accac120a6ae9720ef0cba0166ce121 (diff) |
brcmfmac: change return type for brcmf_rollback_toq() to void
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>
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 13518ecce047..25eaa1305db2 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | |||
@@ -1574,7 +1574,7 @@ static int brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo, | |||
1574 | return rc; | 1574 | return rc; |
1575 | } | 1575 | } |
1576 | 1576 | ||
1577 | static int | 1577 | static void |
1578 | brcmf_fws_rollback_toq(struct brcmf_fws_info *fws, struct sk_buff *skb) | 1578 | brcmf_fws_rollback_toq(struct brcmf_fws_info *fws, struct sk_buff *skb) |
1579 | { | 1579 | { |
1580 | /* | 1580 | /* |
@@ -1654,7 +1654,6 @@ fail: | |||
1654 | fws->stats.rollback_failed++; | 1654 | fws->stats.rollback_failed++; |
1655 | } else | 1655 | } else |
1656 | fws->stats.rollback_success++; | 1656 | fws->stats.rollback_success++; |
1657 | return rc; | ||
1658 | } | 1657 | } |
1659 | 1658 | ||
1660 | static int brcmf_fws_consume_credit(struct brcmf_fws_info *fws, int fifo, | 1659 | 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, | |||
1733 | return rc; | 1732 | return rc; |
1734 | 1733 | ||
1735 | rollback: | 1734 | rollback: |
1736 | rc = brcmf_fws_rollback_toq(fws, skb); | 1735 | brcmf_fws_rollback_toq(fws, skb); |
1737 | return rc; | 1736 | return rc; |
1738 | } | 1737 | } |
1739 | 1738 | ||