rpms/kernel/F-9 linux-2.6-wireless-stable-backports.patch, NONE, 1.1 patch-2.6.26.3.bz2.sign, NONE, 1.1 .cvsignore, 1.824, 1.825 config-generic, 1.114, 1.115 kernel.spec, 1.743, 1.744 linux-2.6-upstream-reverts.patch, 1.9, 1.10 sources, 1.785, 1.786 upstream, 1.704, 1.705 linux-2.6-usb-storage-nikond80-quirk.patch, 1.3, NONE patch-2.6.26.2.bz2.sign, 1.1, NONE
Chuck Ebbert
cebbert at fedoraproject.org
Fri Aug 22 18:16:56 UTC 2008
- Previous message (by thread): rpms/extrema/F-9 .cvsignore, 1.5, 1.6 extrema.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/ql2400-firmware/F-8 ql2400-firmware.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20212
Modified Files:
.cvsignore config-generic kernel.spec
linux-2.6-upstream-reverts.patch sources upstream
Added Files:
linux-2.6-wireless-stable-backports.patch
patch-2.6.26.3.bz2.sign
Removed Files:
linux-2.6-usb-storage-nikond80-quirk.patch
patch-2.6.26.2.bz2.sign
Log Message:
Linux 2.6.26.3
Dropped patches:
linux-2.6-usb-storage-nikond80-quirk.patch
Upstream revert:
rtl8187-fix-lockups-due-to-concurrent-access-to-config-routine.patch
New wireless patch:
linux-2.6-wireless-stable-backports.patch
linux-2.6-wireless-stable-backports.patch:
--- NEW FILE linux-2.6-wireless-stable-backports.patch ---
>From stable-bounces at linux.kernel.org Tue Aug 5 21:22:47 2008
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: Tue, 05 Aug 2008 23:20:56 -0500
Subject: [stable] [PATCH] rtl8187: Fix lockups due to concurrent access to config routine
To: stable at kernel.org
Message-ID: <489926a8.Tmk8qWQZeTkY9DVD%Larry.Finger at lwfinger.net>
From: Larry Finger <Larry.Finger at lwfinger.net>
With the rtl8187 driver, the config routine is not protected against
access before a previous call has completed. When this happens, the
TX loopback that is needed to change channels may cause the chip to
be locked with a reset needed to restore communications. This patch
entered mainline as commit 7dcdd073bf78bb6958bbc12a1a47754a0f3c4721.
The problem was found by Herton Ronaldo Krzesinski <herton at mandriva.com.br>,
who also suggested this type of fix.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Acked-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Acked-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/net/wireless/rtl8187.h | 4 ++++
drivers/net/wireless/rtl8187_dev.c | 3 +++
2 files changed, 7 insertions(+)
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -580,6 +580,7 @@ static int rtl8187_config(struct ieee802
struct rtl8187_priv *priv = dev->priv;
u32 reg;
+ mutex_lock(&priv->conf_mutex);
reg = rtl818x_ioread32(priv, &priv->map->TX_CONF);
/* Enable TX loopback on MAC level to avoid TX during channel
* changes, as this has be seen to causes problems and the
@@ -610,6 +611,7 @@ static int rtl8187_config(struct ieee802
rtl818x_iowrite16(priv, &priv->map->ATIMTR_INTERVAL, 100);
rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL, 100);
rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL_TIME, 100);
+ mutex_unlock(&priv->conf_mutex);
return 0;
}
@@ -814,6 +816,7 @@ static int __devinit rtl8187_probe(struc
printk(KERN_ERR "rtl8187: Cannot register device\n");
goto err_free_dev;
}
+ mutex_init(&priv->conf_mutex);
printk(KERN_INFO "%s: hwaddr %s, %s V%d + %s\n",
wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -67,6 +67,10 @@ struct rtl8187_priv {
const struct rtl818x_rf_ops *rf;
struct ieee80211_vif *vif;
int mode;
+ /* The mutex protects the TX loopback state.
+ * Any attempt to set channels concurrently locks the device.
+ */
+ struct mutex conf_mutex;
/* rtl8187 specific */
struct ieee80211_channel channels[14];
--- NEW FILE patch-2.6.26.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBIrGGbyGugalF9Dw4RAsUbAJ0WGNJtWECDpcFPHzcZJ/XBMeJLcQCfUp0d
QH7/insRsfjM1aEhOwMjxtk=
=/RAD
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- .cvsignore 7 Aug 2008 06:27:07 -0000 1.824
+++ .cvsignore 22 Aug 2008 18:16:25 -0000 1.825
@@ -4,4 +4,4 @@
temp-*
kernel-2.6.26
linux-2.6.26.tar.bz2
-patch-2.6.26.2.bz2
+patch-2.6.26.3.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- config-generic 22 Aug 2008 17:25:09 -0000 1.114
+++ config-generic 22 Aug 2008 18:16:26 -0000 1.115
@@ -1807,15 +1807,15 @@
#
# I2C Algorithms
#
+# CONFIG_I2C_HELPER_AUTO is not set
# CONFIG_I2C_DEBUG_ALGO is not set
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
#
# I2C Hardware Bus support
#
-
-CONFIG_I2C_ALGOPCA=m
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- kernel.spec 22 Aug 2008 17:25:09 -0000 1.743
+++ kernel.spec 22 Aug 2008 18:16:26 -0000 1.744
@@ -31,7 +31,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 2
+%define stable_update 3
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -625,7 +625,8 @@
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
#Patch682: linux-2.6-wireless-fixups.patch
-Patch683: linux-2.6-rt2500usb-fix.patch
+Patch683: linux-2.6-wireless-stable-backports.patch
+Patch685: linux-2.6-rt2500usb-fix.patch
Patch690: linux-2.6-at76.patch
Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -653,8 +654,6 @@
# make USB EHCI driver respect "nousb" parameter
Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=454028
-Patch2302: linux-2.6-usb-storage-nikond80-quirk.patch
Patch2501: linux-2.6-ppc-use-libgcc.patch
@@ -1058,7 +1057,6 @@
# USB
ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
-ApplyPatch linux-2.6-usb-storage-nikond80-quirk.patch
# ACPI
# obvious bug in processor driver
@@ -1146,6 +1144,13 @@
# fixups to make current wireless patches build on this kernel
#ApplyPatch linux-2.6-wireless-fixups.patch
+# backports of upstream -stable wireless patches that we need
+# (reverted in -upstream-reverts)
+C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-wireless-stable-backports.patch | awk '{print $1}')
+if [ "$C" -gt 10 ]; then
+ApplyPatch linux-2.6-wireless-stable-backports.patch
+fi
+
# fix for long-standing rt2500usb issues
ApplyPatch linux-2.6-rt2500usb-fix.patch
@@ -1777,6 +1782,15 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Fri Aug 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-17
+- Linux 2.6.26.3
+ Dropped patches:
+ linux-2.6-usb-storage-nikond80-quirk.patch
+ Upstream revert:
+ rtl8187-fix-lockups-due-to-concurrent-access-to-config-routine.patch
+ New wireless patch:
+ linux-2.6-wireless-stable-backports.patch
+
* Fri Aug 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.2-16
- Disable the snd_pcsp driver. (#459477)
linux-2.6-upstream-reverts.patch:
Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-upstream-reverts.patch 4 Aug 2008 22:20:04 -0000 1.9
+++ linux-2.6-upstream-reverts.patch 22 Aug 2008 18:16:26 -0000 1.10
@@ -111,3 +111,72 @@
return err;
}
+From stable-bounces at linux.kernel.org Tue Aug 5 21:22:47 2008
+From: Larry Finger <Larry.Finger at lwfinger.net>
+Date: Tue, 05 Aug 2008 23:20:56 -0500
+Subject: [stable] [PATCH] rtl8187: Fix lockups due to concurrent access to config routine
+To: stable at kernel.org
+Message-ID: <489926a8.Tmk8qWQZeTkY9DVD%Larry.Finger at lwfinger.net>
+
+From: Larry Finger <Larry.Finger at lwfinger.net>
+
+With the rtl8187 driver, the config routine is not protected against
+access before a previous call has completed. When this happens, the
+TX loopback that is needed to change channels may cause the chip to
+be locked with a reset needed to restore communications. This patch
+entered mainline as commit 7dcdd073bf78bb6958bbc12a1a47754a0f3c4721.
+
+The problem was found by Herton Ronaldo Krzesinski <herton at mandriva.com.br>,
+who also suggested this type of fix.
+
+Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+Acked-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+Acked-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+
+---
+ drivers/net/wireless/rtl8187.h | 4 ++++
+ drivers/net/wireless/rtl8187_dev.c | 3 +++
+ 2 files changed, 7 insertions(+)
+
+--- a/drivers/net/wireless/rtl8187_dev.c
++++ b/drivers/net/wireless/rtl8187_dev.c
+@@ -580,6 +580,7 @@ static int rtl8187_config(struct ieee802
+ struct rtl8187_priv *priv = dev->priv;
+ u32 reg;
+
++ mutex_lock(&priv->conf_mutex);
+ reg = rtl818x_ioread32(priv, &priv->map->TX_CONF);
+ /* Enable TX loopback on MAC level to avoid TX during channel
+ * changes, as this has be seen to causes problems and the
+@@ -610,6 +611,7 @@ static int rtl8187_config(struct ieee802
+ rtl818x_iowrite16(priv, &priv->map->ATIMTR_INTERVAL, 100);
+ rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL, 100);
+ rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL_TIME, 100);
++ mutex_unlock(&priv->conf_mutex);
+ return 0;
+ }
+
+@@ -814,6 +816,7 @@ static int __devinit rtl8187_probe(struc
+ printk(KERN_ERR "rtl8187: Cannot register device\n");
+ goto err_free_dev;
+ }
++ mutex_init(&priv->conf_mutex);
+
+ printk(KERN_INFO "%s: hwaddr %s, rtl8187 V%d + %s\n",
+ wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
+--- a/drivers/net/wireless/rtl8187.h
++++ b/drivers/net/wireless/rtl8187.h
+@@ -67,6 +67,10 @@ struct rtl8187_priv {
+ const struct rtl818x_rf_ops *rf;
+ struct ieee80211_vif *vif;
+ int mode;
++ /* The mutex protects the TX loopback state.
++ * Any attempt to set channels concurrently locks the device.
++ */
++ struct mutex conf_mutex;
+
+ /* rtl8187 specific */
+ struct ieee80211_channel channels[14];
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -r1.785 -r1.786
--- sources 7 Aug 2008 06:27:07 -0000 1.785
+++ sources 22 Aug 2008 18:16:26 -0000 1.786
@@ -1,2 +1,2 @@
5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2
-5e0b0853ab6e968f7a09597c11b8e0c7 patch-2.6.26.2.bz2
+556282beb8feabee2972e1971984f6dd patch-2.6.26.3.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -r1.704 -r1.705
--- upstream 7 Aug 2008 06:27:07 -0000 1.704
+++ upstream 22 Aug 2008 18:16:26 -0000 1.705
@@ -1,2 +1,2 @@
linux-2.6.26.tar.bz2
-patch-2.6.26.2.bz2
+patch-2.6.26.3.bz2
--- linux-2.6-usb-storage-nikond80-quirk.patch DELETED ---
--- patch-2.6.26.2.bz2.sign DELETED ---
- Previous message (by thread): rpms/extrema/F-9 .cvsignore, 1.5, 1.6 extrema.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/ql2400-firmware/F-8 ql2400-firmware.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list