Commit 34fd03b9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2018-03-26

This patch series adds the ice driver, which will support the Intel(R)
E800 Series of network devices.

This is the first phase in the release of this driver where we implement
basic transmit and receive. The idea behind the multi-phase release is to
aid in code review as well as testing. Subsequent phases will implement
advanced features (like SR-IOV, tunnelling, flow director, QoS, etc.) that
build upon the previous phase(s). Each phase will be submitted as a patch
series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 336f2c03 e94d4478

Documentation/networking/ice.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Intel(R) Ethernet Connection E800 Series Linux Driver

===================================================================



Intel ice Linux driver.

Copyright(c) 2018 Intel Corporation.



Contents

========

- Enabling the driver

- Support



The driver in this release supports Intel's E800 Series of products. For

more information, visit Intel's support page at http://support.intel.com.



Enabling the driver

===================



The driver is enabled via the standard kernel configuration system,

using the make command:



     Make oldconfig/silentoldconfig/menuconfig/etc.



The driver is located in the menu structure at:



	-> Device Drivers

	  -> Network device support (NETDEVICES [=y])

	    -> Ethernet driver support

	      -> Intel devices

	        -> Intel(R) Ethernet Connection E800 Series Support



Support

=======



For general information, go to the Intel support website at:



    http://support.intel.com



If an issue is identified with the released source code, please email

the maintainer listed in the MAINTAINERS file.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7063,6 +7063,7 @@ F: Documentation/networking/ixgbe.txt 
F:	Documentation/networking/ixgbevf.txt

F:	Documentation/networking/i40e.txt

F:	Documentation/networking/i40evf.txt

F:	Documentation/networking/ice.txt

F:	drivers/net/ethernet/intel/

F:	drivers/net/ethernet/intel/*/

F:	include/linux/avf/virtchnl.h

drivers/net/ethernet/intel/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -251,6 +251,20 @@ config I40EVF 
	  will be called i40evf.  MSI-X interrupt support is required

	  for this driver to work correctly.



config ICE

	tristate "Intel(R) Ethernet Connection E800 Series Support"

	default n

	depends on PCI_MSI

	---help---

	  This driver supports Intel(R) Ethernet Connection E800 Series of

	  devices.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>



	  To compile this driver as a module, choose M here. The module

	  will be called ice.



config FM10K

	tristate "Intel(R) FM10000 Ethernet Switch Host Interface Support"

	default n

drivers/net/ethernet/intel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ obj-$(CONFIG_I40E) += i40e/ 
obj-$(CONFIG_IXGB) += ixgb/

obj-$(CONFIG_I40EVF) += i40evf/

obj-$(CONFIG_FM10K) += fm10k/

obj-$(CONFIG_ICE) += ice/

drivers/net/ethernet/intel/ice/Makefile

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright (c) 2018, Intel Corporation.



#

# Makefile for the Intel(R) Ethernet Connection E800 Series Linux Driver

#



obj-$(CONFIG_ICE) += ice.o



ice-y := ice_main.o	\

	 ice_controlq.o	\

	 ice_common.o	\

	 ice_nvm.o	\

	 ice_switch.o	\

	 ice_sched.o	\

	 ice_txrx.o	\

	 ice_ethtool.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE