Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757084Ab1FIHTk (ORCPT ); Thu, 9 Jun 2011 03:19:40 -0400 Received: from mail-qy0-f181.google.com ([209.85.216.181]:36517 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756882Ab1FIHSn (ORCPT ); Thu, 9 Jun 2011 03:18:43 -0400 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=KTwhck5bATVmUADQqpqY0lzT0FpsGcTWoAJeQtjBYc3omkYk/Z+aSzVaQ2ezveIeO6 52EFnNV7jQL5QZbN7pZSM1lCp0fKC9qzTIMyFGikGTRR4pYaUVbmDN6Oz4bQ5h3reaHO DLQzMylupFKBboQ/PDBdfnrKAWVpifrjTLu5s= 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 4/5] bonding: delete unused ad_timer Date: Thu, 9 Jun 2011 15:19:04 +0800 Message-Id: <5fd74a13b14c3bd39f6f033dc0ddc48fb9c2c3b6.1307603621.git.panweiping3@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 952 Lines: 28 Now we use agg_select_timer and ad_work. Reviewed-by: WANG Cong 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 1682e69..235b2cc 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -253,7 +253,6 @@ struct ad_system { struct ad_bond_info { struct ad_system system; /* 802.3ad system structure */ u32 agg_select_timer; // Timer to select aggregator after all adapter's hand shakes - struct timer_list ad_timer; }; struct ad_slave_info { -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/