diff mbox series

[net-next] rsi: Slightly simplify rsi_set_channel()

Message ID 29bf0296bd939e3f6952272bfdcc73b22edbc374.1679328588.git.christophe.jaillet@wanadoo.fr
State New
Headers
Series [net-next] rsi: Slightly simplify rsi_set_channel() |

Commit Message

Christophe JAILLET March 20, 2023, 4:13 p.m. UTC 
  There is no point in allocating 'skb' and then freeing it if !channel.

Make the sanity check first to slightly simplify the code.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/wireless/rsi/rsi_91x_mgmt.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Simon Horman March 20, 2023, 7:02 p.m. UTC | #1 
On Mon, Mar 20, 2023 at 05:13:42PM +0100, Christophe JAILLET wrote:
> There is no point in allocating 'skb' and then freeing it if !channel.
> 
> Make the sanity check first to slightly simplify the code.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Kalle Valo March 31, 2023, 2:45 p.m. UTC | #2 
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:

> There is no point in allocating 'skb' and then freeing it if !channel.
> 
> Make the sanity check first to slightly simplify the code.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>

Patch applied to wireless-next.git, thanks.

8de7838acfa3 wifi: rsi: Slightly simplify rsi_set_channel()
diff mbox series

Patch

diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
index c14689266fec..be9ac252f804 100644
--- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
@@ -1127,6 +1127,9 @@  int rsi_set_channel(struct rsi_common *common,
 	rsi_dbg(MGMT_TX_ZONE,
 		"%s: Sending scan req frame\n", __func__);
 
+	if (!channel)
+		return 0;
+
 	skb = dev_alloc_skb(frame_len);
 	if (!skb) {
 		rsi_dbg(ERR_ZONE, "%s: Failed in allocation of skb\n",
@@ -1134,10 +1137,6 @@  int rsi_set_channel(struct rsi_common *common,
 		return -ENOMEM;
 	}
 
-	if (!channel) {
-		dev_kfree_skb(skb);
-		return 0;
-	}
 	memset(skb->data, 0, frame_len);
 	chan_cfg = (struct rsi_chan_config *)skb->data;