ieee802154_xmit_error() is the right helper to call when a transmission
has failed. Let's use it instead of open-coding it.
As the error helper also requires an error code, save the error from the
previous helper in order to give this value to the core when
opportunate.
Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
---
drivers/net/ieee802154/at86rf230.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 5f19266b3045..9cc272e3460a 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -74,6 +74,7 @@ struct at86rf230_state_change {
u8 to_state;
bool free;
+ int reason;
};
struct at86rf230_trac {
@@ -340,14 +341,14 @@ at86rf230_async_error_recover_complete(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
+ int reason = ctx->reason;
if (ctx->free)
kfree(ctx);
if (lp->was_tx) {
lp->was_tx = 0;
- dev_kfree_skb_any(lp->tx_skb);
- ieee802154_wake_queue(lp->hw);
+ ieee802154_xmit_error(lp->hw, lp->tx_skb, reason);
}
}
@@ -370,27 +371,24 @@ static inline void
at86rf230_async_error(struct at86rf230_local *lp,
struct at86rf230_state_change *ctx, int rc)
{
- int reason;
-
switch (rc) {
case TRAC_CHANNEL_ACCESS_FAILURE:
- reason = IEEE802154_CHANNEL_ACCESS_FAILURE;
+ ctx->reason = IEEE802154_CHANNEL_ACCESS_FAILURE;
break;
case TRAC_NO_ACK:
- reason = IEEE802154_NO_ACK;
+ ctx->reason = IEEE802154_NO_ACK;
break;
case TRAC_INVALID:
- reason = IEEE802154_SYSTEM_ERROR;
+ ctx->reason = IEEE802154_SYSTEM_ERROR;
break;
default:
- reason = rc;
+ ctx->reason = rc;
}
- if (reason < 0)
- dev_err(&lp->spi->dev, "spi_async error %d\n", reason);
+ if (ctx->reason < 0)
+ dev_err(&lp->spi->dev, "spi_async error %d\n", ctx->reason);
else
- dev_err(&lp->spi->dev, "xceiver error %d\n", reason);
-
+ dev_err(&lp->spi->dev, "xceiver error %d\n", ctx->reason);
at86rf230_async_state_change(lp, ctx, STATE_FORCE_TRX_OFF,
at86rf230_async_error_recover);
--
2.27.0
