From patchwork Sun Dec 30 11:58:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [net-next,15/15] net: kill dev->master Date: Sun, 30 Dec 2012 01:58:22 -0000 From: Jiri Pirko X-Patchwork-Id: 208751 Message-Id: <1356868702-8144-16-git-send-email-jiri@resnulli.us> To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, bhutchings@solarflare.com, faisal.latif@intel.com, shemminger@vyatta.com, fbl@redhat.com, roland@kernel.org, sean.hefty@intel.com, hal.rosenstock@gmail.com, fubar@us.ibm.com, andy@greyhouse.net, divy@chelsio.com, jitendra.kalsaria@qlogic.com, sony.chacko@qlogic.com, linux-driver@qlogic.com, kaber@trash.net, ursula.braun@de.ibm.com, blaschka@linux.vnet.ibm.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, ebiederm@xmission.com, joe@perches.com, amwang@redhat.com, nhorman@tuxdriver.com, john.r.fastabend@intel.com, pablo@netfilter.org Nobody uses this now. Remove it. Signed-off-by: Jiri Pirko --- include/linux/netdevice.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c3723ef..009bad3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1167,10 +1167,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() */