aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Pan(潘卫平) <panweiping3@gmail.com>2011-06-08 21:19:04 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-09 15:02:19 -0700
commit0cc42eb608954c1d68be7ac51af7434e5fc45659 (patch)
tree5022fef7264d5402d8fed3adaf766f026c8d1537
parent1a14fbcbc96bd098540eb54b66976c20a73b8473 (diff)
bonding: delete unused ad_timer
Now we use agg_select_timer and ad_work. Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Weiping Pan <panweiping3@gmail.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_3ad.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 1682e691bbe..235b2cc58b2 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 {