hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-12 15:42:11 -05:00
Code Issues Projects Releases Wiki Activity

kernel: refresh patches

Browse Source 
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte 2018-02-15 15:15:57 +01:00 committed by John Crispin
parent 3b227103e6
commit 31ae7381b8
7 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/generic/patches-4.4/099-0001-usbnet-allow-mini-drivers-to-consume-L2-headers.patch
View File

@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/usbnet.c | 5 ++++- drivers/net/usb/usbnet.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 0744bf2ef2d6..0b0ba7ef14e4 100644
--- a/drivers/net/usb/usbnet.c --- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c
@@ -324,7 +324,10 @@ void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb) @@ -324,7 +324,10 @@ void usbnet_skb_return (struct usbnet *d
return; return;
} }
@ -34,6 +32,3 @@ index 0744bf2ef2d6..0b0ba7ef14e4 100644
dev->net->stats.rx_packets++; dev->net->stats.rx_packets++;
dev->net->stats.rx_bytes += skb->len; dev->net->stats.rx_bytes += skb->len;
--
2.7.4

11
target/linux/generic/patches-4.4/099-0002-net-qmi_wwan-support-raw-IP-mode.patch
View File

@ -51,8 +51,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/qmi_wwan.c | 98 +++++++++++++++++++++++++++++++++++++++++++++- drivers/net/usb/qmi_wwan.c | 98 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 97 insertions(+), 1 deletion(-) 1 file changed, 97 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index e3727b66d850..98add3bf8821 100644
--- a/drivers/net/usb/qmi_wwan.c --- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
@ -158,7 +156,7 @@ index e3727b66d850..98add3bf8821 100644
/* default ethernet address used by the modem */ /* default ethernet address used by the modem */
static const u8 default_modem_addr[ETH_ALEN] = {0x02, 0x50, 0xf3}; static const u8 default_modem_addr[ETH_ALEN] = {0x02, 0x50, 0xf3};
@@ -80,6 +163,8 @@ static const u8 buggy_fw_addr[ETH_ALEN] = {0x00, 0xa0, 0xc6, 0x00, 0x00, 0x00}; @@ -80,6 +163,8 @@ static const u8 buggy_fw_addr[ETH_ALEN]
*/ */
static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb) static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{ {
@ -167,7 +165,7 @@ index e3727b66d850..98add3bf8821 100644
__be16 proto; __be16 proto;
/* This check is no longer done by usbnet */ /* This check is no longer done by usbnet */
@@ -94,15 +179,25 @@ static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb) @@ -94,15 +179,25 @@ static int qmi_wwan_rx_fixup(struct usbn
proto = htons(ETH_P_IPV6); proto = htons(ETH_P_IPV6);
break; break;
case 0x00: case 0x00:
@ -193,7 +191,7 @@ index e3727b66d850..98add3bf8821 100644
if (skb_headroom(skb) < ETH_HLEN) if (skb_headroom(skb) < ETH_HLEN)
return 0; return 0;
skb_push(skb, ETH_HLEN); skb_push(skb, ETH_HLEN);
@@ -326,6 +421,7 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) @@ -294,6 +389,7 @@ static int qmi_wwan_bind(struct usbnet *
dev->net->dev_addr[0] &= 0xbf; /* clear "IP" bit */ dev->net->dev_addr[0] &= 0xbf; /* clear "IP" bit */
} }
dev->net->netdev_ops = &qmi_wwan_netdev_ops; dev->net->netdev_ops = &qmi_wwan_netdev_ops;
@ -201,6 +199,3 @@ index e3727b66d850..98add3bf8821 100644
err: err:
return status; return status;
} }
--
2.7.4

11
target/linux/generic/patches-4.4/099-0003-net-qmi_wwan-should-hold-RTNL-while-changing-netdev-.patch
View File

