From patchwork Thu Jun 9 02:51:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UGV0ZXIgUGFuKOa9mOWNq+W5syk=?= X-Patchwork-Id: 99607 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 08314B6F82 for ; Thu, 9 Jun 2011 12:52:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752924Ab1FICvc (ORCPT ); Wed, 8 Jun 2011 22:51:32 -0400 Received: from mail-qy0-f174.google.com ([209.85.216.174]:48316 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460Ab1FICv3 (ORCPT ); Wed, 8 Jun 2011 22:51:29 -0400 Received: by mail-qy0-f174.google.com with SMTP id 7so2259713qyk.19 for ; Wed, 08 Jun 2011 19:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=6PGpEYwTZXCzaIry4OPxFp5OwsRLE/SZQ49TUe8eJ04=; b=gmNAvS5t9UmvD+LSfHISuprHZ35YH71N55iYxTEtdqTJQ9uTX1lpqJel6YKGmzXCgV 6EVL7kiUHYaPJeBG0Hu/TCO4GiJ1AydNp4+7XHKhTrk8O0JIaF+9RS/AsQJcYL/fdhiE rUFAiy87Vi8lpOMu4iZBp0oifFBk7F06nEnSs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=rFY8FR5a+DSNqzjiHWTlVSQIOgDfYHryta8vZSgmQKhWzLtAsNCSCQhKSQYYbGdDyk s0o9C5ieFwp9PFGMuORYAjb3iRh0sPzvjrJOeWifKHWon+jSxcT74i1np5W24AfK7Cd1 s4wZw1qbnOC9W3vCEwCeN4qt9y3+/vxK20DXA= Received: by 10.224.189.9 with SMTP id dc9mr134747qab.11.1307587888530; Wed, 08 Jun 2011 19:51:28 -0700 (PDT) Received: from localhost.localdomain.com ([60.247.97.98]) by mx.google.com with ESMTPS id u15sm924766qcq.24.2011.06.08.19.51.25 (version=SSLv3 cipher=OTHER); Wed, 08 Jun 2011 19:51:28 -0700 (PDT) From: Weiping Pan To: fubar@us.ibm.com, andy@greyhouse.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Weiping Pan Subject: [PATCH net-next 1/2] bonding: delete unused ad_timer Date: Thu, 9 Jun 2011 10:51:33 +0800 Message-Id: <1d1a90d2f5c7c2ced5eaf8eabffa4fdb770b0e6b.1307587586.git.panweiping3@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now we use agg_select_timer and ad_work. Signed-off-by: Weiping Pan --- drivers/net/bonding/bond_3ad.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 0ee3f16..fb67185 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -257,7 +257,6 @@ struct ad_bond_info { int lacp_fast; /* whether fast periodic tx should be * requested */ - struct timer_list ad_timer; }; struct ad_slave_info {