wifi: rsi: Slightly simplify rsi_set_channel()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Mon, 20 Mar 2023 16:13:42 +0000 (17:13 +0100)
committerKalle Valo <kvalo@kernel.org>
Fri, 31 Mar 2023 14:45:50 +0000 (17:45 +0300)
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>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/29bf0296bd939e3f6952272bfdcc73b22edbc374.1679328588.git.christophe.jaillet@wanadoo.fr
drivers/net/wireless/rsi/rsi_91x_mgmt.c

index 1b309e4..7f2c160 100644 (file)
@@ -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;