From patchwork Tue Aug 14 15:05:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1320861 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 480313FC81 for ; Tue, 14 Aug 2012 15:07:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756520Ab2HNPGp (ORCPT ); Tue, 14 Aug 2012 11:06:45 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:52683 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756663Ab2HNPGm (ORCPT ); Tue, 14 Aug 2012 11:06:42 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so194033eei.19 for ; Tue, 14 Aug 2012 08:06:42 -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=kJBc4s/EfX0a32fT45IIcHaEGW45TOVUA8o7rvvjUE8=; b=JN9i2kVmdmZIotk/RDWIm3aWD9Bn2gNEW8Ynwr0jYmo/EV7Pu/Esk3hzPNrJRSki8J oSuQYj9dHGgNojFyyOmzC1q64ZrcP7RfowCC0leqUZmygpJTHR5Vhlsb5tFVGGRSzG57 jVChGhVk91iVWzS1WRVx74pePQe3De9nBn88ACSG64vglGoS7uL5MdLkbY7SThYwEIh2 PUHUPdZ0Vl/B1L9svq+1o8dYSbNV/gKuyaPW1XtxRINTT8+tKycMeKjtDxYbRn3QNiD2 fmAFMocUQVp7NI6q1D85g6xUZ9EvZTF0wQ1+AmlphewHM7jD6pZj83TLbaqpayCyMwoM ifog== Received: by 10.14.215.197 with SMTP id e45mr19728700eep.36.1344956801831; Tue, 14 Aug 2012 08:06:41 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id 9sm7577247eei.12.2012.08.14.08.06.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 08:06:41 -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 v2 15/15] net: kill dev->master Date: Tue, 14 Aug 2012 17:05:48 +0200 Message-Id: <1344956748-2099-16-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1344956748-2099-1-git-send-email-jiri@resnulli.us> References: <1344956748-2099-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmSWTkV6SAtwwBrC8baYxy7mQCHZ6SM6Tstalj0rvyfLNuV+IpQcQKGDdDMxLUUXgOwmKUL 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 c689593..8459f72 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() */