svn commit: r330830 - in stable/11/sys: compat/linuxkpi/common/include/linux dev/mlx4/mlx4_core

[Andrey V. Elsukov]

Author: ae
Date: Tue Mar 13 08:46:47 2018
New Revision: 330830
URL: https://svnweb.freebsd.org/changeset/base/330830

Log:
  MFC r330537:
    Add mapping for several ethernet types used by Linux to FreeBSD
    ethernet types.
  
    Reviewed by:	hselasky
    Differential Revision:	https://reviews.freebsd.org/D14594

Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h
  stable/11/sys/dev/mlx4/mlx4_core/mlx4.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h	Tue Mar 13 08:45:06 2018	(r330829)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/if_ether.h	Tue Mar 13 08:46:47 2018	(r330830)
@@ -35,8 +35,6 @@
 
 #include <net/ethernet.h>
 
-#define	ETH_P_8021Q	ETHERTYPE_VLAN
-
 #define ETH_HLEN        ETHER_HDR_LEN   /* Total octets in header.                              */
 #ifndef ETH_ALEN
 #define ETH_ALEN        ETHER_ADDR_LEN
@@ -47,6 +45,11 @@
 /*
  * defined Ethernet Protocol ID's.
  */
-#define ETH_P_IP        0x0800          /* Internet Protocol packet                             */
+#define	ETH_P_IP        ETHERTYPE_IP
+#define	ETH_P_IPV6	ETHERTYPE_IPV6
+#define	ETH_P_MPLS_UC	ETHERTYPE_MPLS
+#define	ETH_P_MPLS_MC	ETHERTYPE_MPLS_MCAST
+#define	ETH_P_8021Q	ETHERTYPE_VLAN
+#define	ETH_P_8021AD	ETHERTYPE_QINQ
 
 #endif	/* _LINUX_IF_ETHER_H_ */

Modified: stable/11/sys/dev/mlx4/mlx4_core/mlx4.h
==============================================================================
--- stable/11/sys/dev/mlx4/mlx4_core/mlx4.h	Tue Mar 13 08:45:06 2018	(r330829)
+++ stable/11/sys/dev/mlx4/mlx4_core/mlx4.h	Tue Mar 13 08:46:47 2018	(r330830)
@@ -66,8 +66,6 @@
 
 #define MLX4_QUERY_IF_STAT_RESET	BIT(31)
 
-#define	ETH_P_8021AD	0x88A8
-
 enum {
 	MLX4_HCR_BASE		= 0x80680,
 	MLX4_HCR_SIZE		= 0x0001c,