diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-05-17 18:41:25 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-05-18 09:10:21 +0200 |
| commit | 12f44b83a8db2c95274839e2e41792e096021f29 (patch) | |
| tree | 53fa8c04230702c41cb2a6bcd976e47fb828c8c5 /target/linux/layerscape | |
| parent | 6390f27c2ed6189f6aac2308a2ea40fde2f798d7 (diff) | |
| download | upstream-12f44b83a8db2c95274839e2e41792e096021f29.tar.gz upstream-12f44b83a8db2c95274839e2e41792e096021f29.tar.bz2 upstream-12f44b83a8db2c95274839e2e41792e096021f29.zip | |
kernel: bump 4.9 to 4.9.100
Refreshed all patches
Added new ARM64 symbol: ARM64_ERRATUM_1024718
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
| -rw-r--r-- | target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch | 4 | ||||
| -rw-r--r-- | target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch index a284d8bbd4..026fce7dc9 100644 --- a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch @@ -477,7 +477,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> /* Make sure a field is enclosed inside headers_start/headers_end section */ #define CHECK_SKB_FIELD(field) \ BUILD_BUG_ON(offsetof(struct sk_buff, field) < \ -@@ -1073,7 +1099,7 @@ static void skb_headers_offset_update(st +@@ -1074,7 +1100,7 @@ static void skb_headers_offset_update(st skb->inner_mac_header += off; } @@ -486,7 +486,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> { __copy_skb_header(new, old); -@@ -1081,6 +1107,7 @@ static void copy_skb_header(struct sk_bu +@@ -1082,6 +1108,7 @@ static void copy_skb_header(struct sk_bu skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs; skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type; } diff --git a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch index c01db458a5..f8917291ee 100644 --- a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch @@ -44,15 +44,15 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c -@@ -532,6 +532,7 @@ static const struct driver_info wwan_inf - #define LENOVO_VENDOR_ID 0x17ef +@@ -533,6 +533,7 @@ static const struct driver_info wwan_inf + #define LINKSYS_VENDOR_ID 0x13b1 #define NVIDIA_VENDOR_ID 0x0955 #define HP_VENDOR_ID 0x03f0 +#define TPLINK_VENDOR_ID 0x2357 static const struct usb_device_id products[] = { /* BLACKLIST !! -@@ -732,6 +733,13 @@ static const struct usb_device_id produc +@@ -742,6 +743,13 @@ static const struct usb_device_id produc USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info = 0, }, @@ -68,15 +68,15 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> * --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -520,6 +520,7 @@ enum rtl8152_flags { - #define VENDOR_ID_SAMSUNG 0x04e8 +@@ -521,6 +521,7 @@ enum rtl8152_flags { #define VENDOR_ID_LENOVO 0x17ef + #define VENDOR_ID_LINKSYS 0x13b1 #define VENDOR_ID_NVIDIA 0x0955 +#define VENDOR_ID_TPLINK 0x2357 #define MCU_TYPE_PLA 0x0100 #define MCU_TYPE_USB 0x0000 -@@ -1816,6 +1817,10 @@ static int rx_bottom(struct r8152 *tp, i +@@ -1817,6 +1818,10 @@ static int rx_bottom(struct r8152 *tp, i unsigned int pkt_len; struct sk_buff *skb; @@ -87,9 +87,9 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; if (pkt_len < ETH_ZLEN) break; -@@ -4507,6 +4512,7 @@ static struct usb_device_id rtl8152_tabl - {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)}, +@@ -4509,6 +4514,7 @@ static struct usb_device_id rtl8152_tabl {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, + {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, + {REALTEK_USB_DEVICE(VENDOR_ID_TPLINK, 0x0601)}, {} @@ -156,7 +156,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> int ret; --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4415,6 +4415,14 @@ hub_port_init(struct usb_hub *hub, struc +@@ -4423,6 +4423,14 @@ hub_port_init(struct usb_hub *hub, struc else speed = usb_speed_string(udev->speed); |