From patchwork Tue Aug 7 23:24:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 954729 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41lVwT6C30z9s4c; Wed, 8 Aug 2018 09:24:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fnBL8-0007TX-R4; Tue, 07 Aug 2018 23:24:34 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fnBL7-0007Sd-3c for kernel-team@lists.ubuntu.com; Tue, 07 Aug 2018 23:24:33 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fnBL6-0002fA-Nu for kernel-team@lists.ubuntu.com; Tue, 07 Aug 2018 23:24:32 +0000 Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1fnBL4-0002jx-3n for kernel-team@lists.ubuntu.com; Tue, 07 Aug 2018 16:24:30 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [Bionic][PATCH] UBUNTU: SAUCE: fix warning from "ipvlan: drop ipv6 dependency" Date: Tue, 7 Aug 2018 16:24:29 -0700 Message-Id: <1533684269-10495-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently introduced an unused function ipvlan_is_valid_dev(), which should be dropped. Ignore: yes Signed-off-by: Kamal Mostafa Acked-by: Joseph Salisbury Acked-by: Khalid Elmously --- drivers/net/ipvlan/ipvlan_main.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 0cfbcdf..b858e98 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -847,19 +847,6 @@ static void ipvlan_del_addr(struct ipvl_dev *ipvlan, void *iaddr, bool is_v6) kfree_rcu(addr, rcu); } -static bool ipvlan_is_valid_dev(const struct net_device *dev) -{ - struct ipvl_dev *ipvlan = netdev_priv(dev); - - if (!netif_is_ipvlan(dev)) - return false; - - if (!ipvlan || !ipvlan->port) - return false; - - return true; -} - #if IS_ENABLED(CONFIG_IPV6) static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr) {