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() */