Commit 8e769788 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series implements the Linux Virtual Function (VF) driver for
the Intel Ethernet Controller XL710 family.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8169d10c 90327e7d

Documentation/networking/i40evf.txt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Linux* Base Driver for Intel(R) Network Connection

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



Intel XL710 X710 Virtual Function Linux driver.

Copyright(c) 2013 Intel Corporation.



Contents

========



- Identifying Your Adapter

- Known Issues/Troubleshooting

- Support



This file describes the i40evf Linux* Base Driver for the Intel(R) XL710

X710 Virtual Function.



The i40evf driver supports XL710 and X710 virtual function devices that

can only be activated on kernels with CONFIG_PCI_IOV enabled.



The guest OS loading the i40evf driver must support MSI-X interrupts.



Identifying Your Adapter

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



For more information on how to identify your adapter, go to the Adapter &

Driver ID Guide at:



    http://support.intel.com/support/go/network/adapter/idguide.htm



Known Issues/Troubleshooting

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





Support

=======



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



    http://support.intel.com



or the Intel Wired Networking project hosted by Sourceforge at:



    http://sourceforge.net/projects/e1000



If an issue is identified with the released source code on the supported

kernel with a supported adapter, email the specific information related

to the issue to e1000-devel@lists.sf.net

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -4451,7 +4451,7 @@ M: Deepak Saxena <dsaxena@plexity.net> 
S:	Maintained

F:	drivers/char/hw_random/ixp4xx-rng.c



INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e)

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)

M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>

M:	Jesse Brandeburg <jesse.brandeburg@intel.com>

M:	Bruce Allan <bruce.w.allan@intel.com>
@@ -4460,6 +4460,7 @@ M: Don Skidmore <donald.c.skidmore@intel.com> 
M:	Greg Rose <gregory.v.rose@intel.com>

M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

M:	Mitch Williams <mitch.a.williams@intel.com>

L:	e1000-devel@lists.sourceforge.net

W:	http://www.intel.com/support/feedback.htm

W:	http://e1000.sourceforge.net/
@@ -4475,6 +4476,7 @@ F: Documentation/networking/ixgb.txt 
F:	Documentation/networking/ixgbe.txt

F:	Documentation/networking/ixgbevf.txt

F:	Documentation/networking/i40e.txt

F:	Documentation/networking/i40evf.txt

F:	drivers/net/ethernet/intel/



INTEL-MID GPIO DRIVER

drivers/net/ethernet/intel/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -259,4 +259,23 @@ config I40E 
	  To compile this driver as a module, choose M here. The module

	  will be called i40e.



config I40EVF

	tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"

	depends on PCI_MSI

	---help---

	  This driver supports Intel(R) XL710 and X710 virtual functions.

	  For more information on how to identify your adapter, go to the

	  Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/sb/CS-008441.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



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

	  will be called i40evf.  MSI-X interrupt support is required

	  for this driver to work correctly.



endif # NET_VENDOR_INTEL

drivers/net/ethernet/intel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ obj-$(CONFIG_IXGBE) += ixgbe/ 
obj-$(CONFIG_IXGBEVF) += ixgbevf/

obj-$(CONFIG_I40E) += i40e/

obj-$(CONFIG_IXGB) += ixgb/

obj-$(CONFIG_I40EVF) += i40evf/

drivers/net/ethernet/intel/i40evf/Makefile

0 → 100644
+33 −0
Original line number Diff line number Diff line 
################################################################################

#

# Intel Ethernet Controller XL710 Family Linux Virtual Function Driver

# Copyright(c) 2013 Intel Corporation.

#

# This program is free software; you can redistribute it and/or modify it

# under the terms and conditions of the GNU General Public License,

# version 2, as published by the Free Software Foundation.

#

# This program is distributed in the hope it will be useful, but WITHOUT

# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

# more details.

#

# The full GNU General Public License is included in this distribution in

# the file called "COPYING".

#

# Contact Information:

# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

#

################################################################################



#

## Makefile for the Intel(R) 40GbE VF driver

#

#



obj-$(CONFIG_I40EVF) += i40evf.o



i40evf-objs :=	i40evf_main.o i40evf_ethtool.o i40evf_virtchnl.o \

		i40e_txrx.o i40e_common.o i40e_adminq.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE