rpms/kernel/devel linux-2.6-iwlwifi-sband-registration.patch, NONE, 1.1 kernel.spec, 1.515, 1.516

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12831

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwlwifi-sband-registration.patch 
Log Message:
Prevent iwlwifi drivers from registering bands with no channels (#438273)

linux-2.6-iwlwifi-sband-registration.patch:

--- NEW FILE linux-2.6-iwlwifi-sband-registration.patch ---
diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig	2008-03-20 10:01:42.000000000 -0400
+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c	2008-03-20 10:02:26.000000000 -0400
@@ -5571,8 +5571,12 @@ static int iwl4965_init_geos(struct iwl4
 	       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);
 
diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2008-03-20 09:58:37.000000000 -0400
+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2008-03-20 10:00:40.000000000 -0400
@@ -5136,8 +5136,12 @@ static int iwl3945_init_geos(struct iwl3
 	       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);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -r1.515 -r1.516
--- kernel.spec	20 Mar 2008 06:06:41 -0000	1.515
+++ kernel.spec	20 Mar 2008 19:32:33 -0000	1.516
@@ -597,6 +597,7 @@
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch682: linux-2.6-wireless-fixups.patch
+Patch683: linux-2.6-iwlwifi-sband-registration.patch
 Patch690: linux-2.6-at76.patch
 
 Patch820: linux-2.6-compile-fixes.patch
@@ -1077,6 +1078,7 @@
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
 ApplyPatch linux-2.6-wireless-fixups.patch
+ApplyPatch linux-2.6-iwlwifi-sband-registration.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1720,6 +1722,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Mar 20 2008 John W. Linville <linville at redhat.com>
+- Prevent iwlwifi drivers from registering bands with no channels (#438273)
+
 * Thu Mar 20 2008 Dave Airlie <airlied at redhat.com>
 - bring back drm modeset