Page MenuHomeFreeBSD
Files F135508575

D14594.id39991.diff
No OneTemporary
Actions

D14594.id39991.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/if_ether.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/if_ether.h
+++ sys/compat/linuxkpi/common/include/linux/if_ether.h
@@ -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_ */
Index: sys/dev/mlx4/mlx4_core/mlx4.h
===================================================================
--- sys/dev/mlx4/mlx4_core/mlx4.h
+++ sys/dev/mlx4/mlx4_core/mlx4.h
@@ -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,

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 11, 10:15 AM (7 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25155091
Default Alt Text
D14594.id39991.diff (1 KB)

Event Timeline