From patchwork Fri Jul 23 17:23:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 18367 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id D3BE082355; Fri, 23 Jul 2021 19:28:45 +0200 (CEST) Received: from dvalin.narfation.org (dvalin.narfation.org [213.160.73.56]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 5865580918 for ; Fri, 23 Jul 2021 19:28:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1627061003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=HYJ+JC5t1bzEOjXrv/V84vV3gJuKVrCYzNjj0cJ62gc=; b=oOpKmraZmgVjB2WINq7Nb9C3gPc9wzA64ysLpWaRFDxHrOioUBMxxIYqVgJO/jN49Dju+V OoXyOlWzBCbyzFVyZPVdVD+/xUtaDr3XXYn748eh02OT3W5o0CM+b3J8KEiR4p/i88bnxO tgORfz5Zz4igH54UCPGVuhqCNV9urlk= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Cc: Sven Eckelmann Subject: [PATCH 1/2] batman-adv: compat: Add support for linux/kstrtox.h Date: Fri, 23 Jul 2021 19:23:16 +0200 Message-Id: <20210723172317.323199-1-sven@narfation.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1627061321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=HYJ+JC5t1bzEOjXrv/V84vV3gJuKVrCYzNjj0cJ62gc=; b=mjD2HKBgsjMwsP9gxasSYTk4+cfA080yPBaqTikFRgi02p35xuCH9vQPUIVz3kO+Gxd9TG bN7mHewABbn9aMw+ji/HX33OLU7+BP3M1olun0XxpYWxGgfSTEZrJV1cKPKLxRl3iXgmcG 4LWChDGtYnR2ITAiRWCSyu3YHmTX3tE= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1627061321; a=rsa-sha256; cv=none; b=cVaau5E8V1rMkrs2O0d6+eD0NZWmC2+DRyMHsrJdeBUmHMurhFNskhKBRoi/rRs9KKeojR OFcFpmrOPVuCZTWKNRfgDSdhEYTl6FVnOD1Dnnnl9vEf189oQMTKYwcsmhVDoqwRl0N9zv WTEtbyuVim2WpG+vcrSJq23euQU2FsU= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=pass header.d=narfation.org header.s=20121 header.b=oOpKmraZ; spf=pass (diktynna.open-mesh.org: domain of sven@narfation.org designates 213.160.73.56 as permitted sender) smtp.mailfrom=sven@narfation.org Message-ID-Hash: XF24IVTSQCT25RM3MVOKSWVIGTVO3HRD X-Message-ID-Hash: XF24IVTSQCT25RM3MVOKSWVIGTVO3HRD X-MailFrom: sven@narfation.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: The commit 4c52729377ea ("kernel.h: split out kstrtox() and simple_strtox() to a separate header") moved the kstrtou64 function to a new header called linux/kstrtox.h. Signed-off-by: Sven Eckelmann --- compat-include/linux/kstrtox.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 compat-include/linux/kstrtox.h diff --git a/compat-include/linux/kstrtox.h b/compat-include/linux/kstrtox.h new file mode 100644 index 00000000..cd152e4b --- /dev/null +++ b/compat-include/linux/kstrtox.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_ + +#include +#if LINUX_VERSION_IS_GEQ(5, 14, 0) +#include_next +#else +#include +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_ */ From patchwork Fri Jul 23 17:23:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 18368 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 741B8823B5; Fri, 23 Jul 2021 19:28:46 +0200 (CEST) Received: from dvalin.narfation.org (dvalin.narfation.org [213.160.73.56]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 4F2C280040 for ; Fri, 23 Jul 2021 19:28:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1627061012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1qYYHcEIF3WKLET5KtpdI6VoVyjwTOlmU5B3Rr4plD8=; b=wikA8tkj6rJGVef5B0nHMN1SdQyIOBOxmNENkEiIaaAShfwHoWkPyrI2iIbsxC8mUdNxtx cWdar8CIEyTKLs40AOL2uYDJFtAja0Rvk0NG8udwnhylkF06JFjZdEOx9EO6RrclbbRccH tlX46sZLcqgTZouyLoO6LNoYZjxLIiE= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Cc: Sven Eckelmann Subject: [PATCH 2/2] batman-adv: Switch to kstrtox.h for kstrtou64 Date: Fri, 23 Jul 2021 19:23:17 +0200 Message-Id: <20210723172317.323199-2-sven@narfation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210723172317.323199-1-sven@narfation.org> References: <20210723172317.323199-1-sven@narfation.org> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1627061321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1qYYHcEIF3WKLET5KtpdI6VoVyjwTOlmU5B3Rr4plD8=; b=y3xsT6PlxcJl30XUoUBiLYgY/6rBCyL7zc3MBamFtKt2Nr7nbj0GOce9CL1wBjOq+2IpTU /EDy0fIvW78yrTUUYcx/0TCKTWmctL1yGD/6edaUX5zAd4RiE24TEr4FOExFKXuRhxIB6j vVb9LZvhIEU7Vl3BFrKhWpDWFwZ9Yao= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1627061321; a=rsa-sha256; cv=none; b=Bks1ZD9hcQhDD5m8AIvATt68xVUaubhMEKHp3tnaVNSj8FpH+k1YV2xr8QW1NWTSRIWPpr ssJWIYpxbb3ksPRI2BmxkrUlmKQgN/cH7rPmtvL2wBSpO/ml72h4M8DFGYaZDrMMNVlvx1 BQZTRD5Vp1qLwOGmEivPkzQqDoAyBSI= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=pass header.d=narfation.org header.s=20121 header.b=wikA8tkj; spf=pass (diktynna.open-mesh.org: domain of sven@narfation.org designates 213.160.73.56 as permitted sender) smtp.mailfrom=sven@narfation.org Message-ID-Hash: NVHG7WYTIN53JS2ICEFVXTYTSPWYXOKR X-Message-ID-Hash: NVHG7WYTIN53JS2ICEFVXTYTSPWYXOKR X-MailFrom: sven@narfation.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: The commit 4c52729377ea ("kernel.h: split out kstrtox() and simple_strtox() to a separate header") moved the kstrtou64 function to a new header called linux/kstrtox.h. Signed-off-by: Sven Eckelmann --- net/batman-adv/gateway_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index fdde305a..9349c76f 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include