From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mahesh Bandewar Subject: [PATCH 15/20] sungem: extending (hw_/wanted_/vlan_)features fields to a bitmap. Date: Tue, 5 Apr 2011 17:44:20 -0700 Message-ID: <1302050665-10460-16-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> <1302050665-10460-15-git-send-email-maheshb@google.com> Cc: netdev , Mahesh Bandewar To: David Miller Return-path: Received: from smtp-out.google.com ([74.125.121.67]:28066 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754230Ab1DFAoz (ORCPT ); Tue, 5 Apr 2011 20:44:55 -0400 In-Reply-To: <1302050665-10460-15-git-send-email-maheshb@google.com> Sender: netdev-owner@vger.kernel.org List-ID: 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/sungem.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index a935426..8ee36c1 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -3146,10 +3146,11 @@ static int __devinit gem_init_one(struct pci_dev *pdev, gp->phy_mii.def ? gp->phy_mii.def->name : "no"); /* GEM can do it all... */ - dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM; - dev->features |= dev->hw_features | NETIF_F_RXCSUM | NETIF_F_LLTX; + dev->legacy_hw_features = NETIF_F_SG | NETIF_F_HW_CSUM; + dev->legacy_features |= + dev->legacy_hw_features | NETIF_F_RXCSUM | NETIF_F_LLTX; if (pci_using_dac) - dev->features |= NETIF_F_HIGHDMA; + dev->legacy_features |= NETIF_F_HIGHDMA; return 0; -- 1.7.3.1