wifi: mwifiex: move common settings out of switch/case

In mwifiex_add_virtual_intf() several settings done in a switch/case
are the same in all cases. Move them out of the switch/case to
deduplicate the code.

bss_started is not initialized in all switch/case branches, but it is
only used in AP mode in the driver, so it doesn't hurt to move its
initialization out of the switch/case as well.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Francesco Dolcini <francesco@dolcini.it>
Acked-by: Brian Norris <briannorris@chromium.org>
Link: https://patch.msgid.link/20250410-mwifiex-cleanup-1-v6-9-a6bbd4ac4d37@pengutronix.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 1d9bc8f..5d6f4d2 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -3007,7 +3007,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                        return ERR_PTR(-EFAULT);
                }
 
-               priv->wdev.wiphy = wiphy;
                priv->wdev.iftype = NL80211_IFTYPE_STATION;
 
                if (type == NL80211_IFTYPE_UNSPECIFIED)
@@ -3016,8 +3015,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                        priv->bss_mode = type;
 
                priv->bss_type = MWIFIEX_BSS_TYPE_STA;
-               priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
-               priv->bss_priority = 0;
                priv->bss_role = MWIFIEX_BSS_ROLE_STA;
 
                break;
@@ -3037,14 +3034,10 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                        return ERR_PTR(-EFAULT);
                }
 
-               priv->wdev.wiphy = wiphy;
                priv->wdev.iftype = NL80211_IFTYPE_AP;
 
                priv->bss_type = MWIFIEX_BSS_TYPE_UAP;
-               priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
-               priv->bss_priority = 0;
                priv->bss_role = MWIFIEX_BSS_ROLE_UAP;
-               priv->bss_started = 0;
                priv->bss_mode = type;
 
                break;
@@ -3064,7 +3057,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                        return ERR_PTR(-EFAULT);
                }
 
-               priv->wdev.wiphy = wiphy;
                /* At start-up, wpa_supplicant tries to change the interface
                 * to NL80211_IFTYPE_STATION if it is not managed mode.
                 */
@@ -3077,10 +3069,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 */
                priv->bss_type = MWIFIEX_BSS_TYPE_P2P;
 
-               priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
-               priv->bss_priority = 0;
                priv->bss_role = MWIFIEX_BSS_ROLE_STA;
-               priv->bss_started = 0;
 
                if (mwifiex_cfg80211_init_p2p_client(priv)) {
                        memset(&priv->wdev, 0, sizeof(priv->wdev));
@@ -3094,6 +3083,11 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                return ERR_PTR(-EINVAL);
        }
 
+       priv->wdev.wiphy = wiphy;
+       priv->bss_priority = 0;
+       priv->bss_started = 0;
+       priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
+
        dev = alloc_netdev_mqs(sizeof(struct mwifiex_private *), name,
                               name_assign_type, ether_setup,
                               IEEE80211_NUM_ACS, 1);