| Message ID | 20220818093114.2449179-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6745bc9b0351525e80cc7578e8ce22f83cfa3a84 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next] amt: remove unneccessary skb pointer check | expand |
Hi Yang, Thanks for this work! On 8/18/22 18:31, Yang Yingliang wrote: > The skb pointer will be checked in kfree_skb(), so remove the outside check. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Taehee Yoo <ap420073@gmail.com> > --- > drivers/net/amt.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/amt.c b/drivers/net/amt.c > index 9a247eb7679c..2d20be6ffb7e 100644 > --- a/drivers/net/amt.c > +++ b/drivers/net/amt.c > @@ -2894,8 +2894,7 @@ static void amt_event_work(struct work_struct *work) > amt_event_send_request(amt); > break; > default: > - if (skb) > - kfree_skb(skb); > + kfree_skb(skb); > break; > } > } > @@ -3033,8 +3032,7 @@ static int amt_dev_stop(struct net_device *dev) > cancel_work_sync(&amt->event_wq); > for (i = 0; i < AMT_MAX_EVENTS; i++) { > skb = amt->events[i].skb; > - if (skb) > - kfree_skb(skb); > + kfree_skb(skb); > amt->events[i].event = AMT_EVENT_NONE; > amt->events[i].skb = NULL; > }
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 18 Aug 2022 17:31:14 +0800 you wrote: > The skb pointer will be checked in kfree_skb(), so remove the outside check. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/net/amt.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Here is the summary with links: - [-next] amt: remove unneccessary skb pointer check https://git.kernel.org/netdev/net-next/c/6745bc9b0351 You are awesome, thank you!
diff --git a/drivers/net/amt.c b/drivers/net/amt.c index 9a247eb7679c..2d20be6ffb7e 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -2894,8 +2894,7 @@ static void amt_event_work(struct work_struct *work) amt_event_send_request(amt); break; default: - if (skb) - kfree_skb(skb); + kfree_skb(skb); break; } } @@ -3033,8 +3032,7 @@ static int amt_dev_stop(struct net_device *dev) cancel_work_sync(&amt->event_wq); for (i = 0; i < AMT_MAX_EVENTS; i++) { skb = amt->events[i].skb; - if (skb) - kfree_skb(skb); + kfree_skb(skb); amt->events[i].event = AMT_EVENT_NONE; amt->events[i].skb = NULL; }
The skb pointer will be checked in kfree_skb(), so remove the outside check. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/amt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)