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

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

index aec1cf1a68678f2c528f30f2f44ec6a01f6feaf0..3658876a8f71493928b173b3641acc629f949f87 100644 (file)
@@ -24,3 +24,4 @@ tcp-don-t-fragment-sacked-skbs-in-tcp_mark_head_lost.patch
 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
+usb-asix-patch-for-sitecom-ln-031.patch
diff --git a/queue-3.2/usb-asix-patch-for-sitecom-ln-031.patch b/queue-3.2/usb-asix-patch-for-sitecom-ln-031.patch
new file mode 100644 (file)
index 0000000..efd775e
--- /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
+@@ -1595,6 +1595,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,