From patchwork Fri Sep 4 03:02:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 32966 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 7FB57B70BA for ; Fri, 4 Sep 2009 13:02:41 +1000 (EST) Received: by ozlabs.org (Postfix) id 6B117DDDA0; Fri, 4 Sep 2009 13:02:41 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id E8736DDD0B for ; Fri, 4 Sep 2009 13:02:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932725AbZIDDC2 (ORCPT ); Thu, 3 Sep 2009 23:02:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932771AbZIDDC1 (ORCPT ); Thu, 3 Sep 2009 23:02:27 -0400 Received: from sj-iport-5.cisco.com ([171.68.10.87]:6569 "EHLO sj-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932768AbZIDDC0 (ORCPT ); Thu, 3 Sep 2009 23:02:26 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmcFAAcgoEqrR7O6/2dsb2JhbACBU5pqpV+IQQGQKwWEGw X-IronPort-AV: E=Sophos;i="4.44,329,1249257600"; d="scan'208";a="92985254" Received: from sj-dkim-2.cisco.com ([171.71.179.186]) by sj-iport-5.cisco.com with ESMTP; 04 Sep 2009 03:02:29 +0000 Received: from sj-core-2.cisco.com (sj-core-2.cisco.com [171.71.177.254]) by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id n8432TF4013468; Thu, 3 Sep 2009 20:02:29 -0700 Received: from palito_client100.nuovasystems.com (savbu-palito-client100.cisco.com [10.193.70.13]) by sj-core-2.cisco.com (8.13.8/8.14.3) with ESMTP id n8432TIx010248; Fri, 4 Sep 2009 03:02:29 GMT From: Scott Feldman Subject: [net-next PATCH 08/11] enic: bug fix: enable VLAN filtering To: davem@davemloft.net Cc: netdev@vger.kernel.org Date: Thu, 03 Sep 2009 20:02:29 -0700 Message-ID: <20090904030229.5047.47659.stgit@palito_client100.nuovasystems.com> In-Reply-To: <20090904030046.5047.46509.stgit@palito_client100.nuovasystems.com> References: <20090904030046.5047.46509.stgit@palito_client100.nuovasystems.com> User-Agent: StGIT/0.12.1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=776; t=1252033349; x=1252897349; c=relaxed/simple; s=sjdkim2002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=scofeldm@cisco.com; z=From:=20Scott=20Feldman=20 |Subject:=20[net-next=20PATCH=2008/11]=20enic=3A=20bug=20fi x=3A=20enable=20VLAN=20filtering |Sender:=20; bh=vYy7XTOAIHt8GsbffT1fkZ3adj9T2nkEUujxV+0cZos=; b=DGosYZ/21lAuI4rwDDGPo0+HW1ecw31BGKiBzuwBbihL7yfN5oeXtswpzV HOQcsSYYNFPtKJ3DNvnJHlqjoN161bdhKzRr1+D+abO6tP1RMPYKAYrbQ3PV dA6Q9j1zOA; Authentication-Results: sj-dkim-2; header.From=scofeldm@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org enic: bug fix: enable VLAN filtering Bug fix: enable VLAN filtering Signed-off-by: Scott Feldman --- drivers/net/enic/enic_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 6068904..3a55669 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1967,7 +1967,8 @@ static int __devinit enic_probe(struct pci_dev *pdev, break; } - netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; + netdev->features |= NETIF_F_HW_VLAN_TX | + NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; if (ENIC_SETTING(enic, TXCSUM)) netdev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; if (ENIC_SETTING(enic, TSO))