From patchwork Thu Jan 18 14:13:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 862929 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jT9MEIJN"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="TbPMe5ft"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zMmDL2m6rz9s7F for ; Fri, 19 Jan 2018 01:14:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=tVzhMVRUgcWt/orRmtUCZK0HKsvf8V7JKDGjwYUUtF0=; b=jT9MEIJN192RRS /BouCeTEKl2x3x5gNY0aSDK5rTdeMDhrzA24Ugj+IcAdAetnkEnUYic0ogN9Vk+i/B/9AKx6y68/A +dxHcj4x2BEYsOAgx3CapzpQQ63WO29vQe1KM8xE/3tIkoz5nja1KCHGoRW8bEw4Enm20H8AmnMtV P2lPURdZhBsfL99xN0QoMEQlIxXxB/iltLlRQ/qnQpTV0lX0SMxt6Et96j+AkQawpRDIywomaL6w4 UxsJQF4v6kdjfWpyCjOkv6S833A3W+LHRPdRdkevKUBdmXO563k+jwGP9Y9lKvG1j74fbPO1sopIX FqkV80Sg55yNq81DdYlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ecAxU-00040q-87; Thu, 18 Jan 2018 14:14:24 +0000 Received: from mail-db5eur01on060b.outbound.protection.outlook.com ([2a01:111:f400:fe02::60b] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ecAxK-0003zI-TD for lede-dev@lists.infradead.org; Thu, 18 Jan 2018 14:14:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kX+tmSN03dWlVtHHI50+XRLU+cWNNayKGUNPcIpXGf8=; b=TbPMe5ftiBQO38qHyJdqvuezk/FZs+MulMOSHoB2yJ9M6GrgQKgbiKSlVTstSqdt5z72IM9mQOQOZKN2JQm8yS5lrjGNH4E4zl45nnakmK3utOtGpC7REWe3YJ6N4d48ltq9/7R5vwsqnq8EUo8g9QvdatfBij9jKQdLD3GVTiQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Rowlf.darbyshire-bryant.me.uk (5.65.125.86) by AM6PR0702MB3734.eurprd07.prod.outlook.com (2603:10a6:209:12::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.9; Thu, 18 Jan 2018 14:13:57 +0000 From: Kevin Darbyshire-Bryant To: lede-dev@lists.infradead.org Date: Thu, 18 Jan 2018 14:13:53 +0000 Message-Id: <20180118141353.1295-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [5.65.125.86] X-ClientProxiedBy: LNXP265CA0057.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::21) To AM6PR0702MB3734.eurprd07.prod.outlook.com (2603:10a6:209:12::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd09f02b-2a65-465c-a1d3-08d55e7db6fe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(4534125)(7022125)(4602075)(4603075)(7168020)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM6PR0702MB3734; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3734; 3:IIuSmQsf/1wSMG9ON3qibM/2ld5/zJdIlreyEN9H9tynlAV+1GmmP2rnKJfJZTN77YKRH3yUF3kiKwsnjFr3+jsfvkLuaRR89717DE/RqOyfja17TacwIXqadWGmy5Pf837e89mels8d4pYu29Qtxk19+FJ9DcDLDasAYbsAyooYW3viO5drp3RweB80uzXTm4M7NvKvxe3VQ+nXkrY4HP3EBWfN6n48dSJfLUiS7bEzCQq/eOimZXYd5YSh4Ixs; 25:36QFCk4X3fAGHPIMOXpntRgvRLccByd2GiY2XlLgfjCjcD4uGaTl04e4RXiTZW4h95dZ7uOiADvgYq1e3iGjUW2X7l9ujt39TSHpJDur8+wjlQawY7DigKpavmD9QnuFv4rRFxAsb1LIjGlfwyyTQheI3w8YuMh8TQIg3UWUrA/REyPv918xlIqOlAt4ouv2pDFCh1Fklu5Xi4Yi26bCMZv9lm1RbGHQqvmVrCa5mSgC92qnQccPXCrP0UzNLKIi98ld5/6OdaLMvXXNb9c3thOT7pPELrLNUBsdwGEOy+ukRhq45p68LfxfZIhlbq7GO2evZYMpmHqu7e2IZ4C+uQ==; 31:O3YGKemlrt0wI1RuJdl2EtlXNlP7IbmfxGKQtqnIX9CoAgNUfcPFeCUey1Qho5ipmgq05PRZr0w0PmG85v9+FhskDvwyeJwuXasZtW2VfpIinr8V5QTjSGy6XcxRtT3ImGO/Yy+6OV6GaJk0wyZEdlPERZCmvSipxiD7PVb/MutGyTNc63ntjlFO+1aB/L7ooPLqc/O+IVfPSgbqReIx1NvFAS0owlopcm5UojRlhh8= X-MS-TrafficTypeDiagnostic: AM6PR0702MB3734: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(2401047)(8121501046)(5005006)(3002001)(3231023)(2400062)(944501161)(93006095)(93001095)(10201501046)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(2016111802025)(6042181)(6043046)(6072148)(201708071742011); SRVR:AM6PR0702MB3734; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM6PR0702MB3734; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3734; 4:EWBAhllq4DyDVjmcxTy9DX2kYzCm0PJh439TN46B8+2uq9bRqUFp1iov/6RRCPu01a7BzvCQBfaW9wZijOEQXsIvGwu4YlH8nupNg8bY8PRPunmfMvEcxKlGOdwdcuBIDY0+j1I3d6i8QkHHJUDI0qo5AxFmdnPLoOEowMIH9ErmiHsyXoZoJ1hty47mUwHml7AYW4Z5zmURjrk8xGaHy17C5JjnC71vRoQNgvLoo8dVmLTFZlCK43OKxvLKKBHlD0+4pyIOEUx1CLWIaMydog== X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(39830400003)(366004)(376002)(346002)(189003)(199004)(5423002)(51416003)(316002)(50466002)(48376002)(97736004)(4326008)(1076002)(6116002)(107886003)(6486002)(74482002)(16586007)(47776003)(71446004)(81166006)(66066001)(26005)(81156014)(50226002)(8936002)(575784001)(106356001)(7736002)(2361001)(105586002)(6916009)(53416004)(53936002)(42882006)(8676002)(305945005)(2351001)(5660300001)(36756003)(386003)(6666003)(55236004)(478600001)(52116002)(7696005)(68736007)(2906002)(69596002)(25786009)(59450400001)(3846002)(16526018); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0702MB3734; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR0702MB3734; 23:OdxITPBkII8dYmIxiUrT2VcOIrtoxgn/Hx1xwKV?= eZgQjj656hVmX1Fu782480WzyUGAaxFkMO6uCJwgDWtCPU+aYOQsVPqk5u33oA3/Zx/ASz8NES1HvGw9j169gY2Y304JdRxyDrJjwaUPV6jS2BgwKFIWRhlW81uM8phjmdQsCS9Ru55+8+JdD/ss7J9RTSLvC48p3ExWX8gpaAYF0qq6hMGmpibrNtG0HgJ+DTPSTw36MR1MgzZBxAR+UgDcHYvR6+7g+Vn329oCdlTJ+CfnsC7sF3H616QN2S5VWyF6EOjC6YkA9QQsxqcz1/lk46+j2AbwSHUn58C8kcStcd1cBcxSd82n+rerI/LAoCkn9GfBDUQ/e6Bb3hybn9z/cnRuGetPMjMIHbIvO9AYdPS0Am4kTt2OXc7TvEVI7HLt0eqvQl0FyIx8zTOb/PJN4i/ByxFaczQBaY8nHVkpSuKS12dmHUgVc0Y31GpxUPCALbPRVMr5GAGEfSyeW7MbtxqbPIDmde9pF1TbAjKSUqA1bXy8df14PXjIvtCJEHemmX6BuNCvmfIxPmY16xCFQtD3wWi1+RjQH2LtAbSFYWu+LVJHA/IrM0ptmlDt9+qBbIZyhO+bu3nZinLKct5ocG1hEmYnnCfUJgmgEHYFJzto4WW0dOZYmDKYv3SEKR06mPMXmuL6+YtxxzqhfKc4u86WlogYK2OAWv4b5+Pi8PtaE1LsoS+r+O/du/hKq0jhHbaLtESd7eZ9Dz2EaeLBPHOArNSwT4RRyNgEfNIvuvABVvsv3FQB3gEuO3g5RDLVQL9I0tWxaieym/TuKFs+/kZPdDvD8/k5hJPc9yghBlQvSvgFgyvmTNuPsw4isysWKybV1f7njzUsOHK0fqgsiN8ZKxLHdXsxG8aLVWTLAxr6SF1hdHWHjPguESnpSo17xKtgH8Ni5Aw86LwvLBsujSjbDkO1kQ6tC+/ZMX/R/MU/z4Qm2fDU0sO6p7cm/A1zwa6ATY8rrY0ARTtDzaNZ5xlkXqPfloF/++QULTwz/NQNueUT95FCwRn1rm/nELiUVBqs9HDTPfGU/LtbyBUd9rebjw+N2QmZcNA+BDVW7a+yRa+TBWHbhEwpY9Df/2p1oPNMRzecrziMKP+kMuzCw8PKJ09wjctSBm9aEMla9Xgy9lAEieGv9xexZnwb2t4vKOgMKEy4qOi9q3p4KNDiJtlJq7+kS1eCjP460RR/jHEGEZzE2fsqDx6u4Tb9tCFSZ7fhKaxtDyW2140OB3p7J X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3734; 6:k7YXoS6rFl6x8dWmOcHIHUCApA9wDP7CBSaHi6ltTrl7tBwFnoK7TCxMYqJNjpaWMgHXYpBVYXBRtnKGkSIADrBqUMwZb6tl5Q8AJxJBbGKQAYnuNpz6PN2OAjLmw0Osmmyv3SR9PSDVDNBAdQgOMqx+cYo/7thDpGTC/bmKq8vy1pj+uoiX7qblH5FJBwbPMIQ1rmt5zrrryQELBBFtM6ud50YpjyXUVUm//h3RKYTzVzcVuBjksMo5+QskWZXeJh0ihHtm6U+2BGzOC4Lb4kgqva2lhRllUX4ueK5YzgR4InKosHDh8k8ISE596amoxDJP6DK5bMg2z9Pb7reUsXwK8gC03WR8Co57ZBxD4aA=; 5:y5W5d7noyY2nx2di9IsA3u+SFQri6bjfuoEW59FZC6i5ImWsI8Xqm8V0Zsg1sVyEfske+vFPA5pZbrxCnSLZdDqc/u+dtAjYxZYk/9KXoBWurNkdQc5CVZ71UfCQkMeNINE7oQPM8j3GEXVO0rGRU1MCTJ+8euVnSRJPbxIFpa8=; 24:+SHeHLM2fLhHFepvdmMnIuAK//MFWp+UTpD8dt1StC4XlPZhcKgCpY1QRihs7gsZIYucl0+iUtnLru22hQQeBEu+ce7gPlFZeDNOhorxJ5E=; 7:ZEEnG3SSZCX4QtS2+0Zdz/2DE8/xavcCBTdtpugggHI4stCm1UxEVVcySe1bwoL4EA8oqHC9yaoOtnftE2ye748ZuKgssrQxYr6JGGh83Kucd6Vnio1YfK4KMOZoJnnjuMy2/O6au2aOS3pPTWPF7MGkScfGZDZLrdLgQoHUVnbGarj1b3gfdFgVnxVoNQEX+UPxsoySG+5Jf+tUEbz8+InU9NGRsGUfQBUAQxqiVm0mQXT6S6LIg5S8fk00npwt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 14:13:57.6231 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dd09f02b-2a65-465c-a1d3-08d55e7db6fe X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0702MB3734 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe02:0:0:0:60b listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH v1] kernel: bump 4.14 to 4.14.14 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Refresh patches. CVEs completely or partially addressed: CVE-2017-5715 CVE-2017-5753 CVE-2017-17741 CVE-2017-1000410 Signed-off-by: Kevin Darbyshire-Bryant Tested-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../generic/hack-4.14/904-debloat_dma_buf.patch | 2 +- .../666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 87d3ff172d..ec47f4d2ac 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,12 +5,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 LINUX_VERSION-4.4 = .111 LINUX_VERSION-4.9 = .76 -LINUX_VERSION-4.14 = .13 +LINUX_VERSION-4.14 = .14 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-4.4.111 = a201282e8eaf62b4f51edb2241e98ff805fe2d1b04a72a2328c5a6e2d77ec008 LINUX_KERNEL_HASH-4.9.76 = b82b94332cffaaeade74495264c989dafb96d4748503f87a5b7c436f5de887de -LINUX_KERNEL_HASH-4.14.13 = 4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772 +LINUX_KERNEL_HASH-4.14.14 = 8b96362eb55ae152555980e7193fe2585b487176fb936cc69b8947d7dd32044a ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/generic/hack-4.14/904-debloat_dma_buf.patch b/target/linux/generic/hack-4.14/904-debloat_dma_buf.patch index 8f1a3bca82..44d10b0d52 100644 --- a/target/linux/generic/hack-4.14/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-4.14/904-debloat_dma_buf.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig -@@ -243,7 +243,7 @@ config SOC_BUS +@@ -246,7 +246,7 @@ config SOC_BUS source "drivers/base/regmap/Kconfig" config DMA_SHARED_BUFFER diff --git a/target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index a114acda92..8668fd7e43 100644 --- a/target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch @@ -300,7 +300,7 @@ Signed-off-by: Steven Barth /** * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own * @t: the outgoing tunnel device -@@ -1295,6 +1435,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str +@@ -1296,6 +1436,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str { struct ip6_tnl *t = netdev_priv(dev); struct ipv6hdr *ipv6h = ipv6_hdr(skb); @@ -308,7 +308,7 @@ Signed-off-by: Steven Barth int encap_limit = -1; __u16 offset; struct flowi6 fl6; -@@ -1357,6 +1498,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str +@@ -1358,6 +1499,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); @@ -327,7 +327,7 @@ Signed-off-by: Steven Barth if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) return -1; -@@ -1485,6 +1638,14 @@ ip6_tnl_change(struct ip6_tnl *t, const +@@ -1486,6 +1639,14 @@ ip6_tnl_change(struct ip6_tnl *t, const t->parms.link = p->link; t->parms.proto = p->proto; t->parms.fwmark = p->fwmark; @@ -342,7 +342,7 @@ Signed-off-by: Steven Barth dst_cache_reset(&t->dst_cache); ip6_tnl_link_config(t); return 0; -@@ -1523,6 +1684,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ +@@ -1524,6 +1685,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ p->flowinfo = u->flowinfo; p->link = u->link; p->proto = u->proto; @@ -350,7 +350,7 @@ Signed-off-by: Steven Barth memcpy(p->name, u->name, sizeof(u->name)); } -@@ -1904,6 +2066,15 @@ static int ip6_tnl_validate(struct nlatt +@@ -1905,6 +2067,15 @@ static int ip6_tnl_validate(struct nlatt return 0; } @@ -366,7 +366,7 @@ Signed-off-by: Steven Barth static void ip6_tnl_netlink_parms(struct nlattr *data[], struct __ip6_tnl_parm *parms) { -@@ -1941,6 +2112,46 @@ static void ip6_tnl_netlink_parms(struct +@@ -1942,6 +2113,46 @@ static void ip6_tnl_netlink_parms(struct if (data[IFLA_IPTUN_FWMARK]) parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); @@ -413,7 +413,7 @@ Signed-off-by: Steven Barth } static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[], -@@ -2052,6 +2263,12 @@ static void ip6_tnl_dellink(struct net_d +@@ -2053,6 +2264,12 @@ static void ip6_tnl_dellink(struct net_d static size_t ip6_tnl_get_size(const struct net_device *dev) { @@ -426,7 +426,7 @@ Signed-off-by: Steven Barth return /* IFLA_IPTUN_LINK */ nla_total_size(4) + -@@ -2081,6 +2298,24 @@ static size_t ip6_tnl_get_size(const str +@@ -2082,6 +2299,24 @@ static size_t ip6_tnl_get_size(const str nla_total_size(0) + /* IFLA_IPTUN_FWMARK */ nla_total_size(4) + @@ -451,7 +451,7 @@ Signed-off-by: Steven Barth 0; } -@@ -2088,6 +2323,9 @@ static int ip6_tnl_fill_info(struct sk_b +@@ -2089,6 +2324,9 @@ static int ip6_tnl_fill_info(struct sk_b { struct ip6_tnl *tunnel = netdev_priv(dev); struct __ip6_tnl_parm *parm = &tunnel->parms; @@ -461,7 +461,7 @@ Signed-off-by: Steven Barth if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || -@@ -2097,9 +2335,27 @@ static int ip6_tnl_fill_info(struct sk_b +@@ -2098,9 +2336,27 @@ static int ip6_tnl_fill_info(struct sk_b nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || @@ -490,7 +490,7 @@ Signed-off-by: Steven Barth if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || -@@ -2139,6 +2395,7 @@ static const struct nla_policy ip6_tnl_p +@@ -2140,6 +2396,7 @@ static const struct nla_policy ip6_tnl_p [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, [IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, [IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },