Unverified Commit 85b58143 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10276 net: ieee802154: at86rf230: Stop leaking skb's 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XBY4LXWDLEUEAYHF7MQJARJAJADRPQEF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IADG4I 
 
Link:https://gitee.com/openeuler/kernel/pulls/10276

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 8d2f09e2 91c15a78

drivers/net/ieee802154/at86rf230.c

+11 −2
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct at86rf230_local { 
	unsigned long cal_timeout;

	bool is_tx;

	bool is_tx_from_off;

	bool was_tx;

	u8 tx_retry;

	struct sk_buff *tx_skb;

	struct at86rf230_state_change tx;
@@ -351,8 +352,12 @@ at86rf230_async_error_recover_complete(void *context) 
	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);

	}

}



static void

at86rf230_async_error_recover(void *context)
@@ -360,7 +365,11 @@ at86rf230_async_error_recover(void *context) 
	struct at86rf230_state_change *ctx = context;

	struct at86rf230_local *lp = ctx->lp;



	if (lp->is_tx) {

		lp->was_tx = 1;

		lp->is_tx = 0;

	}



	at86rf230_async_state_change(lp, ctx, STATE_RX_AACK_ON,

				     at86rf230_async_error_recover_complete);

}