diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-04-15 14:55:36 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-04-16 13:23:52 +0200 |
commit | 0232f57e1af6580542c0ed1ce1d76c7cd4084613 (patch) | |
tree | e7e624d4c97826e318676c53e114e1a2405c6a2e /target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch | |
parent | 286c407c3d8877e51fa90cbd830f2fedb3ad1f26 (diff) | |
download | upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.tar.gz upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.tar.bz2 upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.zip |
kernel: bump 4.14 to 4.14.176
Refreshed all patches.
Remove upstreamed:
- 0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
- 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch
- 003-ARM-dts-oxnas-Fix-clear-mask-property.patch
Fixes:
- CVE-2020-8647
- CVE-2020-8648 (potentially)
- CVE-2020-8649
Compile-tested on: cns3xxx, octeontx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch b/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch index 0435803f51..a9f744fd13 100644 --- a/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch +++ b/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch @@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c -@@ -51,6 +51,7 @@ +@@ -52,6 +52,7 @@ #include <linux/workqueue.h> #include <net/genetlink.h> #include <net/netlink.h> @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include <uapi/linux/batman_adv.h> #include "bat_algo.h" -@@ -62,7 +63,6 @@ +@@ -63,7 +64,6 @@ #include "netlink.h" #include "network-coding.h" #include "originator.h" @@ -45,7 +45,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include "translation-table.h" --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c -@@ -37,6 +37,7 @@ +@@ -36,6 +36,7 @@ #include <linux/workqueue.h> #include <net/genetlink.h> #include <net/netlink.h> @@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include <uapi/linux/batman_adv.h> #include "bat_algo.h" -@@ -49,7 +50,6 @@ +@@ -48,7 +49,6 @@ #include "log.h" #include "netlink.h" #include "originator.h" @@ -80,7 +80,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c -@@ -38,13 +38,13 @@ +@@ -40,13 +40,13 @@ #include <linux/string.h> #include <linux/types.h> #include <linux/workqueue.h> @@ -174,7 +174,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /** --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include <linux/spinlock.h> #include <net/net_namespace.h> #include <net/rtnetlink.h> @@ -182,7 +182,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include "bat_v.h" #include "bridge_loop_avoidance.h" -@@ -44,7 +45,6 @@ +@@ -45,7 +46,6 @@ #include "gateway_client.h" #include "log.h" #include "originator.h" @@ -1025,7 +1025,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h -@@ -34,10 +34,9 @@ +@@ -35,10 +35,9 @@ #include <linux/types.h> #include <linux/wait.h> #include <linux/workqueue.h> |