From patchwork Wed Apr 3 20:44:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1076399 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="VIQ+erz6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44ZJ3M6S7cz9sSS for ; Thu, 4 Apr 2019 07:44:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726444AbfDCUob (ORCPT ); Wed, 3 Apr 2019 16:44:31 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:40169 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726167AbfDCUoa (ORCPT ); Wed, 3 Apr 2019 16:44:30 -0400 Received: by mail-wm1-f68.google.com with SMTP id z24so389240wmi.5 for ; Wed, 03 Apr 2019 13:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=10ORjpIz3nOZlxQn8U+PBvymmrFpvVsbmKnz9xcvDSU=; b=VIQ+erz6rBkxnwHGiA59xYtgi5rdeLE5b7QOJdz8xrWfm5guINKEQVzQcOCC2AgWHE d4nljZRyDy+uGuJWjkxuIWTjphv5jfzKHKkDAw6o+xpXPUnEDT6d8AeJYwrbmA1p+SAX n/8G9zs2HcLQWadlcq8qFwIpNag4x+WRO1D7U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=10ORjpIz3nOZlxQn8U+PBvymmrFpvVsbmKnz9xcvDSU=; b=aN6jsfeYXvHXtc93bKJKxPcZ1olM+ZLSk7s4oGNlIqpLaXuFdS2s4G45ea2+CFeFt3 DBoVRcjFiYHqrKxKy2WEToZ/rVVnX/zp5FFyemUnEqzbrpxdBJo3kfNN3xnXlMC0bmJ1 FXmIvnv+2ThHh1L1AySoh2Orojr/5My4JIr6coyK5CmJdBZVWjO+OC/DifgdhN0Ehrtl BqrRWIFKD59oBe5V7MFX+0Gsw6eIhpnRr7G+AgFLHxjAdxyN8d4tYz1/FGLxhk+JOOWj TY+6i0fE8f+8Br3itWKbSzzHzrCpLpMeLqImc6qRXKm4aw20oRbzHY+gOFPMunA4gqy/ dgig== X-Gm-Message-State: APjAAAVd0dNOjTqiryeG8tOTavBERoNXN1ItxZqhC/S8oRklIlITJRuR l3cy1ZAyjLC/vo4K7iJpumxDyT/kJlocPw== X-Google-Smtp-Source: APXvYqwnA6xX0Ls6FMUdEBYLEJfz4YkzxnAcONm/FH6+GiQT1goIWyD3vg0d29y4tpTj9fUFGioToA== X-Received: by 2002:a05:600c:c4:: with SMTP id u4mr1370692wmm.80.1554324268496; Wed, 03 Apr 2019 13:44:28 -0700 (PDT) Received: from localhost.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id o130sm26739307wmo.43.2019.04.03.13.44.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 13:44:27 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, Nikolay Aleksandrov Subject: [PATCH net-next] net: bridge: mcast: remove unused br_ip_equal function Date: Wed, 3 Apr 2019 23:44:18 +0300 Message-Id: <20190403204418.3946-1-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since the mcast conversion to rhashtable this function has been unused, so remove it. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_multicast.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index f5343dfac282..afef6fc2c074 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -65,23 +65,6 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br, __u16 vid, const unsigned char *src); #endif -static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b) -{ - if (a->proto != b->proto) - return 0; - if (a->vid != b->vid) - return 0; - switch (a->proto) { - case htons(ETH_P_IP): - return a->u.ip4 == b->u.ip4; -#if IS_ENABLED(CONFIG_IPV6) - case htons(ETH_P_IPV6): - return ipv6_addr_equal(&a->u.ip6, &b->u.ip6); -#endif - } - return 0; -} - static struct net_bridge_mdb_entry *br_mdb_ip_get_rcu(struct net_bridge *br, struct br_ip *dst) {