---

yaml --- r: 351286 b: refs/heads/master c: 85464ef h: refs/heads/master v: v3
git-mirror · Jan 4, 2013 · 561f6af · 561f6af
1 parent 46f0ff0
commit 561f6af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b98a70c28a607a02b3c3d41bc9a4c141f421052
+refs/heads/master: 85464ef271a0f5496f404c6a2f2dfbf1d76e1a49
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -1169,10 +1169,6 @@ struct net_device {
 						 * avoid dirtying this cache line.
 						 */
 
-	struct net_device	*master; /* Pointer to master device of a group,
-					  * which this device is member of.
-					  */
-
 	struct list_head	upper_dev_list; /* List of upper devices */
 
 	/* Interface address info used in eth_type_trans() */