From patchwork Mon Aug 13 15:27:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1313591 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 66B573FC8C for ; Mon, 13 Aug 2012 15:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149Ab2HMP20 (ORCPT ); Mon, 13 Aug 2012 11:28:26 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:64718 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191Ab2HMP2E (ORCPT ); Mon, 13 Aug 2012 11:28:04 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so1192531eei.19 for ; Mon, 13 Aug 2012 08:28:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=8l2nXAG1z1mC1yd/T+SqeBNKGQ3SRh2hPfr9o+brUjw=; b=Ybo+szB31o6dJGFyJnJXC7JKPF+7WHumPoBrM1R7pNkD7M1Af3+yX2SbmtF8DNKCQA piT7fjyWyvpBHRpGM6HRPQxSrZh+yKZ3jG3zvAKtTUWEwQIAnPeVLNRubRxweAxLNpFs +5pWQ86SdnwaTUeGQt4brvp1gS0p6pQ/Ns3tAst0Pd2cj8rOHcGgTT9G9dqjv/bTRciO kWCm7VFeNHqbENCTJUlpa+8cgAgH4M4O1L5pwG3LhaGaOc9q+CJDJg1Ceeo1k3P2yhzm 26wZzU0dmZIOy7P/YEb1ZV2iOYfNNdQkD9zMLUHKx5g8I9yft3kOlPPQv4DqWdZQG64v QAsg== Received: by 10.14.182.69 with SMTP id n45mr10382407eem.28.1344871683199; Mon, 13 Aug 2012 08:28:03 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id h42sm19862676eem.5.2012.08.13.08.28.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 08:28:02 -0700 (PDT) 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 16/16] net: kill dev->master Date: Mon, 13 Aug 2012 17:27:15 +0200 Message-Id: <1344871635-1052-17-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1344871635-1052-1-git-send-email-jiri@resnulli.us> References: <1344871635-1052-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQlOSG2t5VZpbeZtRPxrYJn8QkhmVgtj0pHO9KtRQBxuowW00LJXJBQFbHEhpTI5708ZxK5a 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 757f627..28c5ef0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1168,10 +1168,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() */