From patchwork Fri Jan 16 15:57:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 429915 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 975C4140273 for ; Sat, 17 Jan 2015 02:57:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755289AbbAPP5v (ORCPT ); Fri, 16 Jan 2015 10:57:51 -0500 Received: from mail-qg0-f51.google.com ([209.85.192.51]:45562 "EHLO mail-qg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756546AbbAPP5q (ORCPT ); Fri, 16 Jan 2015 10:57:46 -0500 Received: by mail-qg0-f51.google.com with SMTP id i50so16842438qgf.10 for ; Fri, 16 Jan 2015 07:57:45 -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=Y8jgoK/0MHrIyncLP/pE3oaUXJC2eQrtxqcLM8Mthz8=; b=Z0l0vF92d30gfEchNYMkN+xx/L0PVAz/ttHp7T4OSzYzRjZ10NLjHq/WqoUqhHNG6o rI8RZaUvdxXQJhuXNpvjVKIIsLpaF9CLLmiz27Xg2dIEQt9vW500YvXLkm2TUjWy0KH3 fXsPlpU5Jkk5j9WEBqRszmJ+W5V+qJR/2d8CQ= 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=Y8jgoK/0MHrIyncLP/pE3oaUXJC2eQrtxqcLM8Mthz8=; b=HcQvzlk2RCKqcnDIgQcLDYPtY+tA3XVR9RoRLSfqigY6pz4b0jwpX5fWhYBT0itZY4 GfpLvPF3LJwfS3Dmcave0UszIMOgnFn54RFnJBeU6DuPSOxdmIDFlkciH2cWgfspTsiX 0dQKXDleSo1HUUvw4+2JedRWVYqpB7d1WVNVAeAtU9Id7/4/XCPORhpbosDXInceEUzb FY+yu6gI8KDM32gngc3LJMQYdnpjMfAyeCqMv1iLXw8P3yZR+OJ8ZwbOa5qGXQE12ijr aHdmhtpn9pzbDxvywh7gqZhOJ3LFP7azhNo5I3ahLufqfrx2tN0U5ZFdq2Nxlh0Khs2w DVbg== X-Gm-Message-State: ALoCoQn6il6e2+nUq/NpgDGpjyfp6hItJVnJomD4dIEY7NzANFKSMno5NOAH8ZLu/YhYitqTsivj X-Received: by 10.229.79.69 with SMTP id o5mr23489947qck.13.1421423865391; Fri, 16 Jan 2015 07:57:45 -0800 (PST) Received: from debian-devel.rtplab.test (rrcs-24-171-185-114.midsouth.biz.rr.com. [24.171.185.114]) by mx.google.com with ESMTPSA id y95sm4475377qgy.14.2015.01.16.07.57.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jan 2015 07:57:44 -0800 (PST) From: Jonathan Toppins To: netdev@vger.kernel.org Cc: Jonathan Toppins Subject: [PATCH net-next 5/5] bonding: cleanup and remove dead code Date: Fri, 16 Jan 2015 10:57:28 -0500 Message-Id: <1421423848-414-6-git-send-email-jtoppins@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1421423848-414-1-git-send-email-jtoppins@cumulusnetworks.com> References: <1421423848-414-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? Signed-off-by: Jonathan Toppins --- 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);