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 {