@ -41,8 +41,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/qmi_wwan.c | 22 +++++++++++++++------- drivers/net/usb/qmi_wwan.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-) 1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 98add3bf8821..babc84a3946c 100644
--- a/drivers/net/usb/qmi_wwan.c --- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@ -53,7 +51,7 @@ index 98add3bf8821..babc84a3946c 100644
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/cdc.h> #include <linux/usb/cdc.h>
#include <linux/usb/usbnet.h> #include <linux/usb/usbnet.h>
@@ -92,7 +93,7 @@ static ssize_t raw_ip_store(struct device *d, struct device_attribute *attr, co @@ -92,7 +93,7 @@ static ssize_t raw_ip_store(struct devic
struct usbnet *dev = netdev_priv(to_net_dev(d)); struct usbnet *dev = netdev_priv(to_net_dev(d));
struct qmi_wwan_state *info = (void *)&dev->data; struct qmi_wwan_state *info = (void *)&dev->data;
bool enable; bool enable;
@ -62,7 +60,7 @@ index 98add3bf8821..babc84a3946c 100644
if (strtobool(buf, &enable)) if (strtobool(buf, &enable))
return -EINVAL; return -EINVAL;
@@ -101,18 +102,22 @@ static ssize_t raw_ip_store(struct device *d, struct device_attribute *attr, co @@ -101,18 +102,22 @@ static ssize_t raw_ip_store(struct devic
if (enable == (info->flags & QMI_WWAN_FLAG_RAWIP)) if (enable == (info->flags & QMI_WWAN_FLAG_RAWIP))
return len; return len;
@ -90,7 +88,7 @@ index 98add3bf8821..babc84a3946c 100644
} }
if (enable) if (enable)
@@ -121,7 +126,10 @@ static ssize_t raw_ip_store(struct device *d, struct device_attribute *attr, co @@ -121,7 +126,10 @@ static ssize_t raw_ip_store(struct devic
info->flags &= ~QMI_WWAN_FLAG_RAWIP; info->flags &= ~QMI_WWAN_FLAG_RAWIP;
qmi_wwan_netdev_setup(dev->net); qmi_wwan_netdev_setup(dev->net);
call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev->net); call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev->net);
@ -102,6 +100,3 @@ index 98add3bf8821..babc84a3946c 100644
} }
static DEVICE_ATTR_RW(raw_ip); static DEVICE_ATTR_RW(raw_ip);
--
2.7.4

15
target/linux/generic/patches-4.4/099-0004-usbnet-fix-alignment-for-frames-with-no-ethernet-hea.patch
View File

@ -24,11 +24,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/usb/usbnet.h | 1 + include/linux/usb/usbnet.h | 1 +
3 files changed, 7 insertions(+), 1 deletion(-) 3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index c750cf7c042b..304ec6555cd8 100644
--- a/drivers/net/usb/qmi_wwan.c --- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -261,9 +261,11 @@ static void qmi_wwan_netdev_setup(struct net_device *net) @@ -70,9 +70,11 @@ static void qmi_wwan_netdev_setup(struct
net->hard_header_len = 0; net->hard_header_len = 0;
net->addr_len = 0; net->addr_len = 0;
net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
@ -40,11 +38,9 @@ index c750cf7c042b..304ec6555cd8 100644
netdev_dbg(net, "mode: Ethernet\n"); netdev_dbg(net, "mode: Ethernet\n");
} }
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 80348b6a8646..d56fe32bf48d 100644
--- a/drivers/net/usb/usbnet.c --- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c
@@ -484,7 +484,10 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags) @@ -482,7 +482,10 @@ static int rx_submit (struct usbnet *dev
return -ENOLINK; return -ENOLINK;
} }
@ -56,11 +52,9 @@ index 80348b6a8646..d56fe32bf48d 100644
if (!skb) { if (!skb) {
netif_dbg(dev, rx_err, dev->net, "no rx skb\n"); netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
usbnet_defer_kevent (dev, EVENT_RX_MEMORY); usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index a69877734c4e..e2ec3582e549 100644
--- a/include/linux/usb/usbnet.h --- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h
@@ -82,6 +82,7 @@ struct usbnet { @@ -79,6 +79,7 @@ struct usbnet {
# define EVENT_RX_KILL 10 # define EVENT_RX_KILL 10
# define EVENT_LINK_CHANGE 11 # define EVENT_LINK_CHANGE 11
# define EVENT_SET_RX_MODE 12 # define EVENT_SET_RX_MODE 12
@ -68,6 +62,3 @@ index a69877734c4e..e2ec3582e549 100644
}; };
static inline struct usb_driver *driver_of(struct usb_interface *intf) static inline struct usb_driver *driver_of(struct usb_interface *intf)
--
2.7.4

7
target/linux/generic/patches-4.4/099-0005-qmi_wwan-Add-missing-skb_reset_mac_header-call.patch
View File

@ -64,11 +64,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/qmi_wwan.c | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index a4f229edcceb..8d4a6f7cba61 100644
--- a/drivers/net/usb/qmi_wwan.c --- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -499,6 +499,7 @@ static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb) @@ -203,6 +203,7 @@ static int qmi_wwan_rx_fixup(struct usbn
return 1; return 1;
} }
if (rawip) { if (rawip) {
@ -76,6 +74,3 @@ index a4f229edcceb..8d4a6f7cba61 100644
skb->dev = dev->net; /* normally set by eth_type_trans */ skb->dev = dev->net; /* normally set by eth_type_trans */
skb->protocol = proto; skb->protocol = proto;
return 1; return 1;
--
2.7.4

11
target/linux/generic/patches-4.4/099-0006-net-qmi_wwan-MDM9x30-specific-power-management.patch
View File

@ -29,11 +29,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/qmi_wwan.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/net/usb/qmi_wwan.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+) 1 file changed, 38 insertions(+)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 9a5be8b85186..fc9dd452a3b5 100644
--- a/drivers/net/usb/qmi_wwan.c --- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -223,6 +223,20 @@ static int qmi_wwan_register_subdriver(struct usbnet *dev) @@ -329,6 +329,20 @@ err:
return rv; return rv;
} }
@ -54,7 +52,7 @@ index 9a5be8b85186..fc9dd452a3b5 100644
static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
{ {
int status = -1; int status = -1;
@@ -280,6 +294,24 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) @@ -386,6 +400,24 @@ static int qmi_wwan_bind(struct usbnet *
usb_driver_release_interface(driver, info->data); usb_driver_release_interface(driver, info->data);
} }
@ -79,7 +77,7 @@ index 9a5be8b85186..fc9dd452a3b5 100644
/* Never use the same address on both ends of the link, even if the /* Never use the same address on both ends of the link, even if the
* buggy firmware told us to. Or, if device is assigned the well-known * buggy firmware told us to. Or, if device is assigned the well-known
* buggy firmware MAC address, replace it with a random address, * buggy firmware MAC address, replace it with a random address,
@@ -307,6 +339,12 @@ static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *intf) @@ -414,6 +446,12 @@ static void qmi_wwan_unbind(struct usbne
if (info->subdriver && info->subdriver->disconnect) if (info->subdriver && info->subdriver->disconnect)
info->subdriver->disconnect(info->control); info->subdriver->disconnect(info->control);
@ -92,6 +90,3 @@ index 9a5be8b85186..fc9dd452a3b5 100644
/* allow user to unbind using either control or data */ /* allow user to unbind using either control or data */
if (intf == info->control) if (intf == info->control)
other = info->data; other = info->data;
--
2.7.4

