Skip to content

Commit 54182df

Browse files
emmilemmil
committed
Merge: CNB96: net: intel: introduce ethernet common library
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5517 JIRA: https://issues.redhat.com/browse/RHEL-59099 Depends: !5432 * 306ec72 net: intel: introduce {, Intel} Ethernet common library * e6c9155 libeth: add Rx buffer management * a2fe35d net: intel: Use *-y instead of *-objs in Makefile * 62c8842 libeth: add cacheline / struct layout assertion helpers * 5aaac1a libeth: support different types of buffers for Rx * bf130ed net: intel: Remove MODULE_AUTHORs * 080d72f libeth: add Tx buffer completion helpers Signed-off-by: Petr Oros <[email protected]> Approved-by: José Ignacio Tornos Martínez <[email protected]> Approved-by: Ivan Vecera <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Rado Vrbovsky <[email protected]>
2 parents c243543 + 3ce0b2c commit 54182df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1004
-1254
lines changed

‎drivers/net/ethernet/intel/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ config NET_VENDOR_INTEL
1616

1717
if NET_VENDOR_INTEL
1818

19+
source "drivers/net/ethernet/intel/libeth/Kconfig"
20+
source "drivers/net/ethernet/intel/libie/Kconfig"
21+
1922
config E100
2023
tristate "Intel(R) PRO/100+ support"
2124
depends on PCI
@@ -242,6 +245,7 @@ config I40E
242245
depends on PTP_1588_CLOCK_OPTIONAL
243246
depends on PCI
244247
select AUXILIARY_BUS
248+
select LIBIE
245249
select NET_DEVLINK
246250
help
247251
This driver supports Intel(R) Ethernet Controller XL710 Family of
@@ -270,6 +274,8 @@ config I40E_DCB
270274
# so that CONFIG_IAVF symbol will always mirror the state of CONFIG_I40EVF
271275
config IAVF
272276
tristate
277+
select LIBIE
278+
273279
config I40EVF
274280
tristate "Intel(R) Ethernet Adaptive Virtual Function support"
275281
select IAVF
@@ -300,6 +306,7 @@ config ICE
300306
depends on GNSS || GNSS = n
301307
select AUXILIARY_BUS
302308
select DIMLIB
309+
select LIBIE
303310
select NET_DEVLINK
304311
select PLDMFW
305312
select DPLL

‎drivers/net/ethernet/intel/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Makefile for the Intel network device drivers.
44
#
55

6+
obj-$(CONFIG_LIBETH) += libeth/
7+
obj-$(CONFIG_LIBIE) += libie/
8+
69
obj-$(CONFIG_E100) += e100.o
710
obj-$(CONFIG_E1000) += e1000/
811
obj-$(CONFIG_E1000E) += e1000e/

‎drivers/net/ethernet/intel/e100.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@
161161
#define FIRMWARE_D102E "e100/d102e_ucode.bin"
162162

163163
MODULE_DESCRIPTION(DRV_DESCRIPTION);
164-
MODULE_AUTHOR(DRV_COPYRIGHT);
165164
MODULE_LICENSE("GPL v2");
166165
MODULE_FIRMWARE(FIRMWARE_D101M);
167166
MODULE_FIRMWARE(FIRMWARE_D101S);

‎drivers/net/ethernet/intel/e1000/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
obj-$(CONFIG_E1000) += e1000.o
99

10-
e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
10+
e1000-y := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o

‎drivers/net/ethernet/intel/e1000/e1000_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ static struct pci_driver e1000_driver = {
189189
.err_handler = &e1000_err_handler
190190
};
191191

192-
MODULE_AUTHOR("Intel Corporation, <[email protected]>");
193192
MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
194193
MODULE_LICENSE("GPL v2");
195194

‎drivers/net/ethernet/intel/fm10k/fm10k_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ static const char fm10k_driver_string[] = DRV_SUMMARY;
1717
static const char fm10k_copyright[] =
1818
"Copyright(c) 2013 - 2019 Intel Corporation.";
1919

20-
MODULE_AUTHOR("Intel Corporation, <[email protected]>");
2120
MODULE_DESCRIPTION(DRV_SUMMARY);
2221
MODULE_LICENSE("GPL v2");
2322

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

Lines changed: 0 additions & 253 deletions
Original file line numberDiff line numberDiff line change
@@ -381,259 +381,6 @@ int i40e_aq_set_rss_key(struct i40e_hw *hw,
381381
return i40e_aq_get_set_rss_key(hw, vsi_id, key, true);
382382
}
383383

