From patchwork Sat Dec 30 09:20:39 2017 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: 854073 X-Patchwork-Delegate: openwrt@kresin.me 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="nZAdR2e7"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="Nupm7o5t"; 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 3z7yd02bjyz9t16 for ; Sat, 30 Dec 2017 20:21:24 +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=2WsJU58SjHrNDZxBhBOEdpAxjxAgYLsrr18MLku2NbA=; b=nZAdR2e7ZvQtIk U6AtXDA/td5f1xRFZUt1A9fyzdZ2edEcRZ/a78peSIIT5SsneO9delwmauNMfNpAuYNQZwtSJxg58 xqoCWAisXZiXKvLUzbjmbx2AOMchffLJqDaa2BlGpce8+yY1120LL5l4MFDLBxcg/4D5LHUxGbJrG 7CpwgwfrFEeb+EWdB90YScKVVv057qMe0jN4I0GUUWYSQYGttEYBCFJsVVwUAgBV3343DeUOZ2wav 12lR8CMC4TDAw73SeZJ6+VAL6qWwqOKvYXSe+LReC07USLyr9UqnevG7r36sjjP+LeBNaOobPOw/E v3cKI1x22J5HFjMQs/Bg==; 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 1eVDKB-0000Ny-GR; Sat, 30 Dec 2017 09:21:03 +0000 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eVDK6-0000Bi-Op for lede-dev@lists.infradead.org; Sat, 30 Dec 2017 09:21:01 +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=vKN6eHJkmZ90ew+uhiD0v2rlWZq9BgnVBn1Uy8olgtQ=; b=Nupm7o5tPVm0YiGBDCNlYvu64gyzSQQHFbYcMgefof615sM0aDBzY/RdpfoEa16N5hA5LVZM0HEdQECv2tz4yac7S9vn5o0nhwegitLLXTA+RKTPTS490ekpLwLAVoKPwt6yi/GsmtQNe1mRzo9wEqDa6zaOOtpcq8VRCTtoGt0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Rowlf.darbyshire-bryant.me.uk (151.227.238.51) by AM0PR0702MB3730.eurprd07.prod.outlook.com (2603:10a6:208:26::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.4; Sat, 30 Dec 2017 09:20:43 +0000 From: Kevin Darbyshire-Bryant To: lede-dev@lists.infradead.org Date: Sat, 30 Dec 2017 09:20:39 +0000 Message-Id: <20171230092039.83246-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [151.227.238.51] X-ClientProxiedBy: CWLP265CA0001.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:10::13) To AM0PR0702MB3730.eurprd07.prod.outlook.com (2603:10a6:208:26::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d72c2ebc-a096-4aa6-b1d7-08d54f669a7c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4603075)(4627115)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:AM0PR0702MB3730; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3730; 3:qw3WhN9x42H4HEQqSNoHeBkJ/lK9tsodoOnEGBSU9f0dcM0N8iAAGUudf7w8RuZaPQt9ioQg6nbyiTDLkQFqoiWdNkeu+XmNvv8AsCgbtXORDsJhNWbviBxuG5DjCR2JaqhrywERaxXS0nBFK1M+Cv150VgVCXwc9Goz+k2+28zFpRyY+2bhSzPygOQmV1V+L/5zlXEScH0B/oG6Z9fGCKRjsFUnItblMwRK1htjWmExKBBVLmIRkIZFWTxiYV4a; 25:++DJKEzEklS1VDq5vt1PFRZAkDerO0vrD+0uuWIqos9N72PmONI/Ogv1/JyaPImFkutDFs63aLfpUZZtnqFOYWLdcCq5nQPBySZF15Y/QI8W06f0LiImJo08eJBkG4otcDFdggGTExQw/8AjHS98yNxhUifqSW1k2xFCAX4f5lRydXrBwISv8WMj82UF9vJS+ISpI8vO8jwwDn51ggjpjGFtcSBmBq944C4ZcVgWCGoR+7ACAreskC0oavMvUiEtopiO7oREGO/gEjDWH39eXnJ2i5HjYeVZFeSxYITC3leqgLiFAtSW/0qZUSoel7JVSeJjXuNgXEKx1bHGL0ZgmA==; 31:XWOfd0Y5fhTTp0eX5JZK+4MSXvn3SSAmOHGP+YJU/VtkYXPezD8QIP2xyT8NTosbzeycJPf2Egxg2e3f2RjGsB4iPEUydy/v0v+idqMLDtDvPmye3SfPknGz86bnvxEltA18Oelrcx1v6Y4IExLsKjV6z6Cbc5drnHWPKgUtM8kXdPS3c1q/pUXq2hxjZzJQFfToQ3jKQyhkWQ25bxmSqxjmeT1S0yQkTZsUc9ZhVjM= X-MS-TrafficTypeDiagnostic: AM0PR0702MB3730: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3231023)(944501075)(93006095)(93001095)(10201501046)(3002001)(6041268)(201703131423095)(20161123555045)(201703061421075)(20161123560045)(20161123562045)(20161123564045)(2016111802025)(20161123558120)(6043046)(6072148)(201708071742011); SRVR:AM0PR0702MB3730; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0702MB3730; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3730; 4:y6ZuHExk/nG19pttUEuElGHCGjtUyzCPsj24ncZPr3TRxHs/JybbpCsvZMr82BhLb860BGGiDx83uTpn4ZSDc10BVKQ+9LBRG0uvkMo/RKaMaBhPD++ahPRcAzeJk2znsydmyT+obRzqeUMNgW+l9P9O2L7NmQlAmveZOYvsEUjzGs/fDX08bnFAJoaMhFbz06N2dsgwVsLPKfiimRkYGtLZunHX/OXnKZrFb1yLZeqVRKjE0XUISdtcRV0FOCK/HOTJGWqkWTaU3/q5KVd9Cw== X-Forefront-PRVS: 05373A0663 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(346002)(376002)(199004)(189003)(2351001)(8936002)(2361001)(4326008)(74482002)(107886003)(508600001)(16526018)(25786009)(50226002)(2906002)(386003)(53936002)(68736007)(53416004)(106356001)(5660300001)(6486002)(97736004)(81156014)(81166006)(47776003)(105586002)(66066001)(6116002)(50466002)(16586007)(8676002)(3846002)(305945005)(36756003)(48376002)(42882006)(7736002)(52116002)(1076002)(51416003)(7696005)(69596002)(6916009)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3730; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; AM0PR0702MB3730; 23:V3mibtU+80HIXYs3k/EQLiK9hEPLTlyD77gG6Xg?= vpmZIGwf0qGooLUN3G+KuyzOx7pnwcTDEG+462ACzGjT4Kd9J6smn9MpMijpzKyEfajrrInU8Hxi/e4QCP6auPU3VwjGyNfFBAXqSX1M7a2LQSzaBnEPCgaqA0P0nZ/xOJGe7q7oI7VhmhaYLhJkmZruVa2MmUwkdcnmoe7WqlQm0iKIptyUte8p9Z2tPnGefWlggDzac6T9WRidm/bdpknXJTDNeoovH9Avv/z968ns6AdarUSs5bYTQOZ7UIf2W2B5rW/kT2rhbXr/QPCC5JAeOUTi3FkrVVmyz73wOxz0ZvaKMvFY48w2jN93JnktxNe8QfYR8GG6IaWLX1h8NxHqavVLxU2QjvvZkE4pxNJ19LhZRSQGfCeShS4klA8VHVWFuXh8Ta0cfwKu+57ZwjD2Y7BlsRqc3YJ+bOoG7nFDF++fzxN5pyTAH7NtQ+gmlNDmfoZWcXEEzJstP2GrTxMEXmlTQb5qrvuu3kWYDJgfcQKkDKtoCvAYmaLblsIko8+S+62LESB1zLvwRtYVecoeA0hEqYL+4lf0P5pvSUEVWTiT6UPkVLKQ3uXqJEPWSATeJEN5IY8A+iu96IvQMdtS9XblPuMref1qOqbn/9P7w/bZ3FfV/eHMX7EHLcoMMVT2lzWYVr2RRp6pMxvuYFuggaph/0b/bUJFUn8Cyalv0DjAoHtQXs+1RVpXYdLNmZ3nNHGS5c2B51dkjBAkslnLkXttrIOShCnmOXqrulk86q+vIT/Gww4tF4xQjOB5J3HeGsJIlzpbX4XKButTr0fbXhFsWPK39u/sE73rqnfz16cMbWAVosAFWVOlLoI3Xsi6wBZneXjBJfOLfwd0zo8rqryUpYKCp+UL3Jag9A9KKOwTRBDnNFnRNJy2PLmus/dQDJy4OPY9QMemKv9VexltMXRpDQ7vzcguHKEsLsELAA06Rag21PpOrn32jMF1J3Vh1xkD4fBk5zcRZjqUImtP5pDNwU1Vm2UJc/Y0nEEMJzdG4fqM4rEXv9iu+hSRImZ0FVyVAx6UONfFLa9P8Jh5gV7smwgAoxqbcA0BDA9d02g== X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3730; 6:W30QLB+F//Kdr/2K35BQv0L+UJY6MW4hPNMlO5VdiJqSOPYWy2PCBu6oFRiHKcdwvQ9reQPd2gyir9cLTl+ih1gyTJ5rvTWHYttejms5ql9ADS0hJ7+B7uAaJ6MFb/Mv6rlNe9/nQHSR2oLZnTY+Gv72ZbRurocRkHx6ZHHOJUNRSIjc5PejY6cGEjGwz7VfrL1f3DO4lnvEP6BuQakHZB4tzE9706O1r8KBPjFkOsynINB17SiDtPQPsB+sPmoJ3vwdyztgmf/J9sVXxHKL1oBoMiMKCAzW/j0v1vyCGj6uKLfPj8vbazi6WddsmXUA6dVtCGWnFYtfNkot38P6i8j+14rZI7gEGmh6ckS6t1k=; 5:Lt4wMWdf5BV4QO5dhZafMfEogGZnXfUgD+rliTkRdpEaV+z3IeOccudQ+sDuofqkXWjWlT88M47OkPdhACgXzq4Ehe+w5TdGINUG2dTIiY6FX9r6uQlOUKhiySf9fcOxDRYk+d+PHyxaeQ46+ExhWJXs46CEf4aHYlmHK8vwhH0=; 24:PPwaz81HOy1ZXOZzfz8W7nwnhJPnqRGwRB29N+J7uuW2qMQOIeXXZcIQinUVoyRQkn5vfDY6gVYLlIBBI7fatzQs6883vym9hZ2BC5cWYII=; 7:oJsV+5LYj9HzZi4+nNWy4uG6mB96GX00o9x0t+Rhg7iN/923qWT7OZtf/pViNFRgnDUKnr/zEtFr7u2YyqBPju8xIzPgkZwzVW7xFX9BsWIVoj2oeTBsbTjy0h4CwSVlWP0nhWuZaQVVSszuIhaP8TgA4m0cJVBGHISBxIj+naVaYm1N7ZicSN8aoV+SCcEe9HR9zJBTaRMWKrPbbg5+sH9b24WcvR7dunYMo++ROY5agP/9XbHtbrxX5tkSkAb6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2017 09:20:43.8508 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d72c2ebc-a096-4aa6-b1d7-08d54f669a7c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3730 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171230_012059_899640_EA4AC195 X-CRM114-Status: GOOD ( 10.15 ) 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 [104.47.0.78 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [104.47.0.78 listed in wl.mailspike.net] -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 -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v1] iproute2: cake: fix patch format error 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 Fix patch format error introduced in c4e9487cf5 Refresh patches to tidy fuzz Signed-off-by: Kevin Darbyshire-Bryant --- for 17.01 .../network/utils/iproute2/patches/950-add-cake-to-tc.patch | 13 ++++--------- ...monitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch | 9 ++------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch index 17fe1605b0..882db8af19 100644 --- a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch +++ b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch @@ -1,8 +1,6 @@ -diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h -index 8d2530d..c55a9a8 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h -@@ -850,4 +850,60 @@ struct tc_pie_xstats { +@@ -850,4 +850,63 @@ struct tc_pie_xstats { __u32 maxq; /* maximum queue size */ __u32 ecn_mark; /* packets marked with ecn*/ }; @@ -23,6 +21,8 @@ index 8d2530d..c55a9a8 100644 + TCA_CAKE_ETHERNET, + TCA_CAKE_WASH, + TCA_CAKE_MPU, ++ TCA_CAKE_INGRESS, ++ TCA_CAKE_ACK_FILTER, + __TCA_CAKE_MAX +}; +#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1) @@ -35,7 +35,7 @@ index 8d2530d..c55a9a8 100644 + +#define TC_CAKE_MAX_TINS (8) +struct tc_cake_xstats { -+ __u16 version; /* == 4, increments when struct extended */ ++ __u16 version; /* == 5, increments when struct extended */ + __u8 max_tins; /* == TC_CAKE_MAX_TINS */ + __u8 tin_cnt; /* <= TC_CAKE_MAX_TINS */ + @@ -64,8 +64,6 @@ index 8d2530d..c55a9a8 100644 +}; + #endif -diff --git a/tc/Makefile b/tc/Makefile -index 56acbaa..d421b8e 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -63,6 +63,7 @@ TCMODULES += q_codel.o @@ -76,9 +74,6 @@ index 56acbaa..d421b8e 100644 TCMODULES += q_hhf.o TCMODULES += e_bpf.o -diff --git a/tc/q_cake.c b/tc/q_cake.c -new file mode 100644 -index 0000000..acbe56c --- /dev/null +++ b/tc/q_cake.c @@ -0,0 +1,771 @@ diff --git a/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch b/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch index 52be021e72..610fb525ae 100644 --- a/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch +++ b/package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch @@ -20,12 +20,10 @@ Acked-by: Nicolas Dichtel ip/ipnetns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/ip/ipnetns.c b/ip/ipnetns.c -index af87065..ccc652c 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c -@@ -72,8 +72,8 @@ static int ipnetns_have_nsid(void) - if (have_rtnl_getnsid < 0) { +@@ -73,8 +73,8 @@ static int ipnetns_have_nsid(void) + fd = open("/proc/self/ns/net", O_RDONLY); if (fd < 0) { - perror("open(\"/proc/self/ns/net\")"); @@ -35,6 +33,3 @@ index af87065..ccc652c 100644 } addattr32(&req.n, 1024, NETNSA_FD, fd); --- -2.6.4 -