From 46fde10eafd46772f6e56bdda6d7de93b56864b6 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 6 Feb 2017 09:09:34 -0800 Subject: [PATCH] Update kernel to 4.9.8 and 4.4.47 Signed-off-by: Riyaz Faizullabhoy --- kernel/Dockerfile | 2 +- kernel/Dockerfile.4.4 | 2 +- kernel/Dockerfile.aufs | 2 +- ...-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch | 42 ------------------- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch diff --git a/kernel/Dockerfile b/kernel/Dockerfile index d78ffab46..73b2fd07a 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,6 +1,6 @@ FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c -ARG KERNEL_VERSION=4.9.7 +ARG KERNEL_VERSION=4.9.8 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz diff --git a/kernel/Dockerfile.4.4 b/kernel/Dockerfile.4.4 index e6eded5bb..6c2417c82 100644 --- a/kernel/Dockerfile.4.4 +++ b/kernel/Dockerfile.4.4 @@ -1,6 +1,6 @@ FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c -ARG KERNEL_VERSION=4.4.46 +ARG KERNEL_VERSION=4.4.47 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz diff --git a/kernel/Dockerfile.aufs b/kernel/Dockerfile.aufs index f6cdfe9e8..02dc99f8c 100644 --- a/kernel/Dockerfile.aufs +++ b/kernel/Dockerfile.aufs @@ -1,6 +1,6 @@ FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c -ARG KERNEL_VERSION=4.9.7 +ARG KERNEL_VERSION=4.9.8 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz diff --git a/kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch b/kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch deleted file mode 100644 index 6b80dcb9f..000000000 --- a/kernel/patches-4.9/0005-virtio-don-t-set-VIRTIO_NET_HDR_F_DATA_VALID-on-xmit.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ff8f8f00ebc17ee2cabc316ad610188db1e8fe5d Mon Sep 17 00:00:00 2001 -From: Rolf Neugebauer -Date: Tue, 17 Jan 2017 18:13:51 +0000 -Subject: [PATCH 05/12] virtio: don't set VIRTIO_NET_HDR_F_DATA_VALID on xmit - -This patch part reverts fd2a0437dc33 and e858fae2b0b8 which introduced a -subtle change in how the virtio_net flags are derived from the SKBs -ip_summed field. - -With the above commits, the flags are set to VIRTIO_NET_HDR_F_DATA_VALID -when ip_summed == CHECKSUM_UNNECESSARY, thus treating it differently to -ip_summed == CHECKSUM_NONE, which should be the same. - -Further, the virtio spec 1.0 / CS04 explicitly says that -VIRTIO_NET_HDR_F_DATA_VALID must not be set by the driver. - -Fixes: fd2a0437dc33 ("virtio_net: introduce virtio_net_hdr_{from,to}_skb") -Fixes: e858fae2b0b8 (" virtio_net: use common code for virtio_net_hdr and skb GSO conversion") -Signed-off-by: Rolf Neugebauer -Acked-by: Michael S. Tsirkin -Signed-off-by: David S. Miller -(cherry picked from commit 501db511397fd6efff3aa5b4e8de415b55559550) ---- - include/linux/virtio_net.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h -index 1c912f85e041..40914bb396e7 100644 ---- a/include/linux/virtio_net.h -+++ b/include/linux/virtio_net.h -@@ -91,8 +91,6 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb, - skb_checksum_start_offset(skb)); - hdr->csum_offset = __cpu_to_virtio16(little_endian, - skb->csum_offset); -- } else if (skb->ip_summed == CHECKSUM_UNNECESSARY) { -- hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID; - } /* else everything is zero */ - - return 0; --- -2.11.0 -