From patchwork Mon Aug 21 22:28:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 9913911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D8006603FA for ; Mon, 21 Aug 2017 22:28:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8A1B286AA for ; Mon, 21 Aug 2017 22:28:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD646286C1; Mon, 21 Aug 2017 22:28:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55FBE286AA for ; Mon, 21 Aug 2017 22:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754464AbdHUW2u (ORCPT ); Mon, 21 Aug 2017 18:28:50 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:48937 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754422AbdHUW2s (ORCPT ); Mon, 21 Aug 2017 18:28:48 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 243284251F; Tue, 22 Aug 2017 00:28:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id b1mn3iyHHFnZ; Tue, 22 Aug 2017 00:28:47 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 18/21] patches: adapt signature of proto_ops->accept Date: Tue, 22 Aug 2017 00:28:14 +0200 Message-Id: <20170821222817.17376-19-hauke@hauke-m.de> In-Reply-To: <20170821222817.17376-1-hauke@hauke-m.de> References: <20170821222817.17376-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit cdfbabfb2f0ce ("net: Work around lockdep limitation in sockets that use sockets") a extra parameter was added to proto_ops->accept(), do not assume it on older kernel versions. Signed-off-by: Hauke Mehrtens --- patches/0081-proto_ops-accept/nfc.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 patches/0081-proto_ops-accept/nfc.patch diff --git a/patches/0081-proto_ops-accept/nfc.patch b/patches/0081-proto_ops-accept/nfc.patch new file mode 100644 index 00000000..decd13a8 --- /dev/null +++ b/patches/0081-proto_ops-accept/nfc.patch @@ -0,0 +1,16 @@ +diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c +index 043c6d3..5b4e44c 100644 +--- a/net/nfc/llcp_sock.c ++++ b/net/nfc/llcp_sock.c +@@ -443,7 +443,11 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent, + } + + static int llcp_sock_accept(struct socket *sock, struct socket *newsock, ++#if LINUX_VERSION_IS_GEQ(4,11,0) + int flags, bool kern) ++#else ++ int flags) ++#endif + { + DECLARE_WAITQUEUE(wait, current); + struct sock *sk = sock->sk, *new_sk;