rpms/kernel/F-8 patch-2.6.23.9-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.707, 1.708 kernel.spec, 1.270, 1.271 linux-2.6-upstream-reverts.patch, 1.1, 1.2 mirrors, 1.4, 1.5 sources, 1.668, 1.669 upstream, 1.590, 1.591
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Tue Nov 20 18:56:43 UTC 2007
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16279
Modified Files:
.cvsignore kernel.spec linux-2.6-upstream-reverts.patch
mirrors sources upstream
Added Files:
patch-2.6.23.9-rc1.bz2.sign
Log Message:
* Tue Nov 20 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23.9-rc1
Dropped:
Patch663: linux-2.6-libata-sata_sis-fix-scr-read.patch
Patch664: linux-2.6-libata-sata_sis_correct-sg-table-size.patch
Patch2230: linux-2.6-sched-disable-precise-accounting.patch
--- NEW FILE patch-2.6.23.9-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHQyetyGugalF9Dw4RAirUAKCVkOPOS94xfDSN0Weiz/GnakQVaQCffo5m
c7R1ipifmESrHpfVcsRqI80=
=B+h7
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- .cvsignore 19 Nov 2007 17:29:05 -0000 1.707
+++ .cvsignore 20 Nov 2007 18:56:08 -0000 1.708
@@ -4,3 +4,4 @@
kernel-2.6.23
linux-2.6.23.tar.bz2
patch-2.6.23.8.bz2
+patch-2.6.23.9-rc1.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- kernel.spec 19 Nov 2007 20:15:45 -0000 1.270
+++ kernel.spec 20 Nov 2007 18:56:08 -0000 1.271
@@ -557,7 +557,7 @@
%endif
# -stable RC
-# Patch02: patch-2.6.22.6-rc1.patch
+Patch02: patch-2.6.23.9-rc1.bz2
%if !%{nopatches}
@@ -666,8 +666,6 @@
Patch660: linux-2.6-libata-ali-atapi-dma.patch
Patch661: linux-2.6-libata-acpi-enable.patch
Patch662: linux-2.6-libata-add-dma-disable-option.patch
-Patch663: linux-2.6-libata-sata_sis-fix-scr-read.patch
-Patch664: linux-2.6-libata-sata_sis_correct-sg-table-size.patch
Patch665: linux-2.6-libata-dont-fail-revalidation-for-bad-gtf-methods.patch
Patch666: linux-2.6-libata-pata_serverworks-fix-drive-combinations.patch
Patch670: linux-2.6-ata-quirk.patch
@@ -741,8 +739,6 @@
Patch2202: linux-2.6-selinux-ebitmap-for-avc-miss-cleanup.patch
Patch2203: linux-2.6-selinux-sigchld-wait.patch
Patch2204: linux-2.6-selinux-ebitmap-loop-bug.patch
-# precise CPU accounting causes divide by zero
-Patch2230: linux-2.6-sched-disable-precise-accounting.patch
%endif
@@ -1026,7 +1022,7 @@
%endif
# -stable RC
-# ApplyPatch patch-2.6.22.9-rc1.patch
+ApplyPatch patch-2.6.23.9-rc1.bz2
# This patch adds a "make nonint_oldconfig" which is non-interactive and
# also gives a list of missing options at the end. Useful for automated
@@ -1257,9 +1253,6 @@
ApplyPatch linux-2.6-libata-acpi-enable.patch
# add option to disable PATA DMA
ApplyPatch linux-2.6-libata-add-dma-disable-option.patch
-# Fix broken sata_sis in 2.6.23
-ApplyPatch linux-2.6-libata-sata_sis-fix-scr-read.patch
-ApplyPatch linux-2.6-libata-sata_sis_correct-sg-table-size.patch
# fix resume failure on some systems
ApplyPatch linux-2.6-libata-dont-fail-revalidation-for-bad-gtf-methods.patch
# serverworks is broken with some drive combinations
@@ -1368,9 +1361,6 @@
ApplyPatch linux-2.6-selinux-sigchld-wait.patch
ApplyPatch linux-2.6-selinux-ebitmap-loop-bug.patch
-# precise cpu time accounting causes divide by zero
-ApplyPatch linux-2.6-sched-disable-precise-accounting.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -1967,6 +1957,9 @@
%changelog
+* Tue Nov 20 2007 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.23.9-rc1
+
* Mon Nov 19 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix oops in netfilter NAT module (#259501)
linux-2.6-upstream-reverts.patch:
Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-upstream-reverts.patch 19 Nov 2007 17:29:06 -0000 1.1
+++ linux-2.6-upstream-reverts.patch 20 Nov 2007 18:56:08 -0000 1.2
@@ -1812,3 +1812,172 @@
/* Calculate quality */
priv->wstats.qual.qual = max(quality, (u32)100);
+From 0b5316769774d1dc2fdd702e095f9e6992af269a Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Tue, 9 Oct 2007 13:55:24 -0400
+Subject: ipw2200: batch non-user-requested scan result notifications
+
+From: Dan Williams <dcbw at redhat.com>
+
+patch 0b5316769774d1dc2fdd702e095f9e6992af269a in mainline.
+
+ipw2200 makes extensive use of background scanning when unassociated or
+down. Unfortunately, the firmware sends scan completed events many
+times per second, which the driver pushes directly up to userspace.
+This needlessly wakes up processes listening for wireless events many
+times per second. Batch together scan completed events for
+non-user-requested scans and send them up to userspace every 4 seconds.
+Scan completed events resulting from an SIOCSIWSCAN call are pushed up
+without delay.
+
+Signed-off-by: Dan Williams <dcbw at redhat.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Cc: Tobias Powalowski <t.powa at gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/wireless/ipw2200.c | 56 +++++++++++++++++++++++++++++++++--------
+ drivers/net/wireless/ipw2200.h | 3 ++
+ 2 files changed, 49 insertions(+), 10 deletions(-)
+
+--- a/drivers/net/wireless/ipw2200.c
++++ b/drivers/net/wireless/ipw2200.c
+@@ -1740,8 +1740,10 @@ static int ipw_radio_kill_sw(struct ipw_
+ if (disable_radio) {
+ priv->status |= STATUS_RF_KILL_SW;
+
+- if (priv->workqueue)
++ if (priv->workqueue) {
+ cancel_delayed_work(&priv->request_scan);
++ cancel_delayed_work(&priv->scan_event);
++ }
+ queue_work(priv->workqueue, &priv->down);
+ } else {
+ priv->status &= ~STATUS_RF_KILL_SW;
+@@ -1992,6 +1994,7 @@ static void ipw_irq_tasklet(struct ipw_p
+ wake_up_interruptible(&priv->wait_command_queue);
+ priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+ cancel_delayed_work(&priv->request_scan);
++ cancel_delayed_work(&priv->scan_event);
+ schedule_work(&priv->link_down);
+ queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ);
+ handled |= IPW_INTA_BIT_RF_KILL_DONE;
+@@ -4341,6 +4344,37 @@ static void ipw_handle_missed_beacon(str
+ IPW_DEBUG_NOTIF("Missed beacon: %d\n", missed_count);
+ }
+
++static void ipw_scan_event(struct work_struct *work)
++{
++ union iwreq_data wrqu;
++
++ struct ipw_priv *priv =
++ container_of(work, struct ipw_priv, scan_event.work);
++
++ wrqu.data.length = 0;
++ wrqu.data.flags = 0;
++ wireless_send_event(priv->net_dev, SIOCGIWSCAN, &wrqu, NULL);
++}
++
++static void handle_scan_event(struct ipw_priv *priv)
++{
++ /* Only userspace-requested scan completion events go out immediately */
++ if (!priv->user_requested_scan) {
++ if (!delayed_work_pending(&priv->scan_event))
++ queue_delayed_work(priv->workqueue, &priv->scan_event,
++ round_jiffies(msecs_to_jiffies(4000)));
++ } else {
++ union iwreq_data wrqu;
++
++ priv->user_requested_scan = 0;
++ cancel_delayed_work(&priv->scan_event);
++
++ wrqu.data.length = 0;
++ wrqu.data.flags = 0;
++ wireless_send_event(priv->net_dev, SIOCGIWSCAN, &wrqu, NULL);
++ }
++}
++
+ /**
+ * Handle host notification packet.
+ * Called from interrupt routine
+@@ -4702,14 +4736,8 @@ static void ipw_rx_notification(struct i
+ * on how the scan was initiated. User space can just
+ * sync on periodic scan to get fresh data...
+ * Jean II */
+- if (x->status == SCAN_COMPLETED_STATUS_COMPLETE) {
+- union iwreq_data wrqu;
+-
+- wrqu.data.length = 0;
+- wrqu.data.flags = 0;
+- wireless_send_event(priv->net_dev, SIOCGIWSCAN,
+- &wrqu, NULL);
+- }
++ if (x->status == SCAN_COMPLETED_STATUS_COMPLETE)
++ handle_scan_event(priv);
+ break;
+ }
+
+@@ -9472,6 +9500,10 @@ static int ipw_wx_set_scan(struct net_de
+ struct ipw_priv *priv = ieee80211_priv(dev);
+ struct iw_scan_req *req = (struct iw_scan_req *)extra;
+
++ mutex_lock(&priv->mutex);
++ priv->user_requested_scan = 1;
++ mutex_unlock(&priv->mutex);
++
+ if (wrqu->data.length == sizeof(struct iw_scan_req)) {
+ if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
+ ipw_request_direct_scan(priv, req->essid,
+@@ -10647,6 +10679,7 @@ static void ipw_link_up(struct ipw_priv
+ }
+
+ cancel_delayed_work(&priv->request_scan);
++ cancel_delayed_work(&priv->scan_event);
+ ipw_reset_stats(priv);
+ /* Ensure the rate is updated immediately */
+ priv->last_rate = ipw_get_current_rate(priv);
+@@ -10684,7 +10717,8 @@ static void ipw_link_down(struct ipw_pri
+ if (!(priv->status & STATUS_EXIT_PENDING)) {
+ /* Queue up another scan... */
+ queue_delayed_work(priv->workqueue, &priv->request_scan, 0);
+- }
++ } else
++ cancel_delayed_work(&priv->scan_event);
+ }
+
+ static void ipw_bg_link_down(struct work_struct *work)
+@@ -10714,6 +10748,7 @@ static int ipw_setup_deferred_work(struc
+ INIT_WORK(&priv->up, ipw_bg_up);
+ INIT_WORK(&priv->down, ipw_bg_down);
+ INIT_DELAYED_WORK(&priv->request_scan, ipw_request_scan);
++ INIT_DELAYED_WORK(&priv->scan_event, ipw_scan_event);
+ INIT_WORK(&priv->request_passive_scan, ipw_request_passive_scan);
+ INIT_DELAYED_WORK(&priv->gather_stats, ipw_bg_gather_stats);
+ INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan);
+@@ -11746,6 +11781,7 @@ static void ipw_pci_remove(struct pci_de
+ cancel_delayed_work(&priv->adhoc_check);
+ cancel_delayed_work(&priv->gather_stats);
+ cancel_delayed_work(&priv->request_scan);
++ cancel_delayed_work(&priv->scan_event);
+ cancel_delayed_work(&priv->rf_kill);
+ cancel_delayed_work(&priv->scan_check);
+ destroy_workqueue(priv->workqueue);
+--- a/drivers/net/wireless/ipw2200.h
++++ b/drivers/net/wireless/ipw2200.h
+@@ -1288,6 +1288,8 @@ struct ipw_priv {
+
+ struct iw_public_data wireless_data;
+
++ int user_requested_scan;
++
+ struct workqueue_struct *workqueue;
+
+ struct delayed_work adhoc_check;
+@@ -1296,6 +1298,7 @@ struct ipw_priv {
+ struct work_struct system_config;
+ struct work_struct rx_replenish;
+ struct delayed_work request_scan;
++ struct delayed_work scan_event;
+ struct work_struct request_passive_scan;
+ struct work_struct adapter_restart;
+ struct delayed_work rf_kill;
Index: mirrors
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/mirrors,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mirrors 7 Aug 2007 20:52:32 -0000 1.4
+++ mirrors 20 Nov 2007 18:56:08 -0000 1.5
@@ -2,3 +2,4 @@
http://ftp.kernel.org/pub/linux/kernel/v2.6/
http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/old/
http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/
+http://ftp.kernel.org/pub/linux/kernel/v2.6/stable-review/
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- sources 19 Nov 2007 17:29:06 -0000 1.668
+++ sources 20 Nov 2007 18:56:08 -0000 1.669
@@ -1,2 +1,3 @@
2cc2fd4d521dc5d7cfce0d8a9d1b3472 linux-2.6.23.tar.bz2
8f5bcde606a910025eebe71d8a237e95 patch-2.6.23.8.bz2
+7391d844425b77cc1e4ccde79e2466d9 patch-2.6.23.9-rc1.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- upstream 19 Nov 2007 17:29:06 -0000 1.590
+++ upstream 20 Nov 2007 18:56:08 -0000 1.591
@@ -1,2 +1,3 @@
linux-2.6.23.tar.bz2
patch-2.6.23.8.bz2
+patch-2.6.23.9-rc1.bz2
More information about the fedora-extras-commits
mailing list