From patchwork Fri Oct 21 19:16:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Thomson X-Patchwork-Id: 2827 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id KrRwFhCLU2MYDAAAIUCqbw (envelope-from ) for ; Sat, 22 Oct 2022 02:17:52 -0400 Received: from proxy8.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id +PxZFRCLU2NrQwAAalYnBA (envelope-from ) for ; Sat, 22 Oct 2022 02:17:52 -0400 Received: from smtp8.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1d.rsapps.net with LMTPS id YO8TFRCLU2MzcQAAGdz6CA (envelope-from ) for ; Sat, 22 Oct 2022 02:17:52 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp8.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=fastmail.com.au; dkim=fail (signature verification failed) header.d=messagingengine.com; dmarc=fail (p=none; dis=none) header.from=johnthomson.fastmail.com.au X-Suspicious-Flag: YES X-Classification-ID: 41aaa322-51d1-11ed-b152-782bcb03304b-1-1 Received: from [216.105.38.7] ([216.105.38.7:54976] helo=lists.sourceforge.net) by smtp8.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 82/1B-28605-F0B83536; Sat, 22 Oct 2022 02:17:51 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1om7oQ-0004oT-DV; Sat, 22 Oct 2022 06:16:50 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1om7oP-0004lZ-Jv for openvpn-devel@lists.sourceforge.net; Sat, 22 Oct 2022 06:16:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Mf1e4A8sQ8mDtEPBHPYcBJksWqvypJrzekyCkI4dpIk=; b=DDrmbyvE+92Hf8LtubyVAmOIel fblX2NgOuA78rFHagETdtXOc+HZGsEbabQKRX4GvjrwmnaAZxPhNAoFYDTzropBKpy3BXLrnrUyyE TGRLH9GI5HsSoWFrZv829siZMSJe+fN/rWQ6FAC4e9Bv3psSHTz1LegrbE82hw1uK5us=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=Mf1e4A8sQ8mDtEPBHPYcBJksWqvypJrzekyCkI4dpIk=; b=Z +Y1fWmraeyW6U7B3vmWVh+bWbjR32dGzk9OyOOS+1/dtwOjaM9fU/VBTd7kG7JMHBVZ6z2cfjn/7v uyC4DfK/5f2qn6z2hlADasKhJnKZQGH2tNPy7xY+htGei7mVl0WTeW/gxYzl2ajFImZYMFYuhnC/z hUJHacngmTWKU/Rw=; Received: from out5-smtp.messagingengine.com ([66.111.4.29]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1om7oN-0003gV-F8 for openvpn-devel@lists.sourceforge.net; Sat, 22 Oct 2022 06:16:48 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E26985C00D8; Sat, 22 Oct 2022 02:16:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 22 Oct 2022 02:16:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com.au; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm3; t=1666419401; x=1666505801; bh=Mf1e4A8sQ8 mDtEPBHPYcBJksWqvypJrzekyCkI4dpIk=; b=XM3b4tFjjxg0jQuBwrjS4Wy1KJ fpjkEzuwDauytuvuTZmn5Y5k1xwdczxMxo2W9eG5zY6E0IXdd4ZL7o0p6yrkvaWX APJxL9ZOQVa8x9LclAChDDnvSqdfpg8MOR7P9X/cHLsRlJ/P0b8q/xymvtQmDF2z SSqxNWpKZWg2PYPw4J7o9sA1bpmaasku1hA8j42cBXl7RT8Rz8Az9WFPcQmzEIUm iJN+8sLs8LUxN+LZzmoSnuvaHxkaOq/xKYM8UI7mczYdWCjwaJP6p7lIYCWT3MJx fbiKkqBbELWhcTJ/LaWaQmAuC9mOw7JOu6h5/broSIFU72zMzyBpqwz56Jbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1666419401; x=1666505801; bh=Mf1e4A8sQ8mDtEPBHPYcBJksWqvypJrzeky CkI4dpIk=; b=agJ4u+A3QBtj7tGqNmtlYeU8HIK5D9Y6DP9gDEEVdR500m2pGVN GJLtP9r3yxujYwjLP48avXeLfm0P7/kd+L3dl5eNhvGygA7zXgB7+hwJ0TUw+WVq HdtOC6RJYSM3GC8iC5pfyUdBTkylXLACgvB7p1OP5JXFfQ866+WndrYy2uqinIG0 HVecsjD96vsWZ3cR1LttbhnBJ8peJSxRCfSMVc2YzgzfN29vQcjhoRE4PN9IdtyP 8UfgXf+RplnkVGiJt+G0+DAiqGpdQtuREsizw2TvfOUSSttaw63nqpzYao9x+RWp Y0EAIabtG/ZJRj44weIv5rN1/N+b2Env+0w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeelledgleejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeflohhhnhcuvfhhohhmshhonhcuoehgihhtsehjohhhnhhthhho mhhsohhnrdhfrghsthhmrghilhdrtghomhdrrghuqeenucggtffrrghtthgvrhhnpeefvd ekveeggfekgeehvdelteeiffehgfeihfelgfdvkeefvdetkeeuueevleehveenucffohhm rghinhepkhgvrhhnvghlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepghhithesjhhohhhnthhhohhmshhonhdrfhgrshhtmhgrihhl rdgtohhmrdgruh X-ME-Proxy: Feedback-ID: ic081425d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 22 Oct 2022 02:16:40 -0400 (EDT) From: John Thomson To: openvpn-devel@lists.sourceforge.net Date: Sat, 22 Oct 2022 16:16:19 +1000 Message-Id: <20221022061619.3923529-1-git@johnthomson.fastmail.com.au> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Linux 5.19 replaces netif_tx_napi_add, but maintains a definition to the new function in: 58caed3dacb4 ("netdev: reshuffle netif_napi_add() APIs to allow dropping weigh") [0] Linux 6.1 removes netif_tx_napi_add in c3f760ef1287 ("net: remove netif_tx_napi_add()") [1] Content analysis details: (-0.8 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: messagingengine.com] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [66.111.4.29 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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 X-Headers-End: 1om7oN-0003gV-F8 Subject: [Openvpn-devel] [PATCH] ovpn-dco: fix kernel 6.1 compile issue in ovpn_peer_create X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Linux 5.19 replaces netif_tx_napi_add, but maintains a definition to the new function in: 58caed3dacb4 ("netdev: reshuffle netif_napi_add() APIs to allow dropping weigh") [0] Linux 6.1 removes netif_tx_napi_add in c3f760ef1287 ("net: remove netif_tx_napi_add()") [1] [0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=58caed3dacb4354a25a1aa8d2febc3e9648ba1f4 [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c3f760ef128789252e7c4f10d3c1721422dceba9 Signed-off-by: John Thomson --- compile test only, on kernel 6.1rc1 --- drivers/net/ovpn-dco/peer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ovpn-dco/peer.c b/drivers/net/ovpn-dco/peer.c index 5838286..c460976 100644 --- a/drivers/net/ovpn-dco/peer.c +++ b/drivers/net/ovpn-dco/peer.c @@ -88,8 +88,12 @@ static struct ovpn_peer *ovpn_peer_create(struct ovpn_struct *ovpn, u32 id) } /* configure and start NAPI */ +#if(LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)) netif_tx_napi_add(ovpn->dev, &peer->napi, ovpn_napi_poll, NAPI_POLL_WEIGHT); +#else + netif_napi_add_tx(ovpn->dev, &peer->napi, ovpn_napi_poll); +#endif napi_enable(&peer->napi); dev_hold(ovpn->dev);