Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6f961068671698c242f1828960485fef1392916f

Authored by Wei Yongjun
Committed by David S. Miller
1 parent fbbfb986a8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

af_key: remove some pointless conditionals before kfree_skb() 

Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

... ... @@ -313,8 +313,7 @@
313 313 if (one_sk != NULL)
314 314 err = pfkey_broadcast_one(skb, &skb2, allocation, one_sk);
315 315  
316   - if (skb2)
317   - kfree_skb(skb2);
  316 + kfree_skb(skb2);
318 317 kfree_skb(skb);
319 318 return err;
320 319 }
... ... @@ -3573,8 +3572,7 @@
3573 3572 out:
3574 3573 if (err && hdr && pfkey_error(hdr, err, sk) == 0)
3575 3574 err = 0;
3576   - if (skb)
3577   - kfree_skb(skb);
  3575 + kfree_skb(skb);
3578 3576  
3579 3577 return err ? : len;
3580 3578 }