From patchwork Fri Jan 4 08:49:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 209390 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A9F902C008D for ; Fri, 4 Jan 2013 19:51:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754452Ab3ADIu1 (ORCPT ); Fri, 4 Jan 2013 03:50:27 -0500 Received: from mail-ee0-f47.google.com ([74.125.83.47]:50044 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754526Ab3ADIuJ (ORCPT ); Fri, 4 Jan 2013 03:50:09 -0500 Received: by mail-ee0-f47.google.com with SMTP id e51so7794805eek.34 for ; Fri, 04 Jan 2013 00:50:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=nH00GFk23VO7OtU7K9RWyZ1Rt65mFMAphuTcZB6SNAE=; b=c8enYldcpLUZlXhIl4i0kagv9fEFL3aqsljVPpahy/NNjI0yasgdtltFGpeYsLRybJ GR2q0RxYZD78sNEb7Gskl1zkz4ICWpWLgjew5PJlYr4O/hv/uBhhia3zBjXBShBBO+kV EsWqTCxtEjAob/ebg2OmQYWHI2eQM8lJSVe+ELmT62zd0acqtttma8ygEzqv23o6Ygts 17wonvaqFM3i7HOUHZ3gtASvhRn0E0ZvYWg4gPG+MZ+NG/Z3rKncv5eSJ+grc/o4bgUU ftUCZb53+kV5U43q/APaewWFAtH1SK0D4RLs2mMwzRDcz9rmtM0FWza/nmFhKfOxmojI lCuw== X-Received: by 10.14.194.195 with SMTP id m43mr142185954een.44.1357289408397; Fri, 04 Jan 2013 00:50:08 -0800 (PST) Received: from localhost (ip-89-103-8-129.net.upcbroadband.cz. [89.103.8.129]) by mx.google.com with ESMTPS id 6sm109291687eea.3.2013.01.04.00.50.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 00:50:07 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, faisal.latif@intel.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, linux390@de.ibm.com, shemminger@vyatta.com, bhutchings@solarflare.com, therbert@google.com, xiyou.wangcong@gmail.com, joe@perches.com, gregory.v.rose@intel.com, john.r.fastabend@intel.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, bridge@lists.linux-foundation.org, fbl@redhat.com Subject: [patch net-next V6 15/15] net: kill dev->master Date: Fri, 4 Jan 2013 09:49:03 +0100 Message-Id: <1357289343-817-16-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1357289343-817-1-git-send-email-jiri@resnulli.us> References: <1357289343-817-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQnhnKMAS61UBqLhb1Rupj2An8Z0KxNYDLvFsc3v7xteTlpllNCi/Ol2qC0jwk6jFPlkv3Zt Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.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() */