From patchwork Wed Apr 6 00:44:19 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: 89973 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 636F3B6EF7 for ; Wed, 6 Apr 2011 10:45:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754624Ab1DFApn (ORCPT ); Tue, 5 Apr 2011 20:45:43 -0400 Received: from smtp-out.google.com ([216.239.44.51]:54012 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133Ab1DFAox (ORCPT ); Tue, 5 Apr 2011 20:44:53 -0400 Received: from kpbe12.cbf.corp.google.com (kpbe12.cbf.corp.google.com [172.25.105.76]) by smtp-out.google.com with ESMTP id p360ipQI015249; Tue, 5 Apr 2011 17:44:52 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1302050692; bh=tdGqbmZ4I3LktOvpb2QSPFZXVPw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=uqTh5R2TppXgDJFPcCcTKaVd5GlwGvWrMTBftygfxG9lOt0vzdkD5GYmn5ZdFS1Kl D+wbIAT2w08mH3C+ax9MQ== 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=bzANy4yeHEyEcCUM0w1wLlZS+ogsJ4c/mSMSsNnFCE3hMsNIZs0MMHy1XnflaMUlW oWHQoDaEAKtTEuMSO3S5w== Received: from linuxrus.mtv.corp.google.com (linuxrus.mtv.corp.google.com [172.22.64.16]) by kpbe12.cbf.corp.google.com with ESMTP id p360io87028946; Tue, 5 Apr 2011 17:44:50 -0700 Received: by linuxrus.mtv.corp.google.com (Postfix, from userid 109155) id 91547C3CA5; Tue, 5 Apr 2011 17:44:48 -0700 (PDT) From: Mahesh Bandewar To: David Miller Cc: netdev , Mahesh Bandewar Subject: [PATCH 14/20] jme: extending (hw_/wanted_/vlan_)features fields to a bitmap. Date: Tue, 5 Apr 2011 17:44:19 -0700 Message-Id: <1302050665-10460-15-git-send-email-maheshb@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1302050665-10460-14-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> <1302050665-10460-8-git-send-email-maheshb@google.com> <1302050665-10460-9-git-send-email-maheshb@google.com> <1302050665-10460-10-git-send-email-maheshb@google.com> <1302050665-10460-11-git-send-email-maheshb@google.com> <1302050665-10460-12-git-send-email-maheshb@google.com> <1302050665-10460-13-git-send-email-maheshb@google.com> <1302050665-10460-14-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 --- drivers/net/jme.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/jme.c b/drivers/net/jme.c index be4773f..10b972e 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -741,7 +741,7 @@ jme_set_clean_rxdesc(struct jme_adapter *jme, int i) rxdesc->desc1.bufaddrl = cpu_to_le32( (__u64)rxbi->mapping & 0xFFFFFFFFUL); rxdesc->desc1.datalen = cpu_to_le16(rxbi->len); - if (jme->dev->features & NETIF_F_HIGHDMA) + if (jme->dev->legacy_features & NETIF_F_HIGHDMA) rxdesc->desc1.flags = RXFLAG_64BIT; wmb(); rxdesc->desc1.flags |= RXFLAG_OWN | RXFLAG_INT; @@ -1917,7 +1917,7 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) struct jme_ring *txring = &(jme->txring[0]); struct txdesc *txdesc = txring->desc, *ctxdesc; struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; - u8 hidma = jme->dev->features & NETIF_F_HIGHDMA; + u8 hidma = jme->dev->legacy_features & NETIF_F_HIGHDMA; int i, nr_frags = skb_shinfo(skb)->nr_frags; int mask = jme->tx_ring_mask; struct skb_frag_struct *frag; @@ -2911,13 +2911,13 @@ jme_init_one(struct pci_dev *pdev, netdev->netdev_ops = &jme_netdev_ops; netdev->ethtool_ops = &jme_ethtool_ops; netdev->watchdog_timeo = TX_TIMEOUT; - netdev->hw_features = NETIF_F_IP_CSUM | + netdev->legacy_hw_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_RXCSUM; - netdev->features = NETIF_F_IP_CSUM | + netdev->legacy_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG | NETIF_F_TSO | @@ -2925,7 +2925,7 @@ jme_init_one(struct pci_dev *pdev, NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; if (using_dac) - netdev->features |= NETIF_F_HIGHDMA; + netdev->legacy_features |= NETIF_F_HIGHDMA; SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); @@ -3002,7 +3002,7 @@ jme_init_one(struct pci_dev *pdev, jme->reg_gpreg1 = GPREG1_DEFAULT; if (jme->reg_rxmcs & RXMCS_CHECKSUM) - netdev->features |= NETIF_F_RXCSUM; + netdev->legacy_features |= NETIF_F_RXCSUM; /* * Get Max Read Req Size from PCI Config Space