From patchwork Sat Jan 26 22:00:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10782625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF81A1850 for ; Sat, 26 Jan 2019 22:01:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC3822C973 for ; Sat, 26 Jan 2019 22:01:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA29A2C97B; Sat, 26 Jan 2019 22:01:00 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 0BCBB2C946 for ; Sat, 26 Jan 2019 22:00:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726381AbfAZWA6 (ORCPT ); Sat, 26 Jan 2019 17:00:58 -0500 Received: from mx2.mailbox.org ([80.241.60.215]:28286 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726392AbfAZWA6 (ORCPT ); Sat, 26 Jan 2019 17:00:58 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 67541A12ED; Sat, 26 Jan 2019 23:00:57 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id JWfOaJc1jp36; Sat, 26 Jan 2019 23:00:56 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 5/7] backports: Add extra parameter to dev_open() Date: Sat, 26 Jan 2019 23:00:31 +0100 Message-Id: <20190126220033.27634-6-hauke@hauke-m.de> In-Reply-To: <20190126220033.27634-1-hauke@hauke-m.de> References: <20190126220033.27634-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP dev_open() got the extra parameter extack in Linux commit 00f54e68924e ("net: core: dev: Add extack argument to dev_open()"), just ignore it on older kernel versions. This is used by the hostap driver. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/netdevice.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index 44319331..c3e91a0c 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -358,4 +358,12 @@ static inline int _bp_netdev_upper_dev_link(struct net_device *dev, macro_dispatcher(netdev_upper_dev_link, __VA_ARGS__)(__VA_ARGS__) #endif +#if LINUX_VERSION_IS_LESS(5,0,0) +static inline int backport_dev_open(struct net_device *dev, struct netlink_ext_ack *extack) +{ + return dev_open(dev); +} +#define dev_open LINUX_BACKPORT(dev_open) +#endif + #endif /* __BACKPORT_NETDEVICE_H */