aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorEtienne Haarsma <bladeoner112@gmail.com>2018-05-21 10:36:58 +0200
committerJohn Crispin <john@phrozen.org>2018-05-22 06:56:44 +0200
commit161d95f4c5a7aa5c22ad9fa81378686cfaf8bdc2 (patch)
tree411dbb64c7ad627e59294017b8fb3baa7975a2bd /target/linux/generic
parent2c0cd47dab77dc5b8380cde89651642d0b406afe (diff)
downloadupstream-161d95f4c5a7aa5c22ad9fa81378686cfaf8bdc2.tar.gz
upstream-161d95f4c5a7aa5c22ad9fa81378686cfaf8bdc2.tar.bz2
upstream-161d95f4c5a7aa5c22ad9fa81378686cfaf8bdc2.zip
kernel: bump kernel 4.4 to 4.4.132 for 17.01
* Refreshed patches Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch2
-rw-r--r--target/linux/generic/patches-4.4/834-ledtrig-libata.patch8
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch b/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
index 62ff1cd582..3dad08008b 100644
--- a/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
+++ b/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
#define QMI_GOBI1K_DEVICE(vend, prod) \
QMI_FIXED_INTF(vend, prod, 3)
-@@ -908,6 +932,8 @@ static const struct usb_device_id produc
+@@ -909,6 +933,8 @@ static const struct usb_device_id produc
{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */
diff --git a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
index ca19ad6379..fd804cae9a 100644
--- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -4802,6 +4815,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4805,6 +4818,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
-@@ -5698,6 +5714,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5701,6 +5717,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
-@@ -5719,6 +5738,12 @@ static void ata_host_release(struct devi
+@@ -5722,6 +5741,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
-@@ -6165,7 +6190,23 @@ int ata_host_register(struct ata_host *h
+@@ -6168,7 +6193,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}