rpms/kernel/F-10 linux-2.6-usb-option-add-pantech-cards-R.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.13, 1.1206.2.14

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29907

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-usb-option-add-pantech-cards-R.patch 
Log Message:
Revert -stable patch that broke wireless broadband for some users. (#481401)

linux-2.6-usb-option-add-pantech-cards-R.patch:

--- NEW FILE linux-2.6-usb-option-add-pantech-cards-R.patch ---
>From 8b6346ec899713a90890c9e832f7eff91ea73504 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Fri, 10 Oct 2008 06:41:16 -0400
Subject: USB: option: add Pantech cards

From: Dan Williams <dcbw at redhat.com>

commit 8b6346ec899713a90890c9e832f7eff91ea73504 upstream

Add some Pantech mobile broadband IDs.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/usb/serial/option.c |    9 +++++++++
 1 file changed, 9 insertions(+)

Revert this in Fedora, the patch is wrong:
http://marc.info/?l=linux-kernel&m=123369394213372&w=2

--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -213,6 +213,12 @@ static int  option_send_setup(struct tty
 #define ERICSSON_VENDOR_ID			0x0bdb
 #define ERICSSON_PRODUCT_F3507G			0x1900
 
+/* Pantech products */
+#define PANTECH_VENDOR_ID			0x106c
+#define PANTECH_PRODUCT_PC5740			0x3701
+#define PANTECH_PRODUCT_PC5750			0x3702  /* PX-500 */
+#define PANTECH_PRODUCT_UM150			0x3711
+
 static struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -333,6 +339,9 @@ static struct usb_device_id option_ids[]
 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
 	{ USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) },
+	{ USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5740) },
+	{ USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5750) },
+	{ USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_UM150) },
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.13
retrieving revision 1.1206.2.14
diff -u -r1.1206.2.13 -r1.1206.2.14
--- kernel.spec	3 Feb 2009 21:28:25 -0000	1.1206.2.13
+++ kernel.spec	3 Feb 2009 21:39:32 -0000	1.1206.2.14
@@ -711,6 +711,7 @@
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 Patch2301: linux-2.6-usb-option-increase-outgoing-buffers.patch
+Patch2302: linux-2.6-usb-option-add-pantech-cards-R.patch
 
 # Add fips_enable flag
 Patch2400: linux-2.6-crypto-fips_enable.patch
@@ -1166,6 +1167,8 @@
 # USB
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-option-increase-outgoing-buffers.patch
+# revert stable patch that broke wireless broadband
+ApplyPatch linux-2.6-usb-option-add-pantech-cards-R.patch -R
 
 # Add the ability to turn FIPS-compliant mode on or off at boot
 ApplyPatch linux-2.6-crypto-fips_enable.patch
@@ -1926,6 +1929,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Feb 03 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.14-170.2.14
+- Revert -stable patch that broke wireless broadband for some users. (#481401)
+
 * Tue Feb 03 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.14-170.2.13
 - Fix media keys on MS wireless keyboard (#475398)