[kernel] r15091 - in dists: lenny lenny-security/linux-2.6 lenny-security/linux-2.6/debian lenny-security/linux-2.6/debian/patches/bugfix/all lenny-security/linux-2.6/debian/patches/series lenny/linux-2.6/debian lenny/linux-2.6/debian/patches/bugfix/all lenny/linux-2.6/debian/patches/series

[Dann Frazier]

Author: dannf
Date: Mon Feb  1 17:18:40 2010
New Revision: 15091

Log:
move reversion patch to lenny-security

Added:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
      - copied unchanged from r15065, dists/lenny/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
Deleted:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
Modified:
   dists/lenny/   (props changed)
   dists/lenny-security/linux-2.6/   (props changed)
   dists/lenny-security/linux-2.6/debian/changelog
   dists/lenny-security/linux-2.6/debian/patches/series/21lenny2
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Mon Feb  1 16:37:33 2010	(r15090)
+++ dists/lenny-security/linux-2.6/debian/changelog	Mon Feb  1 17:18:40 2010	(r15091)
@@ -1,7 +1,12 @@
 linux-2.6 (2.6.26-21lenny2) UNRELEASED; urgency=high
 
+  [ dann frazier ]
   * Fix build failure on hppa & mipsen due to missing #include
   * Port CVE-2010-0291 fix to xen featureset
+  
+  [ Ben Hutchings ]
+  * cdc_ether: Do not set link down initially; not all devices send link
+    change interrupts (Closes: #567689)
 
  -- dann frazier <dannf at debian.org>  Sun, 31 Jan 2010 14:27:08 -0700
 

Copied: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch (from r15065, dists/lenny/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch	Mon Feb  1 17:18:40 2010	(r15091, copy of r15065, dists/lenny/linux-2.6/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch)
@@ -0,0 +1,36 @@
+From ee3585e8db845cba146ecfd829b8c37f1447e1a7 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 28 Jan 2010 23:11:20 +0000
+Subject: [PATCH] cdc_ether: Partially revert "usbnet: Set link down initially ..."
+
+Commit 37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 ("usbnet: Set link down
+initially for drivers that update link state") changed the initial link
+state in cdc_ether and other drivers based on the understanding that the
+devices they support generate link change interrupts.  However, this is
+optional in the CDC Ethernet protocol, and two users have reported in
+<http://bugzilla.kernel.org/show_bug.cgi?id=14791> that the link state
+for their devices remains down.  Therefore, revert the change in
+cdc_ether.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Tested-by: Avi Rozen <avi.rozen at gmail.com>
+---
+ drivers/net/usb/cdc_ether.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
+index 21e183a..4f27f02 100644
+--- a/drivers/net/usb/cdc_ether.c
++++ b/drivers/net/usb/cdc_ether.c
+@@ -419,7 +419,7 @@ static int cdc_manage_power(struct usbnet *dev, int on)
+ 
+ static const struct driver_info	cdc_info = {
+ 	.description =	"CDC Ethernet Device",
+-	.flags =	FLAG_ETHER | FLAG_LINK_INTR,
++	.flags =	FLAG_ETHER,
+ 	// .check_connect = cdc_check_connect,
+ 	.bind =		cdc_bind,
+ 	.unbind =	usbnet_cdc_unbind,
+-- 
+1.6.6
+

Modified: dists/lenny-security/linux-2.6/debian/patches/series/21lenny2
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/21lenny2	Mon Feb  1 16:37:33 2010	(r15090)
+++ dists/lenny-security/linux-2.6/debian/patches/series/21lenny2	Mon Feb  1 17:18:40 2010	(r15091)
@@ -1 +1,2 @@
 + bugfix/all/mm-util.c-sched.h.patch
++ bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon Feb  1 16:37:33 2010	(r15090)
+++ dists/lenny/linux-2.6/debian/changelog	Mon Feb  1 17:18:40 2010	(r15091)
@@ -19,8 +19,6 @@
   * audit: Fix memory management bugs (Closes: #562815)
     - fix braindamage in audit_tree.c untag_chunk()
     - fix more leaks in audit_tree.c tag_chunk()
-  * cdc_ether: Do not set link down initially; not all devices send link
-    change interrupts (Closes: #567689)
 
  -- maximilian attems <maks at debian.org>  Mon, 28 Dec 2009 23:44:19 +0100
 

Modified: dists/lenny/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22	Mon Feb  1 16:37:33 2010	(r15090)
+++ dists/lenny/linux-2.6/debian/patches/series/22	Mon Feb  1 17:18:40 2010	(r15091)
@@ -12,5 +12,4 @@
 + bugfix/all/bnx2-Fix-panic-in-bnx2_poll_work.patch
 + bugfix/all/fix-braindamage-in-audit_tree.c-untag_chunk.patch
 + bugfix/all/fix-more-leaks-in-audit_tree.c-tag_chunk.patch
-+ bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch
 + bugfix/all/ALSA-cs4232-fix-crash-during-chip-PNP-detection.patch