[PATCH net-next 3/3 v2] macsec: add brackets and indentation after calling macsec_decrypt
From: Andreas Steinmetz <hidden>
Date: 2019-07-03 00:29:58
At this point, skb could only be a valid pointer, so this patch does not introduce any functional change. Change: The patch now only moves the IS_ERR(skb) case under the block where macsec_decrypt() is called, but not the call to macsec_post_decrypt(). Signed-off-by: Andreas Steinmetz <redacted>
--- a/drivers/net/macsec.c 2019-07-02 06:31:27.550120145 +0200
+++ b/drivers/net/macsec.c 2019-07-02 06:33:38.637599529 +0200@@ -1205,17 +1205,18 @@ /* Disabled && !changed text => skip validation */ if (hdr->tci_an & MACSEC_TCI_C || - secy->validate_frames != MACSEC_VALIDATE_DISABLED) + secy->validate_frames != MACSEC_VALIDATE_DISABLED) { skb = macsec_decrypt(skb, dev, rx_sa, sci, secy); - if (IS_ERR(skb)) { - /* the decrypt callback needs the reference */ - if (PTR_ERR(skb) != -EINPROGRESS) { - macsec_rxsa_put(rx_sa); - macsec_rxsc_put(rx_sc); + if (IS_ERR(skb)) { + /* the decrypt callback needs the reference */ + if (PTR_ERR(skb) != -EINPROGRESS) { + macsec_rxsa_put(rx_sa); + macsec_rxsc_put(rx_sc); + } + rcu_read_unlock(); + return RX_HANDLER_CONSUMED; } - rcu_read_unlock(); - return RX_HANDLER_CONSUMED; } if (!macsec_post_decrypt(skb, secy, pn))