From 561f6af92bd2d282411ade317057ccd4f674e0f1 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Thu, 3 Jan 2013 22:49:03 +0000 Subject: [PATCH] --- yaml --- r: 351286 b: refs/heads/master c: 85464ef271a0f5496f404c6a2f2dfbf1d76e1a49 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0adae52b1434..03a08f7beae4 100644 --- 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 index 3cad8eab02b6..0209ac328e8a 100644 --- 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() */