From: Greg Kroah-Hartman Date: Fri, 11 Oct 2013 00:02:05 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.100~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba1e429f5b5c0a9d24643008350bca1effe5b3a4;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch rtlwifi-align-private-space-in-rtl_priv-struct.patch --- diff --git a/queue-3.0/p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch b/queue-3.0/p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch new file mode 100644 index 00000000000..feab8f6a326 --- /dev/null +++ b/queue-3.0/p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch @@ -0,0 +1,30 @@ +From 1e43692cdb7cc445d6347d8a5207d9cef0c71434 Mon Sep 17 00:00:00 2001 +From: Christian Lamparter +Date: Tue, 24 Sep 2013 21:56:46 +0200 +Subject: p54usb: add USB ID for Corega WLUSB2GTST USB adapter + +From: Christian Lamparter + +commit 1e43692cdb7cc445d6347d8a5207d9cef0c71434 upstream. + +Added USB ID for Corega WLUSB2GTST USB adapter. + +Reported-by: Joerg Kalisch +Signed-off-by: Christian Lamparter +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/p54/p54usb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -82,6 +82,7 @@ static struct usb_device_id p54u_table[] + {USB_DEVICE(0x06a9, 0x000e)}, /* Westell 802.11g USB (A90-211WG-01) */ + {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ + {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ ++ {USB_DEVICE(0x07aa, 0x0020)}, /* Corega WLUSB2GTST USB */ + {USB_DEVICE(0x0803, 0x4310)}, /* Zoom 4410a */ + {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ + {USB_DEVICE(0x083a, 0x4531)}, /* T-Com Sinus 154 data II */ diff --git a/queue-3.0/rtlwifi-align-private-space-in-rtl_priv-struct.patch b/queue-3.0/rtlwifi-align-private-space-in-rtl_priv-struct.patch new file mode 100644 index 00000000000..3da26589be0 --- /dev/null +++ b/queue-3.0/rtlwifi-align-private-space-in-rtl_priv-struct.patch @@ -0,0 +1,35 @@ +From 60ce314d1750fef843e9db70050e09e49f838b69 Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Wed, 18 Sep 2013 21:21:35 -0500 +Subject: rtlwifi: Align private space in rtl_priv struct + +From: Larry Finger + +commit 60ce314d1750fef843e9db70050e09e49f838b69 upstream. + +The private array at the end of the rtl_priv struct is not aligned. +On ARM architecture, this causes an alignment trap and is fixed by aligning +that array with __align(sizeof(void *)). That should properly align that +space according to the requirements of all architectures. + +Reported-by: Jason Andrews +Tested-by: Jason Andrews +Signed-off-by: Larry Finger +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rtlwifi/wifi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/rtlwifi/wifi.h ++++ b/drivers/net/wireless/rtlwifi/wifi.h +@@ -1587,7 +1587,7 @@ struct rtl_priv { + that it points to the data allocated + beyond this structure like: + rtl_pci_priv or rtl_usb_priv */ +- u8 priv[0]; ++ u8 priv[0] __aligned(sizeof(void *)); + }; + + #define rtl_priv(hw) (((struct rtl_priv *)(hw)->priv)) diff --git a/queue-3.0/series b/queue-3.0/series index fbf85964bde..49e752d0ed3 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -28,3 +28,5 @@ sparc64-fix-not-sra-ed-o5-in-32-bit-traced-syscall.patch sparc32-fix-exit-flag-passed-from-traced-sys_sigreturn.patch kernel-kmod.c-check-for-null-in-call_usermodehelper_exec.patch usb-serial-option-ignore-card-reader-interface-on-huawei-e1750.patch +rtlwifi-align-private-space-in-rtl_priv-struct.patch +p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch