From patchwork Sun Jul 1 11:07:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 140709 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2850396ljj; Sun, 1 Jul 2018 04:12:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcGvdbULIdB+v6C/KGKxwkxVwY6mvGIfeYPLKG+gWF+8Yl1MPNAvOfL0pJwtJWlahLBTqti X-Received: by 2002:a62:8917:: with SMTP id v23-v6mr21535004pfd.127.1530443577336; Sun, 01 Jul 2018 04:12:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530443577; cv=none; d=google.com; s=arc-20160816; b=X1xnb8NBrWq06vJwONXJhDkdpHkAC46Yl/ahoi9WzSTHitivHpEKapwxd7fWpDmJMe +de6lfACKuI4StZiA5WlcxpOQiIG62XBppq7XOGzBlEP/EVTEN+g9AThdhSRH2sU7wHS kgegFSGf5GZPh0f6+CKJxpQWFzxFrc6JhxI7XKpH1iFdhNwGpqCLkLNb8ktGVzFtHUgz rfK6VEjhGXp/8rc8RYrPiucpwomieZHeknThZkGVQviJs7PBzvdYe8dBzFi/47rPIQsH e3y6l57CE9wPlPOYJksb/88WQX7OCYgTX4XNSKj+tTOzaldb+IpGsO81/bSyVICxs0S8 Lv5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=YojGNVfZuq9XNEJqZt+Fqigp3Eu2DKfOqh7hFRj96nY=; b=GPJi6b6Gx0CSUOTMiBUa/9KksHb+P/YSIX6v5AsyG5FDlR2jD6h5igkfqJF5o32rIa QOQXiqBZarpGwt3LyeSsCuSj+1T/PskJpLDv6M9qRuquejzvXiP94NGxwCh9ba1alv8G jgFZjctP5QDP1Hp51LiIKB0jVtmb7WBds0D+obJ8U9Iw/zcTr+jgg4A5em5Enk6+UVG5 sWLY0YcovqGIkMZFYC+uXLKJakJ6PgofqG+d8wYeEKdkE3ytNspKR/tALE5yJ7uTmhjE RymKK06T5IjrnT+/gri7zk75MpyZH4OYSL2Me44bPKVozpotmX/C9wi0Zq5Ok3urZ3Zg ujpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w1-v6si10199028pgw.546.2018.07.01.04.12.57; Sun, 01 Jul 2018 04:12:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752731AbeGALMz (ORCPT + 9 others); Sun, 1 Jul 2018 07:12:55 -0400 Received: from mx2.suse.de ([195.135.220.15]:47714 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752031AbeGALI7 (ORCPT ); Sun, 1 Jul 2018 07:08:59 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 8B3BCAE55; Sun, 1 Jul 2018 11:08:57 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jian-Hong Pan , Jiri Pirko , Marcel Holtmann , "David S . Miller" , Matthias Brugger , Janus Piwek , =?utf-8?q?Michael_R=C3=B6der?= , Dollar Chen , Ken Yu , =?utf-8?q?Andreas_F=C3=A4rber?= Subject: [RFC net-next 05/15] HACK: net: lora: Deal with .poll_mask in 4.18-rc2 Date: Sun, 1 Jul 2018 13:07:54 +0200 Message-Id: <20180701110804.32415-6-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180701110804.32415-1-afaerber@suse.de> References: <20180701110804.32415-1-afaerber@suse.de> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org linux-next and 4.18-rc2 both identify as LINUX_VERSION(4,18,0), but commit a11e1d432b51f63ba698d044441284a661f01144 (Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL) reverted .poll_mask to .poll again. Signed-off-by: Andreas Färber --- net/lora/dgram.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.16.4 diff --git a/net/lora/dgram.c b/net/lora/dgram.c index 4d931fd3778a..ef56fd90e762 100644 --- a/net/lora/dgram.c +++ b/net/lora/dgram.c @@ -217,7 +217,11 @@ const struct proto_ops dgram_proto_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = dgram_getname, +#if 0 /* LINUX_VERSION_CODE >= LINUX_VERSION(4, 18, 0) */ + .poll_mask = datagram_poll_mask, +#else .poll = datagram_poll, +#endif .ioctl = dgram_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,