From patchwork Wed Apr 6 00:44:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWFoZXNoIEJhbmRld2FyICjgpK7gpLngpYfgpLYg4KSs4KSC4KSh4KWH4KS14KS+4KSwKQ==?= X-Patchwork-Id: 89976 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 1F210B6F01 for ; Wed, 6 Apr 2011 10:46:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754696Ab1DFApw (ORCPT ); Tue, 5 Apr 2011 20:45:52 -0400 Received: from smtp-out.google.com ([216.239.44.51]:54004 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754079Ab1DFAow (ORCPT ); Tue, 5 Apr 2011 20:44:52 -0400 Received: from wpaz9.hot.corp.google.com (wpaz9.hot.corp.google.com [172.24.198.73]) by smtp-out.google.com with ESMTP id p360iprn031867; Tue, 5 Apr 2011 17:44:51 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1302050691; bh=N4SLnzEbCS7CVeoJa0SYihhhe/U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=OcjK7Uos+0znShineV4aR39esfxJ4CN36S9/Gu6/6x2n7238YfK792ym6d90fPkKP zTQlFXnFgsLC/VYdOM68g== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=fcumwEWIQtQSUETOMncQOmFpGx67QpmR6nnCWemKYYz6o9oX4ixYXkbtGTiveF4/U Z6NAqkkTEAt5yWs7VrFcA== Received: from linuxrus.mtv.corp.google.com (linuxrus.mtv.corp.google.com [172.22.64.16]) by wpaz9.hot.corp.google.com with ESMTP id p360inu5028041; Tue, 5 Apr 2011 17:44:49 -0700 Received: by linuxrus.mtv.corp.google.com (Postfix, from userid 109155) id 7F20FC3C9E; Tue, 5 Apr 2011 17:44:48 -0700 (PDT) From: Mahesh Bandewar To: David Miller Cc: netdev , Mahesh Bandewar Subject: [PATCH 07/20] net-dsa: extending (hw_/wanted_/vlan_)features fields to a bitmap. Date: Tue, 5 Apr 2011 17:44:12 -0700 Message-Id: <1302050665-10460-8-git-send-email-maheshb@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1302050665-10460-7-git-send-email-maheshb@google.com> References: <1302050665-10460-1-git-send-email-maheshb@google.com> <1302050665-10460-2-git-send-email-maheshb@google.com> <1302050665-10460-3-git-send-email-maheshb@google.com> <1302050665-10460-4-git-send-email-maheshb@google.com> <1302050665-10460-5-git-send-email-maheshb@google.com> <1302050665-10460-6-git-send-email-maheshb@google.com> <1302050665-10460-7-git-send-email-maheshb@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Converting current use of (hw_/wanted_/vlan_)features to legacy_(hw_/wanted_/vlan_)features to differntiate from the proposed usage. Signed-off-by: Mahesh Bandewar --- net/dsa/slave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 64ca2a6..fb40250 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -349,7 +349,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, if (slave_dev == NULL) return slave_dev; - slave_dev->features = master->vlan_features; + slave_dev->legacy_features = master->legacy_vlan_features; SET_ETHTOOL_OPS(slave_dev, &dsa_slave_ethtool_ops); memcpy(slave_dev->dev_addr, master->dev_addr, ETH_ALEN); slave_dev->tx_queue_len = 0; @@ -375,7 +375,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, } SET_NETDEV_DEV(slave_dev, parent); - slave_dev->vlan_features = master->vlan_features; + slave_dev->legacy_vlan_features = master->legacy_vlan_features; p = netdev_priv(slave_dev); p->dev = slave_dev;