From patchwork Fri Aug 1 20:27:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Brown, Aaron F" X-Patchwork-Id: 375862 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 D3198140116 for ; Sat, 2 Aug 2014 06:23:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756150AbaHAUXY (ORCPT ); Fri, 1 Aug 2014 16:23:24 -0400 Received: from mga03.intel.com ([143.182.124.21]:60887 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754818AbaHAUXW (ORCPT ); Fri, 1 Aug 2014 16:23:22 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 01 Aug 2014 13:23:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,782,1400050800"; d="scan'208";a="464101544" Received: from unknown (HELO s252.jf.intel.com) ([10.166.34.165]) by azsmga001.ch.intel.com with ESMTP; 01 Aug 2014 13:23:22 -0700 From: Aaron Brown To: davem@davemloft.net Cc: Vasu Dev , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, Aaron Brown Subject: [net-next 03/14] i40e: adds FCoE to build and updates its documentation Date: Fri, 1 Aug 2014 13:27:04 -0700 Message-Id: <1406924835-31550-4-git-send-email-aaron.f.brown@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406924835-31550-1-git-send-email-aaron.f.brown@intel.com> References: <1406924835-31550-1-git-send-email-aaron.f.brown@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vasu Dev Adds newly added FCoE files to the build but only if FCoE module is configured. Also, updates i40e document for added FCoE support. Signed-off-by: Vasu Dev Tested-by: Jack Morgan Signed-off-by: Aaron Brown --- Documentation/networking/i40e.txt | 7 +++++-- drivers/net/ethernet/intel/i40e/Makefile | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/networking/i40e.txt b/Documentation/networking/i40e.txt index f737273..a251bf4 100644 --- a/Documentation/networking/i40e.txt +++ b/Documentation/networking/i40e.txt @@ -69,8 +69,11 @@ Additional Configurations FCoE ---- - Fiber Channel over Ethernet (FCoE) hardware offload is not currently - supported. + The driver supports Fiber Channel over Ethernet (FCoE) and Data Center + Bridging (DCB) functionality. Configuring DCB and FCoE is outside the scope + of this driver doc. Refer to http://www.open-fcoe.org/ for FCoE project + information and http://www.open-lldp.org/ or email list + e1000-eedc@lists.sourceforge.net for DCB information. MAC and VLAN anti-spoofing feature ---------------------------------- diff --git a/drivers/net/ethernet/intel/i40e/Makefile b/drivers/net/ethernet/intel/i40e/Makefile index d9eb80a..4b94ddb 100644 --- a/drivers/net/ethernet/intel/i40e/Makefile +++ b/drivers/net/ethernet/intel/i40e/Makefile @@ -44,3 +44,4 @@ i40e-objs := i40e_main.o \ i40e_virtchnl_pf.o i40e-$(CONFIG_I40E_DCB) += i40e_dcb.o i40e_dcb_nl.o +i40e-$(CONFIG_FCOE:m=y) += i40e_fcoe.o