---

yaml --- r: 255491 b: refs/heads/master c: 0cc42eb h: refs/heads/master i: 255489: fb840e4 255487: 208e14c v: v3
git-mirror · Jun 9, 2011 · fbee6b3 · fbee6b3
1 parent cb8f43a
commit fbee6b3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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 {