384-
/* The i40e_ptype_lookup table is used to convert from the 8-bit ptype in the
385-
* hardware to a bit-field that can be used by SW to more easily determine the
386-
* packet type.
387-
*
388-
* Macros are used to shorten the table lines and make this table human
389-
* readable.
390-
*
391-
* We store the PTYPE in the top byte of the bit field - this is just so that
392-
* we can check that the table doesn't have a row missing, as the index into
393-
* the table should be the PTYPE.
394-
*
395-
* Typical work flow:
396-
*
397-
* IF NOT i40e_ptype_lookup[ptype].known
398-
* THEN
399-
* Packet is unknown
400-
* ELSE IF i40e_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP
401-
* Use the rest of the fields to look at the tunnels, inner protocols, etc
402-
* ELSE
403-
* Use the enum i40e_rx_l2_ptype to decode the packet type
404-
* ENDIF
405-
*/
406-
407-
/* macro to make the table lines short, use explicit indexing with [PTYPE] */
408-
#define I40E_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\
409-
[PTYPE] = { \
410-
1, \
411-
I40E_RX_PTYPE_OUTER_##OUTER_IP, \
412-
I40E_RX_PTYPE_OUTER_##OUTER_IP_VER, \
413-
I40E_RX_PTYPE_##OUTER_FRAG, \
414-
I40E_RX_PTYPE_TUNNEL_##T, \
415-
I40E_RX_PTYPE_TUNNEL_END_##TE, \
416-
I40E_RX_PTYPE_##TEF, \
417-
I40E_RX_PTYPE_INNER_PROT_##I, \
418-
I40E_RX_PTYPE_PAYLOAD_LAYER_##PL }
419-
420-
#define I40E_PTT_UNUSED_ENTRY(PTYPE) [PTYPE] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
421-
422-
/* shorter macros makes the table fit but are terse */
423-
#define I40E_RX_PTYPE_NOF I40E_RX_PTYPE_NOT_FRAG
424-
#define I40E_RX_PTYPE_FRG I40E_RX_PTYPE_FRAG
425-
#define I40E_RX_PTYPE_INNER_PROT_TS I40E_RX_PTYPE_INNER_PROT_TIMESYNC
426-
427-
/* Lookup table mapping in the 8-bit HW PTYPE to the bit field for decoding */
428-
struct i40e_rx_ptype_decoded i40e_ptype_lookup[BIT(8)] = {
429-
/* L2 Packet types */
430-
I40E_PTT_UNUSED_ENTRY(0),
431-
I40E_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
432-
I40E_PTT(2, L2, NONE, NOF, NONE, NONE, NOF, TS, PAY2),
433-
I40E_PTT(3, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
434-
I40E_PTT_UNUSED_ENTRY(4),
435-
I40E_PTT_UNUSED_ENTRY(5),
436-
I40E_PTT(6, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
437-
I40E_PTT(7, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
438-
I40E_PTT_UNUSED_ENTRY(8),
439-
I40E_PTT_UNUSED_ENTRY(9),
440-
I40E_PTT(10, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
441-
I40E_PTT(11, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
442-
I40E_PTT(12, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
443-
I40E_PTT(13, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
444-
I40E_PTT(14, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
445-
I40E_PTT(15, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
446-
I40E_PTT(16, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
447-
I40E_PTT(17, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
448-
I40E_PTT(18, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
449-
I40E_PTT(19, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
450-
I40E_PTT(20, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
451-
I40E_PTT(21, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
452-
453-
/* Non Tunneled IPv4 */
454-
I40E_PTT(22, IP, IPV4, FRG, NONE, NONE, NOF, NONE, PAY3),
455-
I40E_PTT(23, IP, IPV4, NOF, NONE, NONE, NOF, NONE, PAY3),
456-
I40E_PTT(24, IP, IPV4, NOF, NONE, NONE, NOF, UDP, PAY4),
457-
I40E_PTT_UNUSED_ENTRY(25),
458-
I40E_PTT(26, IP, IPV4, NOF, NONE, NONE, NOF, TCP, PAY4),
459-
I40E_PTT(27, IP, IPV4, NOF, NONE, NONE, NOF, SCTP, PAY4),
460-
I40E_PTT(28, IP, IPV4, NOF, NONE, NONE, NOF, ICMP, PAY4),
461-
462-
/* IPv4 --> IPv4 */
463-
I40E_PTT(29, IP, IPV4, NOF, IP_IP, IPV4, FRG, NONE, PAY3),
464-
I40E_PTT(30, IP, IPV4, NOF, IP_IP, IPV4, NOF, NONE, PAY3),
465-
I40E_PTT(31, IP, IPV4, NOF, IP_IP, IPV4, NOF, UDP, PAY4),
466-
I40E_PTT_UNUSED_ENTRY(32),
467-
I40E_PTT(33, IP, IPV4, NOF, IP_IP, IPV4, NOF, TCP, PAY4),
468-
I40E_PTT(34, IP, IPV4, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),
469-
I40E_PTT(35, IP, IPV4, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),
470-
471-
/* IPv4 --> IPv6 */
472-
I40E_PTT(36, IP, IPV4, NOF, IP_IP, IPV6, FRG, NONE, PAY3),
473-
I40E_PTT(37, IP, IPV4, NOF, IP_IP, IPV6, NOF, NONE, PAY3),
474-
I40E_PTT(38, IP, IPV4, NOF, IP_IP, IPV6, NOF, UDP, PAY4),
475-
I40E_PTT_UNUSED_ENTRY(39),
476-
I40E_PTT(40, IP, IPV4, NOF, IP_IP, IPV6, NOF, TCP, PAY4),
477-
I40E_PTT(41, IP, IPV4, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),
478-
I40E_PTT(42, IP, IPV4, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),
479-
480-
/* IPv4 --> GRE/NAT */
481-
I40E_PTT(43, IP, IPV4, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),
482-
483-
/* IPv4 --> GRE/NAT --> IPv4 */
484-
I40E_PTT(44, IP, IPV4, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),
485-
I40E_PTT(45, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),
486-
I40E_PTT(46, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, UDP, PAY4),
487-
I40E_PTT_UNUSED_ENTRY(47),
488-
I40E_PTT(48, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, TCP, PAY4),
489-
I40E_PTT(49, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),
490-
I40E_PTT(50, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),
491-
492-
/* IPv4 --> GRE/NAT --> IPv6 */
493-
I40E_PTT(51, IP, IPV4, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),
494-
I40E_PTT(52, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),
495-
I40E_PTT(53, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, UDP, PAY4),
496-
I40E_PTT_UNUSED_ENTRY(54),
497-
I40E_PTT(55, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, TCP, PAY4),
498-
I40E_PTT(56, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),
499-
I40E_PTT(57, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),
500-
501-
/* IPv4 --> GRE/NAT --> MAC */
502-
I40E_PTT(58, IP, IPV4, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),
503-
504-
/* IPv4 --> GRE/NAT --> MAC --> IPv4 */
505-
I40E_PTT(59, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),
506-
I40E_PTT(60, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),
507-
I40E_PTT(61, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP, PAY4),
508-
I40E_PTT_UNUSED_ENTRY(62),
509-
I40E_PTT(63, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP, PAY4),
510-
I40E_PTT(64, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),
511-
I40E_PTT(65, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),
512-
513-
/* IPv4 --> GRE/NAT -> MAC --> IPv6 */
514-
I40E_PTT(66, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),
515-
I40E_PTT(67, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),
516-
I40E_PTT(68, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP, PAY4),
517-
I40E_PTT_UNUSED_ENTRY(69),
518-
I40E_PTT(70, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP, PAY4),
519-
I40E_PTT(71, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),
520-
I40E_PTT(72, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),
521-
522-
/* IPv4 --> GRE/NAT --> MAC/VLAN */
523-
I40E_PTT(73, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),
524-
525-
/* IPv4 ---> GRE/NAT -> MAC/VLAN --> IPv4 */
526-
I40E_PTT(74, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),
527-
I40E_PTT(75, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),
528-
I40E_PTT(76, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP, PAY4),
529-
I40E_PTT_UNUSED_ENTRY(77),
530-
I40E_PTT(78, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP, PAY4),
531-
I40E_PTT(79, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),
532-
I40E_PTT(80, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),
533-
534-
/* IPv4 -> GRE/NAT -> MAC/VLAN --> IPv6 */
535-
I40E_PTT(81, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),
536-
I40E_PTT(82, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),
537-
I40E_PTT(83, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP, PAY4),
538-
I40E_PTT_UNUSED_ENTRY(84),
539-
I40E_PTT(85, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP, PAY4),
540-
I40E_PTT(86, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),
541-
I40E_PTT(87, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
542-
543-
/* Non Tunneled IPv6 */
544-
I40E_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3),
545-
I40E_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3),
546-
I40E_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4),
547-
I40E_PTT_UNUSED_ENTRY(91),
548-
I40E_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4),
549-
I40E_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),
550-
I40E_PTT(94, IP, IPV6, NOF, NONE, NONE, NOF, ICMP, PAY4),
551-
552-
/* IPv6 --> IPv4 */
553-
I40E_PTT(95, IP, IPV6, NOF, IP_IP, IPV4, FRG, NONE, PAY3),
554-
I40E_PTT(96, IP, IPV6, NOF, IP_IP, IPV4, NOF, NONE, PAY3),
555-
I40E_PTT(97, IP, IPV6, NOF, IP_IP, IPV4, NOF, UDP, PAY4),
556-
I40E_PTT_UNUSED_ENTRY(98),
557-
I40E_PTT(99, IP, IPV6, NOF, IP_IP, IPV4, NOF, TCP, PAY4),
558-
I40E_PTT(100, IP, IPV6, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),
559-
I40E_PTT(101, IP, IPV6, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),
560-
561-
/* IPv6 --> IPv6 */
562-
I40E_PTT(102, IP, IPV6, NOF, IP_IP, IPV6, FRG, NONE, PAY3),
563-
I40E_PTT(103, IP, IPV6, NOF, IP_IP, IPV6, NOF, NONE, PAY3),
564-
I40E_PTT(104, IP, IPV6, NOF, IP_IP, IPV6, NOF, UDP, PAY4),
565-
I40E_PTT_UNUSED_ENTRY(105),
566-
I40E_PTT(106, IP, IPV6, NOF, IP_IP, IPV6, NOF, TCP, PAY4),
567-
I40E_PTT(107, IP, IPV6, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),
568-
I40E_PTT(108, IP, IPV6, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),
569-
570-
/* IPv6 --> GRE/NAT */
571-
I40E_PTT(109, IP, IPV6, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),
572-
573-
/* IPv6 --> GRE/NAT -> IPv4 */
574-
I40E_PTT(110, IP, IPV6, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),
575-
I40E_PTT(111, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),
576-
I40E_PTT(112, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, UDP, PAY4),
577-
I40E_PTT_UNUSED_ENTRY(113),
578-
I40E_PTT(114, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, TCP, PAY4),
579-
I40E_PTT(115, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),
580-
I40E_PTT(116, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),
581-
582-
/* IPv6 --> GRE/NAT -> IPv6 */
583-
I40E_PTT(117, IP, IPV6, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),
584-
I40E_PTT(118, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),
585-
I40E_PTT(119, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, UDP, PAY4),
586-
I40E_PTT_UNUSED_ENTRY(120),
587-
I40E_PTT(121, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, TCP, PAY4),
588-
I40E_PTT(122, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),
589-
I40E_PTT(123, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),
590-
591-
/* IPv6 --> GRE/NAT -> MAC */
592-
I40E_PTT(124, IP, IPV6, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),
593-
594-
/* IPv6 --> GRE/NAT -> MAC -> IPv4 */
595-
I40E_PTT(125, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),
596-
I40E_PTT(126, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),
597-
I40E_PTT(127, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP, PAY4),
598-
I40E_PTT_UNUSED_ENTRY(128),
599-
I40E_PTT(129, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP, PAY4),
600-
I40E_PTT(130, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),
601-
I40E_PTT(131, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),
602-
603-
/* IPv6 --> GRE/NAT -> MAC -> IPv6 */
604-
I40E_PTT(132, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),
605-
I40E_PTT(133, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),
606-
I40E_PTT(134, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP, PAY4),
607-
I40E_PTT_UNUSED_ENTRY(135),
608-
I40E_PTT(136, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP, PAY4),
609-
I40E_PTT(137, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),
610-
I40E_PTT(138, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),
611-
612-
/* IPv6 --> GRE/NAT -> MAC/VLAN */
613-
I40E_PTT(139, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),
614-
615-
/* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv4 */
616-
I40E_PTT(140, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),
617-
I40E_PTT(141, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),
618-
I40E_PTT(142, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP, PAY4),
619-
I40E_PTT_UNUSED_ENTRY(143),
620-
I40E_PTT(144, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP, PAY4),
621-
I40E_PTT(145, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),
622-
I40E_PTT(146, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),
623-
624-
/* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv6 */
625-
I40E_PTT(147, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),
626-
I40E_PTT(148, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),
627-
I40E_PTT(149, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP, PAY4),
628-
I40E_PTT_UNUSED_ENTRY(150),
629-
I40E_PTT(151, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP, PAY4),
630-
I40E_PTT(152, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),
631-
I40E_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
632-
633-
/* unused entries */
634-
[154 ... 255] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
635-
};
636-
637384
/**
638385
* i40e_init_shared_code - Initialize the shared code
639386
* @hw: pointer to hardware structure

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ module_param(debug, uint, 0);
9999
MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all), Debug mask (0x8XXXXXXX)");
100100

101101
MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver");
102+
MODULE_IMPORT_NS(LIBIE);
102103
MODULE_LICENSE("GPL v2");
103104

104105
static struct workqueue_struct *i40e_wq;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,6 @@ void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status);
371371

372372
int i40e_set_mac_type(struct i40e_hw *hw);
373373

374-
extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
375-
376-
static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
377-
{
378-
return i40e_ptype_lookup[ptype];
379-
}
380-
381374
/**
382375
* i40e_virtchnl_link_speed - Convert AdminQ link_speed to virtchnl definition
383376
* @link_speed: the speed to convert

0 commit comments

Comments
 (0)