13
target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
View File

@ -23,8 +23,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/qmi_wwan.c | 30 ++++++++++++++++++++++++++++-- drivers/net/usb/qmi_wwan.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-) 1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 9d1fce8a6e84..3ff76c6db4f6 100644
--- a/drivers/net/usb/qmi_wwan.c --- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -59,6 +59,10 @@ enum qmi_wwan_flags { @@ -59,6 +59,10 @@ enum qmi_wwan_flags {
@ -38,7 +36,7 @@ index 9d1fce8a6e84..3ff76c6db4f6 100644
static void qmi_wwan_netdev_setup(struct net_device *net) static void qmi_wwan_netdev_setup(struct net_device *net)
{ {
struct usbnet *dev = netdev_priv(net); struct usbnet *dev = netdev_priv(net);
@@ -411,9 +415,14 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) @@ -411,9 +415,14 @@ static int qmi_wwan_bind(struct usbnet *
* clearing out state the clients might need. * clearing out state the clients might need.
* *
* MDM9x30 is the first QMI chipset with USB3 support. Abuse * MDM9x30 is the first QMI chipset with USB3 support. Abuse
@ -55,7 +53,7 @@ index 9d1fce8a6e84..3ff76c6db4f6 100644
qmi_wwan_manage_power(dev, 1); qmi_wwan_manage_power(dev, 1);
qmi_wwan_change_dtr(dev, true); qmi_wwan_change_dtr(dev, true);
} }
@@ -526,6 +535,16 @@ static const struct driver_info qmi_wwan_info = { @@ -526,6 +535,16 @@ static const struct driver_info qmi_wwan
.rx_fixup = qmi_wwan_rx_fixup, .rx_fixup = qmi_wwan_rx_fixup,
}; };
@ -72,7 +70,7 @@ index 9d1fce8a6e84..3ff76c6db4f6 100644
#define HUAWEI_VENDOR_ID 0x12D1 #define HUAWEI_VENDOR_ID 0x12D1
/* map QMI/wwan function by a fixed interface number */ /* map QMI/wwan function by a fixed interface number */
@@ -533,6 +552,11 @@ static const struct driver_info qmi_wwan_info = { @@ -533,6 +552,11 @@ static const struct driver_info qmi_wwan
USB_DEVICE_INTERFACE_NUMBER(vend, prod, num), \ USB_DEVICE_INTERFACE_NUMBER(vend, prod, num), \
.driver_info = (unsigned long)&qmi_wwan_info .driver_info = (unsigned long)&qmi_wwan_info
@ -84,7 +82,7 @@ index 9d1fce8a6e84..3ff76c6db4f6 100644
/* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */ /* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
#define QMI_GOBI1K_DEVICE(vend, prod) \ #define QMI_GOBI1K_DEVICE(vend, prod) \
QMI_FIXED_INTF(vend, prod, 3) QMI_FIXED_INTF(vend, prod, 3)
@@ -895,6 +919,8 @@ static const struct usb_device_id products[] = { @@ -908,6 +932,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(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */ {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */
@ -93,6 +91,3 @@ index 9d1fce8a6e84..3ff76c6db4f6 100644
/* 4. Gobi 1000 devices */ /* 4. Gobi 1000 devices */
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
--
2.7.4