From fbee6b309cd0a75dc1adc45a03610cc1a75ac885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Pan=28=E6=BD=98=E5=8D=AB=E5=B9=B3=29?= Date: Wed, 8 Jun 2011 21:19:04 +0000 Subject: [PATCH] --- yaml --- r: 255491 b: refs/heads/master c: 0cc42eb608954c1d68be7ac51af7434e5fc45659 h: refs/heads/master i: 255489: fb840e45e7ce7e9ee6ac798befcffa6fd989ba69 255487: 208e14c3e5e50bebc8173771005125e44db5feef v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e760bd8d8d1..d174a7b9f527 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a14fbcbc96bd098540eb54b66976c20a73b8473 +refs/heads/master: 0cc42eb608954c1d68be7ac51af7434e5fc45659 diff --git a/trunk/drivers/net/bonding/bond_3ad.h b/trunk/drivers/net/bonding/bond_3ad.h index 1682e691bbe3..235b2cc58b28 100644 --- a/trunk/drivers/net/bonding/bond_3ad.h +++ b/trunk/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 {