]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Mar 2012 00:00:29 +0000 (17:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Mar 2012 00:00:29 +0000 (17:00 -0700)
added patches:
usb-asix-patch-for-sitecom-ln-031.patch

queue-3.0/series
queue-3.0/usb-asix-patch-for-sitecom-ln-031.patch [new file with mode: 0644]

index 9368e627d7d5451b0229a87c6fd52ccdd958b613..c61b1e3cd4d1b6e50ab4cf03aa0beb1ca463fe8e 100644 (file)
@@ -20,3 +20,4 @@ bridge-check-return-value-of-ipv6_dev_get_saddr.patch
 tcp-fix-tcp_shift_skb_data-to-not-shift-sacked-data-below-snd_una.patch
 ipv6-fix-not-join-all-router-mcast-group-when-forwarding-set.patch
 atl1c-dont-use-highprio-tx-queue.patch
+usb-asix-patch-for-sitecom-ln-031.patch
diff --git a/queue-3.0/usb-asix-patch-for-sitecom-ln-031.patch b/queue-3.0/usb-asix-patch-for-sitecom-ln-031.patch
new file mode 100644 (file)
index 0000000..c8988ca
--- /dev/null
@@ -0,0 +1,34 @@
+From 4e50391968849860dff1aacde358b4eb14aa5127 Mon Sep 17 00:00:00 2001
+From: Joerg Neikes <j.neikes@midlandgate.de>
+Date: Thu, 8 Mar 2012 22:44:03 +0000
+Subject: usb: asix: Patch for Sitecom LN-031
+
+From: Joerg Neikes <j.neikes@midlandgate.de>
+
+commit 4e50391968849860dff1aacde358b4eb14aa5127 upstream.
+
+This patch adds support for the Sitecom LN-031 USB adapter with a AX88178 chip.
+
+Added USB id to find correct driver for AX88178 1000 Ethernet adapter.
+
+Signed-off-by: Joerg Neikes <j.neikes@midlandgate.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/asix.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/net/usb/asix.c
++++ b/drivers/net/usb/asix.c
+@@ -1485,6 +1485,10 @@ static const struct usb_device_id       produc
+       USB_DEVICE (0x6189, 0x182d),
+       .driver_info =  (unsigned long) &ax8817x_info,
+ }, {
++      // Sitecom LN-031 "USB 2.0 10/100/1000 Ethernet adapter"
++      USB_DEVICE (0x0df6, 0x0056),
++      .driver_info =  (unsigned long) &ax88178_info,
++}, {
+       // corega FEther USB2-TX
+       USB_DEVICE (0x07aa, 0x0017),
+       .driver_info =  (unsigned long) &ax8817x_info,