kernel: bump 4.14 to 4.14.44
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
@@ -63,7 +63,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||
/**
|
||||
* dwc2_enable_host_interrupts() - Enables the Host mode interrupts
|
||||
*
|
||||
@@ -3246,6 +3263,7 @@ static void dwc2_conn_id_status_change(s
|
||||
@@ -3276,6 +3293,7 @@ static void dwc2_conn_id_status_change(s
|
||||
|
||||
/* B-Device connector (Device Mode) */
|
||||
if (gotgctl & GOTGCTL_CONID_B) {
|
||||
@@ -71,7 +71,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||
/* Wait for switch to device mode */
|
||||
dev_dbg(hsotg->dev, "connId B\n");
|
||||
if (hsotg->bus_suspended) {
|
||||
@@ -4352,6 +4370,9 @@ static int _dwc2_hcd_start(struct usb_hc
|
||||
@@ -4382,6 +4400,9 @@ static int _dwc2_hcd_start(struct usb_hc
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&hsotg->lock, flags);
|
||||
@@ -81,7 +81,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -4379,6 +4400,8 @@ static void _dwc2_hcd_stop(struct usb_hc
|
||||
@@ -4409,6 +4430,8 @@ static void _dwc2_hcd_stop(struct usb_hc
|
||||
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
||||
spin_unlock_irqrestore(&hsotg->lock, flags);
|
||||
|
||||
@@ -90,7 +90,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||
usleep_range(1000, 3000);
|
||||
}
|
||||
|
||||
@@ -4415,6 +4438,7 @@ static int _dwc2_hcd_suspend(struct usb_
|
||||
@@ -4445,6 +4468,7 @@ static int _dwc2_hcd_suspend(struct usb_
|
||||
hprt0 |= HPRT0_SUSP;
|
||||
hprt0 &= ~HPRT0_PWR;
|
||||
dwc2_writel(hprt0, hsotg->regs + HPRT0);
|
||||
@@ -98,7 +98,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||
}
|
||||
|
||||
/* Enter hibernation */
|
||||
@@ -4495,6 +4519,8 @@ static int _dwc2_hcd_resume(struct usb_h
|
||||
@@ -4525,6 +4549,8 @@ static int _dwc2_hcd_resume(struct usb_h
|
||||
spin_unlock_irqrestore(&hsotg->lock, flags);
|
||||
dwc2_port_resume(hsotg);
|
||||
} else {
|
||||
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||
|
||||
return regulator_enable(hsotg->vbus_supply);
|
||||
}
|
||||
@@ -4371,9 +4376,7 @@ static int _dwc2_hcd_start(struct usb_hc
|
||||
@@ -4401,9 +4406,7 @@ static int _dwc2_hcd_start(struct usb_hc
|
||||
|
||||
spin_unlock_irqrestore(&hsotg->lock, flags);
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
static void __sk_free(struct sock *sk)
|
||||
{
|
||||
+#ifdef CONFIG_SOCK_DIAG
|
||||
if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt))
|
||||
if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk)))
|
||||
sock_diag_broadcast_destroy(sk);
|
||||
else
|
||||
+#endif
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
From d4c4bc11353f3bea6754f7d21e3612c9f32d1d64 Mon Sep 17 00:00:00 2001
|
||||
From: Giuseppe Lippolis <giu.lippolis@gmail.com>
|
||||
Date: Mon, 26 Mar 2018 16:34:39 +0200
|
||||
Subject: [PATCH] net-usb: add qmi_wwan if on lte modem wistron neweb d18q1
|
||||
|
||||
This modem is embedded on dlink dwr-921 router.
|
||||
The oem configuration states:
|
||||
|
||||
T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0
|
||||
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
|
||||
P: Vendor=1435 ProdID=0918 Rev= 2.32
|
||||
S: Manufacturer=Android
|
||||
S: Product=Android
|
||||
S: SerialNumber=0123456789ABCDEF
|
||||
C:* #Ifs= 7 Cfg#= 1 Atr=80 MxPwr=500mA
|
||||
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
|
||||
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
|
||||
E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
|
||||
E: Ad=84(I) Atr=03(Int.) MxPS= 64 Ivl=32ms
|
||||
E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
|
||||
E: Ad=86(I) Atr=03(Int.) MxPS= 64 Ivl=32ms
|
||||
E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
|
||||
E: Ad=88(I) Atr=03(Int.) MxPS= 64 Ivl=32ms
|
||||
E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
|
||||
E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=32ms
|
||||
E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 6 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=(none)
|
||||
E: Ad=8b(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=125us
|
||||
|
||||
Tested on openwrt distribution
|
||||
|
||||
Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/usb/qmi_wwan.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/drivers/net/usb/qmi_wwan.c
|
||||
+++ b/drivers/net/usb/qmi_wwan.c
|
||||
@@ -1105,6 +1105,9 @@ static const struct usb_device_id produc
|
||||
{QMI_FIXED_INTF(0x0846, 0x68a2, 8)},
|
||||
{QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */
|
||||
{QMI_FIXED_INTF(0x12d1, 0x14ac, 1)}, /* Huawei E1820 */
|
||||
+ {QMI_FIXED_INTF(0x1435, 0xd181, 3)}, /* Wistron NeWeb D18Q1 */
|
||||
+ {QMI_FIXED_INTF(0x1435, 0xd181, 4)}, /* Wistron NeWeb D18Q1 */
|
||||
+ {QMI_FIXED_INTF(0x1435, 0xd181, 5)}, /* Wistron NeWeb D18Q1 */
|
||||
{QMI_FIXED_INTF(0x16d8, 0x6003, 0)}, /* CMOTech 6003 */
|
||||
{QMI_FIXED_INTF(0x16d8, 0x6007, 0)}, /* CMOTech CHE-628S */
|
||||
{QMI_FIXED_INTF(0x16d8, 0x6008, 0)}, /* CMOTech CMU-301 */
|
||||
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -3260,6 +3262,7 @@ static int packet_create(struct net *net
|
||||
@@ -3262,6 +3264,7 @@ static int packet_create(struct net *net
|
||||
mutex_init(&po->pg_vec_lock);
|
||||
po->rollover = NULL;
|
||||
po->prot_hook.func = packet_rcv;
|
||||
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
if (sock->type == SOCK_PACKET)
|
||||
po->prot_hook.func = packet_rcv_spkt;
|
||||
@@ -3873,6 +3876,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
@@ -3875,6 +3878,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
||||
return 0;
|
||||
}
|
||||
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
default:
|
||||
return -ENOPROTOOPT;
|
||||
}
|
||||
@@ -3925,6 +3938,13 @@ static int packet_getsockopt(struct sock
|
||||
@@ -3927,6 +3940,13 @@ static int packet_getsockopt(struct sock
|
||||
case PACKET_VNET_HDR:
|
||||
val = po->has_vnet_hdr;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user