From patchwork Thu Jan 16 02:05:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 311540 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 D72342C009A for ; Thu, 16 Jan 2014 13:09:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752403AbaAPCJr (ORCPT ); Wed, 15 Jan 2014 21:09:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21525 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbaAPCJj (ORCPT ); Wed, 15 Jan 2014 21:09:39 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0G29aLd008358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 Jan 2014 21:09:36 -0500 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0G29RRa003254; Wed, 15 Jan 2014 21:09:34 -0500 From: Veaceslav Falico To: netdev@vger.kernel.org Cc: Veaceslav Falico , Jay Vosburgh , Andy Gospodarek Subject: [PATCH net-next 4/6] bonding: rename slave_last_rx() to slave_last_arp_rx() Date: Thu, 16 Jan 2014 03:05:14 +0100 Message-Id: <1389837916-5377-5-git-send-email-vfalico@redhat.com> In-Reply-To: <1389837916-5377-1-git-send-email-vfalico@redhat.com> References: <1389837916-5377-1-git-send-email-vfalico@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To make the code more readable. CC: Jay Vosburgh CC: Andy Gospodarek Signed-off-by: Veaceslav Falico --- drivers/net/bonding/bond_main.c | 4 ++-- drivers/net/bonding/bonding.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1e0f21a..399e691 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2347,7 +2347,7 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, if (bond_is_active_slave(slave)) bond_validate_arp(bond, slave, sip, tip); else if (bond->curr_active_slave && - time_after(slave_last_rx(bond, bond->curr_active_slave), + time_after(slave_last_arp_rx(bond, bond->curr_active_slave), bond->curr_active_slave->jiffies)) bond_validate_arp(bond, slave, tip, sip); @@ -2504,7 +2504,7 @@ static int bond_ab_arp_inspect(struct bonding *bond) bond_for_each_slave_rcu(bond, slave, iter) { slave->new_link = BOND_LINK_NOCHANGE; - last_rx = slave_last_rx(bond, slave); + last_rx = slave_last_arp_rx(bond, slave); if (slave->link != BOND_LINK_UP) { if (bond_time_in_interval(bond, last_rx, 1)) { diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 1af8c1f..99126b2 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -341,8 +341,8 @@ static inline unsigned long slave_oldest_target_arp_rx(struct bonding *bond, return ret; } -static inline unsigned long slave_last_rx(struct bonding *bond, - struct slave *slave) +static inline unsigned long slave_last_arp_rx(struct bonding *bond, + struct slave *slave) { if (bond->params.arp_all_targets == BOND_ARP_TARGETS_ALL) return slave_oldest_target_arp_rx(bond, slave);