From patchwork Wed Jan 2 12:28:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1923401 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 64A00DF230 for ; Wed, 2 Jan 2013 12:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752766Ab3ABMgA (ORCPT ); Wed, 2 Jan 2013 07:36:00 -0500 Received: from mail-ea0-f176.google.com ([209.85.215.176]:42421 "EHLO mail-ea0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752670Ab3ABMf6 (ORCPT ); Wed, 2 Jan 2013 07:35:58 -0500 Received: by mail-ea0-f176.google.com with SMTP id d13so5658361eaa.7 for ; Wed, 02 Jan 2013 04:35:56 -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=j0hz3jYFLzXDiPjNqauJ/TnuM6D/7hX647RE80IgqzULQ7irLh+qB2txmumMYgY3S2 gdwfxflA3Y8BRqUT/sHMLyNUkpFS7wNtEzDv8rcWOGLT6WpdCo65gXE2p8PlqgZH1bT6 /jQQxD8GD+C/GuBfa0IoWTgy4TcezihzNqIy87ZQPu6g/sm6hJSfpIJ3g46tjseUnbWj lv0XXEEZIaGBq9B0sH99PmiiuSLvTPNwQvHcmkq1WRA2sDqLlhPgROwOeXlgUmr5x1od xS3hXDf99WOFb6B5siL3E4v9lqmp+vj6d2lRhlrBPoK2AeCUXHmez4TpsV2TwyJgk7Ca gkkg== X-Received: by 10.14.173.69 with SMTP id u45mr125269519eel.21.1357129774322; Wed, 02 Jan 2013 04:29:34 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id 44sm97196185eek.0.2013.01.02.04.29.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Jan 2013 04:29:33 -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 V5 15/15] net: kill dev->master Date: Wed, 2 Jan 2013 13:28:36 +0100 Message-Id: <1357129716-2450-16-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1357129716-2450-1-git-send-email-jiri@resnulli.us> References: <1357129716-2450-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQkaq4rx/lqOf2VX2PPB7U5sd9W52xOoCM7aEsopTyjyvOoPZ5Ez3O51MRUssCmoEyQPiG7w Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@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() */