diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 15:40:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 15:40:38 -0700 |
| commit | cb59c123524566899373cced47c068c6afdf570b (patch) | |
| tree | f95854d01bab3cc3fb3df58e214611a3d4fc24da | |
| parent | 70c9a1a86d66ebabb299bf8542c60b0bc10f66df (diff) | |
| download | patches-cb59c123524566899373cced47c068c6afdf570b.tar.gz | |
staging patches
6 files changed, 230 insertions, 2 deletions
@@ -45,7 +45,11 @@ staging.current/staging-hv-fix-race-condition-on-vmbus-channel-initialization.pa staging.current/staging-hv-fix-hv_utils-module-to-properly-autoload.patch staging.current/staging-wlags49_h2-add-missing-linux-string.h-for-strlen.patch staging.current/staging-wlags49_h2-fix-build-error-when-config_sysfs-is-not-set.patch - +staging.current/staging-rtl8187se-fix-compile-warnings-in-2.6.35-rc2.patch +staging.current/staging-rtl8192su-remove-device-ids.patch +staging.current/staging-rtl8192su-add-device-ids.patch +staging.current/staging-comedi-fix-read-past-end-of-array-in-cb_pcidda_attach.patch +staging.current/staging-rt2870-add-device-id-for-zyxel-nwd-270n.patch ##################################################################### # Stuff to be merged after 2.6.35 is out @@ -173,4 +177,3 @@ usb/usb-gadget-section-mismatch-warning-fixed.patch # staging stuff is now in the staging-next tree on git.kernel.org - diff --git a/staging.current/staging-comedi-fix-read-past-end-of-array-in-cb_pcidda_attach.patch b/staging.current/staging-comedi-fix-read-past-end-of-array-in-cb_pcidda_attach.patch new file mode 100644 index 00000000000000..6a85df35b12e11 --- /dev/null +++ b/staging.current/staging-comedi-fix-read-past-end-of-array-in-cb_pcidda_attach.patch @@ -0,0 +1,40 @@ +From error27@gmail.com Tue Jun 22 15:34:56 2010 +From: Dan Carpenter <error27@gmail.com> +Date: Mon, 21 Jun 2010 08:49:25 +0200 +Subject: Staging: comedi: fix read past end of array in cb_pcidda_attach() +To: Greg Kroah-Hartman <gregkh@suse.de> +Cc: devel@driverdev.osuosl.org, Dirk Hohndel <hohndel@infradead.org>, Jiri Kosina <jkosina@suse.cz>, kernel-janitors@vger.kernel.org, Andrea Gelmini <andrea.gelmini@gelma.net> +Message-ID: <20100621064924.GC5940@bicker> +Content-Disposition: inline + + +There are only 6 elements in the cb_pcidda_boards[] array so the +original code read past the end. After this change nothing uses N_BOARDS +so I removed the definition. + +Signed-off-by: Dan Carpenter <error27@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/comedi/drivers/cb_pcidda.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/staging/comedi/drivers/cb_pcidda.c ++++ b/drivers/staging/comedi/drivers/cb_pcidda.c +@@ -52,7 +52,6 @@ Please report success/failure with other + #include "8255.h" + + #define PCI_VENDOR_ID_CB 0x1307 /* PCI vendor number of ComputerBoards */ +-#define N_BOARDS 10 /* Number of boards in cb_pcidda_boards */ + #define EEPROM_SIZE 128 /* number of entries in eeprom */ + #define MAX_AO_CHANNELS 8 /* maximum number of ao channels for supported boards */ + +@@ -307,7 +306,7 @@ static int cb_pcidda_attach(struct comed + continue; + } + } +- for (index = 0; index < N_BOARDS; index++) { ++ for (index = 0; index < ARRAY_SIZE(cb_pcidda_boards); index++) { + if (cb_pcidda_boards[index].device_id == + pcidev->device) { + goto found; diff --git a/staging.current/staging-rt2870-add-device-id-for-zyxel-nwd-270n.patch b/staging.current/staging-rt2870-add-device-id-for-zyxel-nwd-270n.patch new file mode 100644 index 00000000000000..78dd5a38aaf03b --- /dev/null +++ b/staging.current/staging-rt2870-add-device-id-for-zyxel-nwd-270n.patch @@ -0,0 +1,28 @@ +From ozan@pardus.org.tr Tue Jun 22 15:35:20 2010 +From: Ozan Çağlayan <ozan@pardus.org.tr> +Date: Mon, 21 Jun 2010 14:00:56 +0300 +Subject: Staging: rt2870: add device id for Zyxel NWD-270N +To: linux-kernel@vger.kernel.org +Cc: gregkh@suse.de +Message-ID: <1277118056-21367-1-git-send-email-ozan@pardus.org.tr> + + +Add device id for Zyxel NWD-270N USB dongle. + +Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/rt2860/usb_main_dev.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/rt2860/usb_main_dev.c ++++ b/drivers/staging/rt2860/usb_main_dev.c +@@ -77,6 +77,7 @@ struct usb_device_id rtusb_usb_id[] = { + {USB_DEVICE(0x083A, 0x7522)}, /* Arcadyan */ + {USB_DEVICE(0x0CDE, 0x0022)}, /* ZCOM */ + {USB_DEVICE(0x0586, 0x3416)}, /* Zyxel */ ++ {USB_DEVICE(0x0586, 0x341a)}, /* Zyxel NWD-270N */ + {USB_DEVICE(0x0CDE, 0x0025)}, /* Zyxel */ + {USB_DEVICE(0x1740, 0x9701)}, /* EnGenius */ + {USB_DEVICE(0x1740, 0x9702)}, /* EnGenius */ diff --git a/staging.current/staging-rtl8187se-fix-compile-warnings-in-2.6.35-rc2.patch b/staging.current/staging-rtl8187se-fix-compile-warnings-in-2.6.35-rc2.patch new file mode 100644 index 00000000000000..5310c89d3883c3 --- /dev/null +++ b/staging.current/staging-rtl8187se-fix-compile-warnings-in-2.6.35-rc2.patch @@ -0,0 +1,41 @@ +From Larry.Finger@lwfinger.net Mon Jun 7 10:00:31 2010 +From: Larry Finger <Larry.Finger@lwfinger.net> +Date: Mon, 07 Jun 2010 12:00:44 -0500 +Subject: Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2 +To: Greg Kroah-Hartman <gregkh@suse.de> +Cc: linux-kernel@vger.kernel.org +Message-ID: <4c0d25bc.kKU10fWqlRtt6mUb%Larry.Finger@lwfinger.net> + + +In commit bbfb5652, the spacing in the definitions of eqMacAddr and cpMacAddr +in drivers/staging/rtl8187se/r8180_core.c were changed to conform to kernel +standards. These definitions were duplicates of lines found in +drivers/staging/rtl8187se/ieee80211/dot11d.h. Once the change was made, the +following warnings were emitted: + + CC [M] drivers/staging/rtl8187se/r8180_core.o +drivers/staging/rtl8187se/r8180_core.c:69:0: warning: "eqMacAddr" redefined +drivers/staging/rtl8187se/ieee80211/dot11d.h:39:0: note: this is the location of the previous definition +drivers/staging/rtl8187se/r8180_core.c:70:0: warning: "cpMacAddr" redefined +drivers/staging/rtl8187se/ieee80211/dot11d.h:40:0: note: this is the location of the previous definition + +The fix is to keep only the difinition in the header file. + +Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/rtl8187se/r8180_core.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/staging/rtl8187se/r8180_core.c ++++ b/drivers/staging/rtl8187se/r8180_core.c +@@ -66,8 +66,6 @@ static int hwseqnum = 0; + static int hwwep = 0; + static int channels = 0x3fff; + +-#define eqMacAddr(a, b) (((a)[0] == (b)[0] && (a)[1] == (b)[1] && (a)[2] == (b)[2] && (a)[3] == (b)[3] && (a)[4] == (b)[4] && (a)[5] == (b)[5]) ? 1 : 0) +-#define cpMacAddr(des, src) ((des)[0] = (src)[0], (des)[1] = (src)[1], (des)[2] = (src)[2], (des)[3] = (src)[3], (des)[4] = (src)[4], (des)[5] = (src)[5]) + MODULE_LICENSE("GPL"); + MODULE_DEVICE_TABLE(pci, rtl8180_pci_id_tbl); + MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>"); diff --git a/staging.current/staging-rtl8192su-add-device-ids.patch b/staging.current/staging-rtl8192su-add-device-ids.patch new file mode 100644 index 00000000000000..4b35a2bdf2961a --- /dev/null +++ b/staging.current/staging-rtl8192su-add-device-ids.patch @@ -0,0 +1,62 @@ +From florian.c.schilhabel@googlemail.com Tue Jun 22 15:32:46 2010 +From: Florian Schilhabel <florian.c.schilhabel@googlemail.com> +Date: Tue, 8 Jun 2010 03:47:13 +0200 +Subject: Staging: rtl8192su: add device ids +To: greg@kroah.com +Message-ID: <20100608014713.GD13449@localhost.localdomain> +Content-Disposition: inline + + +This patch adds some device ids. +The list of supported devices was extracted from realteks driver package. +(0x050d, 0x815F) and (0x0df6, 0x004b) are not in the official list of +supported devices and may not work correctly. +In case of problems with these, they should probably be removed from the list. + +Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/rtl8192su/r8192U_core.c | 30 +++++++++++++++++++++++------- + 1 file changed, 23 insertions(+), 7 deletions(-) + +--- a/drivers/staging/rtl8192su/r8192U_core.c ++++ b/drivers/staging/rtl8192su/r8192U_core.c +@@ -112,14 +112,30 @@ u32 rt_global_debug_component = \ + #define CAM_CONTENT_COUNT 8 + + static const struct usb_device_id rtl8192_usb_id_tbl[] = { +- /* Realtek */ +- {USB_DEVICE(0x0bda, 0x8171)}, +- {USB_DEVICE(0x050d, 0x815F)}, /* Belkin F5D8053 v6 */ +- {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 */ +- /* Guillemot */ +- {USB_DEVICE(0x06f8, 0xe031)}, +- //92SU ++ {USB_DEVICE(0x0bda, 0x8171)}, /* Realtek */ + {USB_DEVICE(0x0bda, 0x8172)}, ++ {USB_DEVICE(0x0bda, 0x8173)}, ++ {USB_DEVICE(0x0bda, 0x8174)}, ++ {USB_DEVICE(0x0bda, 0x8712)}, ++ {USB_DEVICE(0x0bda, 0x8713)}, ++ {USB_DEVICE(0x07aa, 0x0047)}, ++ {USB_DEVICE(0x07d1, 0x3303)}, ++ {USB_DEVICE(0x07d1, 0x3302)}, ++ {USB_DEVICE(0x07d1, 0x3300)}, ++ {USB_DEVICE(0x1740, 0x9603)}, ++ {USB_DEVICE(0x1740, 0x9605)}, ++ {USB_DEVICE(0x050d, 0x815F)}, ++ {USB_DEVICE(0x06f8, 0xe031)}, ++ {USB_DEVICE(0x7392, 0x7611)}, ++ {USB_DEVICE(0x7392, 0x7612)}, ++ {USB_DEVICE(0x7392, 0x7622)}, ++ {USB_DEVICE(0x0DF6, 0x0045)}, ++ {USB_DEVICE(0x0E66, 0x0015)}, ++ {USB_DEVICE(0x0E66, 0x0016)}, ++ {USB_DEVICE(0x0b05, 0x1786)}, ++ /* these are not in the official list */ ++ {USB_DEVICE(0x050d, 0x815F)}, /* Belkin F5D8053 v6 */ ++ {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 */ + {} + }; + diff --git a/staging.current/staging-rtl8192su-remove-device-ids.patch b/staging.current/staging-rtl8192su-remove-device-ids.patch new file mode 100644 index 00000000000000..f975d0a16e6b25 --- /dev/null +++ b/staging.current/staging-rtl8192su-remove-device-ids.patch @@ -0,0 +1,54 @@ +From florian.c.schilhabel@googlemail.com Tue Jun 22 15:32:33 2010 +From: Florian Schilhabel <florian.c.schilhabel@googlemail.com> +Date: Tue, 8 Jun 2010 03:46:26 +0200 +Subject: Staging: rtl8192su: remove device ids +To: greg@kroah.com +Message-ID: <20100608014626.GC13449@localhost.localdomain> +Content-Disposition: inline + + +This patch removes some device-ids. +The list of unsupported devices was extracted from realteks driver package. +removed IDs are: +(0x0bda, 0x8192) +(0x0bda, 0x8709) +(0x07aa, 0x0043) +(0x050d, 0x805E) +(0x0df6, 0x0031) +(0x1740, 0x9201) +(0x2001, 0x3301) +(0x5a57, 0x0290) +These devices are _not_ rtl819su based. + +Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/rtl8192su/r8192U_core.c | 14 -------------- + 1 file changed, 14 deletions(-) + +--- a/drivers/staging/rtl8192su/r8192U_core.c ++++ b/drivers/staging/rtl8192su/r8192U_core.c +@@ -114,22 +114,8 @@ u32 rt_global_debug_component = \ + static const struct usb_device_id rtl8192_usb_id_tbl[] = { + /* Realtek */ + {USB_DEVICE(0x0bda, 0x8171)}, +- {USB_DEVICE(0x0bda, 0x8192)}, +- {USB_DEVICE(0x0bda, 0x8709)}, +- /* Corega */ +- {USB_DEVICE(0x07aa, 0x0043)}, +- /* Belkin */ +- {USB_DEVICE(0x050d, 0x805E)}, + {USB_DEVICE(0x050d, 0x815F)}, /* Belkin F5D8053 v6 */ +- /* Sitecom */ +- {USB_DEVICE(0x0df6, 0x0031)}, + {USB_DEVICE(0x0df6, 0x004b)}, /* WL-349 */ +- /* EnGenius */ +- {USB_DEVICE(0x1740, 0x9201)}, +- /* Dlink */ +- {USB_DEVICE(0x2001, 0x3301)}, +- /* Zinwell */ +- {USB_DEVICE(0x5a57, 0x0290)}, + /* Guillemot */ + {USB_DEVICE(0x06f8, 0xe031)}, + //92SU |