Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e0a67e authored by John W. Linville's avatar John W. Linville
Browse files

iwlwifi: do not register bands with no supported channels 



Otherwise, b/g-only devices fail in wiphy_register.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent be892471

drivers/net/wireless/iwlwifi/iwl3945-base.c

+6 −2
Original line number Diff line number Diff line
@@ -5136,8 +5136,12 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv) 
	       priv->bands[IEEE80211_BAND_2GHZ].n_channels,

	       priv->bands[IEEE80211_BAND_5GHZ].n_channels);



	priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->bands[IEEE80211_BAND_2GHZ];

	priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &priv->bands[IEEE80211_BAND_5GHZ];

	if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)

		priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =

			&priv->bands[IEEE80211_BAND_2GHZ];

	if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)

		priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =

			&priv->bands[IEEE80211_BAND_5GHZ];



	set_bit(STATUS_GEO_CONFIGURED, &priv->status);

drivers/net/wireless/iwlwifi/iwl4965-base.c

+6 −2
Original line number Diff line number Diff line
@@ -5001,8 +5001,12 @@ int iwl4965_init_geos(struct iwl_priv *priv) 
	       priv->bands[IEEE80211_BAND_2GHZ].n_channels,

	       priv->bands[IEEE80211_BAND_5GHZ].n_channels);



	priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->bands[IEEE80211_BAND_2GHZ];

	priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &priv->bands[IEEE80211_BAND_5GHZ];

	if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)

		priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =

			&priv->bands[IEEE80211_BAND_2GHZ];

	if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)

		priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =

			&priv->bands[IEEE80211_BAND_5GHZ];



	set_bit(STATUS_GEO_CONFIGURED, &priv->status);