diff --git a/debian/changelog b/debian/changelog index a2a168da1..54fe7c55f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,8 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low * postinst: Enable escape sequences in debconf notes (Closes: #566539) * Add 3w-sas driver for LSI 3ware 9750 SAS controllers * aufs2: Update to snapshot from 2010-01-25 (Closes: #567391) + * cdc_ether: Do not set link down initially; not all devices send link + change interrupts [ Ian Campbell ] * xen: Enable up to 32G of guest memory on i386. diff --git a/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch b/debian/patches/bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch new file mode 100644 index 000000000..9549d90a8 --- /dev/null +++ b/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 +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 + that the link state +for their devices remains down. Therefore, revert the change in +cdc_ether. + +Signed-off-by: Ben Hutchings +Tested-by: Avi Rozen +--- + 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 + diff --git a/debian/patches/series/6 b/debian/patches/series/6 index e46b5a7d3..0a100c4e1 100644 --- a/debian/patches/series/6 +++ b/debian/patches/series/6 @@ -34,3 +34,4 @@ + bugfix/all/clockevents-Add-missing-include.patch + features/all/SCSI-3w-sas-Add-new-driver-for-LSI-3ware-9750.patch + features/all/aufs2/aufs2-20100125.patch ++ bugfix/all/cdc_ether-Partially-revert-usbnet-Set-link-down-init.patch