Commit 306ec721 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Tony Nguyen
Browse files

net: intel: introduce {, Intel} Ethernet common library 



Not a secret there's a ton of code duplication between two and more Intel
ethernet modules.

Before introducing new changes, which would need to be copied over again,
start decoupling the already existing duplicate functionality into a new
module, which will be shared between several Intel Ethernet drivers.
Add the lookup table which converts 8/10-bit hardware packet type into
a parsed bitfield structure for easy checking packet format parameters,
such as payload level, IP version, etc. This is currently used by i40e,
ice and iavf and it's all the same in all three drivers.
The only difference introduced in this implementation is that instead of
defining a 256 (or 1024 in case of ice) element array, add unlikely()
condition to limit the input to 154 (current maximum non-reserved packet
type). There's no reason to waste 600 (or even 3600) bytes only to not
hurt very unlikely exception packets.
The hash computation function now takes payload level directly as a
pkt_hash_type. There's a couple cases when non-IP ptypes are marked as
L3 payload and in the previous versions their hash level would be 2, not
3. But skb_set_hash() only sees difference between L4 and non-L4, thus
this won't change anything at all.
The module is behind the hidden Kconfig symbol, which the drivers will
select when needed. The exports are behind 'LIBIE' namespace to limit
the scope of the functions.

Not that non-HW-specific symbols will live in yet another module,
libeth. This is done to easily distinguish pretty generic code ready
for reusing by any other vendor and/or for moving the layer up from
the code useful in Intel's 1-100G drivers only.

Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9dd15d50

drivers/net/ethernet/intel/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ config NET_VENDOR_INTEL 


if NET_VENDOR_INTEL



source "drivers/net/ethernet/intel/libeth/Kconfig"

source "drivers/net/ethernet/intel/libie/Kconfig"



config E100

	tristate "Intel(R) PRO/100+ support"

	depends on PCI
@@ -225,6 +228,7 @@ config I40E 
	depends on PTP_1588_CLOCK_OPTIONAL

	depends on PCI

	select AUXILIARY_BUS

	select LIBIE

	select NET_DEVLINK

	help

	  This driver supports Intel(R) Ethernet Controller XL710 Family of
@@ -253,6 +257,8 @@ config I40E_DCB 
# so that CONFIG_IAVF symbol will always mirror the state of CONFIG_I40EVF

config IAVF

	tristate

	select LIBIE



config I40EVF

	tristate "Intel(R) Ethernet Adaptive Virtual Function support"

	select IAVF
@@ -283,6 +289,7 @@ config ICE 
	depends on GNSS || GNSS = n

	select AUXILIARY_BUS

	select DIMLIB

	select LIBIE

	select NET_DEVLINK

	select PLDMFW

	select DPLL

drivers/net/ethernet/intel/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
# Makefile for the Intel network device drivers.

#



obj-$(CONFIG_LIBETH) += libeth/

obj-$(CONFIG_LIBIE) += libie/



obj-$(CONFIG_E100) += e100.o

obj-$(CONFIG_E1000) += e1000/

obj-$(CONFIG_E1000E) += e1000e/

drivers/net/ethernet/intel/i40e/i40e_common.c

+0 −253
Original line number Diff line number Diff line
@@ -381,259 +381,6 @@ int i40e_aq_set_rss_key(struct i40e_hw *hw, 
	return i40e_aq_get_set_rss_key(hw, vsi_id, key, true);

}



/* The i40e_ptype_lookup table is used to convert from the 8-bit ptype in the

 * hardware to a bit-field that can be used by SW to more easily determine the

 * packet type.

 *

 * Macros are used to shorten the table lines and make this table human

 * readable.

 *

 * We store the PTYPE in the top byte of the bit field - this is just so that

 * we can check that the table doesn't have a row missing, as the index into

 * the table should be the PTYPE.

 *

 * Typical work flow:

 *

 * IF NOT i40e_ptype_lookup[ptype].known

 * THEN

 *      Packet is unknown

 * ELSE IF i40e_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP

 *      Use the rest of the fields to look at the tunnels, inner protocols, etc

 * ELSE

 *      Use the enum i40e_rx_l2_ptype to decode the packet type

 * ENDIF

 */



/* macro to make the table lines short, use explicit indexing with [PTYPE] */

#define I40E_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\

	[PTYPE] = { \

		1, \

		I40E_RX_PTYPE_OUTER_##OUTER_IP, \

		I40E_RX_PTYPE_OUTER_##OUTER_IP_VER, \

		I40E_RX_PTYPE_##OUTER_FRAG, \

		I40E_RX_PTYPE_TUNNEL_##T, \

		I40E_RX_PTYPE_TUNNEL_END_##TE, \

		I40E_RX_PTYPE_##TEF, \

		I40E_RX_PTYPE_INNER_PROT_##I, \

		I40E_RX_PTYPE_PAYLOAD_LAYER_##PL }



#define I40E_PTT_UNUSED_ENTRY(PTYPE) [PTYPE] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }



/* shorter macros makes the table fit but are terse */

#define I40E_RX_PTYPE_NOF		I40E_RX_PTYPE_NOT_FRAG

#define I40E_RX_PTYPE_FRG		I40E_RX_PTYPE_FRAG

#define I40E_RX_PTYPE_INNER_PROT_TS	I40E_RX_PTYPE_INNER_PROT_TIMESYNC



/* Lookup table mapping in the 8-bit HW PTYPE to the bit field for decoding */

struct i40e_rx_ptype_decoded i40e_ptype_lookup[BIT(8)] = {

	/* L2 Packet types */

	I40E_PTT_UNUSED_ENTRY(0),

	I40E_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(2,  L2, NONE, NOF, NONE, NONE, NOF, TS,   PAY2),

	I40E_PTT(3,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT_UNUSED_ENTRY(4),

	I40E_PTT_UNUSED_ENTRY(5),

	I40E_PTT(6,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(7,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT_UNUSED_ENTRY(8),

	I40E_PTT_UNUSED_ENTRY(9),

	I40E_PTT(10, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(11, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),

	I40E_PTT(12, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(13, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(14, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(15, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(16, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(17, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(18, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(19, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(20, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(21, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),



	/* Non Tunneled IPv4 */

	I40E_PTT(22, IP, IPV4, FRG, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(23, IP, IPV4, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(24, IP, IPV4, NOF, NONE, NONE, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(25),

	I40E_PTT(26, IP, IPV4, NOF, NONE, NONE, NOF, TCP,  PAY4),

	I40E_PTT(27, IP, IPV4, NOF, NONE, NONE, NOF, SCTP, PAY4),

	I40E_PTT(28, IP, IPV4, NOF, NONE, NONE, NOF, ICMP, PAY4),



	/* IPv4 --> IPv4 */

	I40E_PTT(29, IP, IPV4, NOF, IP_IP, IPV4, FRG, NONE, PAY3),

	I40E_PTT(30, IP, IPV4, NOF, IP_IP, IPV4, NOF, NONE, PAY3),

	I40E_PTT(31, IP, IPV4, NOF, IP_IP, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(32),

	I40E_PTT(33, IP, IPV4, NOF, IP_IP, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(34, IP, IPV4, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(35, IP, IPV4, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),



	/* IPv4 --> IPv6 */

	I40E_PTT(36, IP, IPV4, NOF, IP_IP, IPV6, FRG, NONE, PAY3),

	I40E_PTT(37, IP, IPV4, NOF, IP_IP, IPV6, NOF, NONE, PAY3),

	I40E_PTT(38, IP, IPV4, NOF, IP_IP, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(39),

	I40E_PTT(40, IP, IPV4, NOF, IP_IP, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(41, IP, IPV4, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(42, IP, IPV4, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT */

	I40E_PTT(43, IP, IPV4, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),



	/* IPv4 --> GRE/NAT --> IPv4 */

	I40E_PTT(44, IP, IPV4, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),

	I40E_PTT(45, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),

	I40E_PTT(46, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(47),

	I40E_PTT(48, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(49, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(50, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT --> IPv6 */

	I40E_PTT(51, IP, IPV4, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),

	I40E_PTT(52, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),

	I40E_PTT(53, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(54),

	I40E_PTT(55, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(56, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(57, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT --> MAC */

	I40E_PTT(58, IP, IPV4, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),



	/* IPv4 --> GRE/NAT --> MAC --> IPv4 */

	I40E_PTT(59, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),

	I40E_PTT(60, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),

	I40E_PTT(61, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(62),

	I40E_PTT(63, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(64, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(65, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT -> MAC --> IPv6 */

	I40E_PTT(66, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),

	I40E_PTT(67, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),

	I40E_PTT(68, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(69),

	I40E_PTT(70, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(71, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(72, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT --> MAC/VLAN */

	I40E_PTT(73, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),



	/* IPv4 ---> GRE/NAT -> MAC/VLAN --> IPv4 */

	I40E_PTT(74, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),

	I40E_PTT(75, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),

	I40E_PTT(76, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(77),

	I40E_PTT(78, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(79, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(80, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),



	/* IPv4 -> GRE/NAT -> MAC/VLAN --> IPv6 */

	I40E_PTT(81, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),

	I40E_PTT(82, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),

	I40E_PTT(83, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(84),

	I40E_PTT(85, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(86, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(87, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),



	/* Non Tunneled IPv6 */

	I40E_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(91),

	I40E_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP,  PAY4),

	I40E_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),

	I40E_PTT(94, IP, IPV6, NOF, NONE, NONE, NOF, ICMP, PAY4),



	/* IPv6 --> IPv4 */

	I40E_PTT(95,  IP, IPV6, NOF, IP_IP, IPV4, FRG, NONE, PAY3),

	I40E_PTT(96,  IP, IPV6, NOF, IP_IP, IPV4, NOF, NONE, PAY3),

	I40E_PTT(97,  IP, IPV6, NOF, IP_IP, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(98),

	I40E_PTT(99,  IP, IPV6, NOF, IP_IP, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(100, IP, IPV6, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(101, IP, IPV6, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> IPv6 */

	I40E_PTT(102, IP, IPV6, NOF, IP_IP, IPV6, FRG, NONE, PAY3),

	I40E_PTT(103, IP, IPV6, NOF, IP_IP, IPV6, NOF, NONE, PAY3),

	I40E_PTT(104, IP, IPV6, NOF, IP_IP, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(105),

	I40E_PTT(106, IP, IPV6, NOF, IP_IP, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(107, IP, IPV6, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(108, IP, IPV6, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT */

	I40E_PTT(109, IP, IPV6, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),



	/* IPv6 --> GRE/NAT -> IPv4 */

	I40E_PTT(110, IP, IPV6, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),

	I40E_PTT(111, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),

	I40E_PTT(112, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(113),

	I40E_PTT(114, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(115, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(116, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> IPv6 */

	I40E_PTT(117, IP, IPV6, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),

	I40E_PTT(118, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),

	I40E_PTT(119, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(120),

	I40E_PTT(121, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(122, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(123, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC */

	I40E_PTT(124, IP, IPV6, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),



	/* IPv6 --> GRE/NAT -> MAC -> IPv4 */

	I40E_PTT(125, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),

	I40E_PTT(126, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),

	I40E_PTT(127, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(128),

	I40E_PTT(129, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(130, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(131, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC -> IPv6 */

	I40E_PTT(132, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),

	I40E_PTT(133, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),

	I40E_PTT(134, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(135),

	I40E_PTT(136, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(137, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(138, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC/VLAN */

	I40E_PTT(139, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),



	/* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv4 */

	I40E_PTT(140, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),

	I40E_PTT(141, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),

	I40E_PTT(142, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(143),

	I40E_PTT(144, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(145, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(146, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv6 */

	I40E_PTT(147, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),

	I40E_PTT(148, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),

	I40E_PTT(149, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(150),

	I40E_PTT(151, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(152, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),



	/* unused entries */

	[154 ... 255] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }

};



/**

 * i40e_init_shared_code - Initialize the shared code

 * @hw: pointer to hardware structure

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all), Debug mask (0x8XXXXXXX 


MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");

MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver");

MODULE_IMPORT_NS(LIBIE);

MODULE_LICENSE("GPL v2");



static struct workqueue_struct *i40e_wq;

drivers/net/ethernet/intel/i40e/i40e_prototype.h

+0 −7
Original line number Diff line number Diff line
@@ -371,13 +371,6 @@ void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status); 


int i40e_set_mac_type(struct i40e_hw *hw);



extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];



static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)

{

	return i40e_ptype_lookup[ptype];

}



/**

 * i40e_virtchnl_link_speed - Convert AdminQ link_speed to virtchnl definition

 * @link_speed: the speed to convert