From patchwork Mon Jan 26 06:17:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 432659 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 03DAC140188 for ; Mon, 26 Jan 2015 17:20:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752912AbbAZGUV (ORCPT ); Mon, 26 Jan 2015 01:20:21 -0500 Received: from mail-qc0-f171.google.com ([209.85.216.171]:60423 "EHLO mail-qc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbbAZGUT (ORCPT ); Mon, 26 Jan 2015 01:20:19 -0500 Received: by mail-qc0-f171.google.com with SMTP id s11so5694275qcv.2 for ; Sun, 25 Jan 2015 22:20:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=52UNEYfSuLS823e3W9QwZqkE3Jbtc6LiZkK8Q01Eq8I=; b=IYVSXUqt4EMEjdENA6G4Pd+dfOHnYhvURMLhizbq8l7mlJ+It8hgfc/YnZltbGWFMI wosvoxJsDsqu8wiJ/UcAk2kPWvv1a2zGLpJ9HHv7jA/8EDiqlCKnT3mhBcfKan0Z7/8j lB8c172OQe2gIAleXhnsVNpiIQkj1oAYZ9vFs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=52UNEYfSuLS823e3W9QwZqkE3Jbtc6LiZkK8Q01Eq8I=; b=ftEZlHn81jNqSetJ2vd+Y9PfJzVZEgpVL/P9VCYPbP9ehSCgR15AX6SaHrD36Dtywq aE7br/78Uo7F9f1FXBn6kdNHRNOrcjB+xmOX6LWV3YAB6/yEA8Qqunj17OXuk5poD4Oj kXAmoAxoFq1fNlqSTKzTgXYmBjmbNtxZRTTd0bcu50CMRAJS0PbgteEGEztI/rRh9RtA F5FgHNsCcwcLm6JyAp+3InjXB89UiBE+LVhW+z4UnxjGM4OOIIfoelWkNC3PFXsbJyn7 IMUNj0QLsio1OjVzHJyPg3AOQGjJuZOmD2jarEn4McsCHOCcOT8ZGPcxTjZgXW3QVoQR dHNA== X-Gm-Message-State: ALoCoQlDG/o2WjVOywwjlA+M/a1uloK7zqVFViTaN1laK/a76CYuVQJYlXi/kM3rGGUgOUNUY8w+ X-Received: by 10.229.236.129 with SMTP id kk1mr13792700qcb.20.1422253219151; Sun, 25 Jan 2015 22:20:19 -0800 (PST) Received: from debian-devel.instigatornetwork.net (cpe-173-095-150-122.nc.res.rr.com. [173.95.150.122]) by mx.google.com with ESMTPSA id r9sm5530610qac.27.2015.01.25.22.20.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2015 22:20:18 -0800 (PST) From: Jonathan Toppins To: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek Cc: netdev@vger.kernel.org Subject: [PATCH net-next v2 5/5] bonding: cleanup and remove dead code Date: Mon, 26 Jan 2015 01:17:01 -0500 Message-Id: <1422253021-3798-6-git-send-email-jtoppins@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422253021-3798-1-git-send-email-jtoppins@cumulusnetworks.com> References: <1422253021-3798-1-git-send-email-jtoppins@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fix sparse warning about non-static function drivers/net/bonding/bond_main.c:3737:5: warning: symbol 'bond_3ad_xor_xmit' was not declared. Should it be static? Reviewed-by: Nikolay Aleksandrov Signed-off-by: Jonathan Toppins Signed-off-by: Jay Vosburgh --- drivers/net/bonding/bond_main.c | 2 +- include/net/bond_3ad.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index c475d90..67437f3 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3734,7 +3734,7 @@ out: * usable slave array is formed in the control path. The xmit function * just calculates hash and sends the packet out. */ -int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev) +static int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev) { struct bonding *bond = netdev_priv(dev); struct slave *slave; diff --git a/include/net/bond_3ad.h b/include/net/bond_3ad.h index e01d903..f04cdbb 100644 --- a/include/net/bond_3ad.h +++ b/include/net/bond_3ad.h @@ -274,7 +274,6 @@ void bond_3ad_handle_link_change(struct slave *slave, char link); int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info); int __bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info); -int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev); int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); int bond_3ad_set_carrier(struct bonding *bond);