Index: sys/compat/linuxkpi/common/include/linux/inetdevice.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/inetdevice.h
+++ sys/compat/linuxkpi/common/include/linux/inetdevice.h
@@ -33,6 +33,7 @@
 
 #include <linux/netdevice.h>
 
+#if defined(_NET_DEVICE_IS_IFNET)
 static inline struct net_device *
 ip_dev_find(struct vnet *vnet, uint32_t addr)
 {
@@ -89,5 +90,6 @@
 	NET_EPOCH_EXIT(et);
 	return (ifp);
 }
+#endif	/* _NET_DEVICE_IS_IFNET */
 
 #endif	/* _LINUX_INETDEVICE_H_ */
Index: sys/compat/linuxkpi/common/include/linux/netdevice.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/netdevice.h
+++ sys/compat/linuxkpi/common/include/linux/netdevice.h
@@ -55,6 +55,7 @@
 
 #define	MAX_ADDR_LEN		20
 
+#if defined(_NET_DEVICE_IS_IFNET)
 #define	net_device	ifnet
 
 static inline struct ifnet *
@@ -88,9 +89,6 @@
 	return (dev->if_softc);
 }
 
-#define	rtnl_lock()
-#define	rtnl_unlock()
-
 static inline int
 dev_mc_delete(struct net_device *dev, void *addr, int alen, int all)
 {
@@ -128,6 +126,21 @@
 
 	return -if_addmulti(dev, (struct sockaddr *)&sdl, NULL);
 }
+#else /* !_NET_DEVICE_IS_IFNET */
+
+struct net_device {
+	/*
+	 * Keep ifp first until _NET_DEVICE_IS_IFNET is gone
+	 * for various compat bits, e.g., netdev_notifier_info.
+	 */
+	struct ifnet		*ifp;
+
+	char			*name;
+};
+#endif /* _NET_DEVICE_IS_IFNET */
+
+#define	rtnl_lock()
+#define	rtnl_unlock()
 
 /* According to linux::ipoib_main.c. */
 struct netdev_notifier_info {
Index: sys/dev/cxgbe/iw_cxgbe/cm.c
===================================================================
--- sys/dev/cxgbe/iw_cxgbe/cm.c
+++ sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -74,6 +74,7 @@
 #include <linux/module.h>
 #include <linux/workqueue.h>
 #include <linux/notifier.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/inetdevice.h>
 #include <linux/if_vlan.h>
 #include <net/netevent.h>
Index: sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
===================================================================
--- sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
+++ sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
@@ -39,6 +39,7 @@
 #include <linux/spinlock.h>
 #include <linux/idr.h>
 #include <linux/completion.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
Index: sys/dev/mlx4/mlx4_core/mlx4_main.c
===================================================================
--- sys/dev/mlx4/mlx4_core/mlx4_main.c
+++ sys/dev/mlx4/mlx4_core/mlx4_main.c
@@ -43,6 +43,7 @@
 #include <linux/slab.h>
 #include <linux/io-mapping.h>
 #include <linux/delay.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/string.h>
 #include <linux/fs.h>
Index: sys/dev/mlx4/mlx4_en/en.h
===================================================================
--- sys/dev/mlx4/mlx4_en/en.h
+++ sys/dev/mlx4/mlx4_en/en.h
@@ -39,6 +39,7 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/kobject.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
 #include <linux/if_ether.h>
Index: sys/dev/mlx4/mlx4_en/mlx4_en_main.c
===================================================================
--- sys/dev/mlx4/mlx4_en/mlx4_en_main.c
+++ sys/dev/mlx4/mlx4_en/mlx4_en_main.c
@@ -35,6 +35,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/slab.h>
 
Index: sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
===================================================================
--- sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
+++ sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
@@ -37,6 +37,7 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/etherdevice.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>
 #include <linux/if_vlan.h>
Index: sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
===================================================================
--- sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
+++ sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
@@ -33,6 +33,7 @@
 
 #include <linux/log2.h>
 #include <linux/slab.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/bitops.h>
 #include <linux/rcupdate.h>
Index: sys/dev/mlx5/mlx5_en/en.h
===================================================================
--- sys/dev/mlx5/mlx5_en/en.h
+++ sys/dev/mlx5/mlx5_en/en.h
@@ -36,6 +36,7 @@
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ktime.h>
Index: sys/dev/qlnx/qlnxr/qlnxr_def.h
===================================================================
--- sys/dev/qlnx/qlnxr/qlnxr_def.h
+++ sys/dev/qlnx/qlnxr/qlnxr_def.h
@@ -41,6 +41,7 @@
 #include <linux/spinlock.h>
 #include <linux/idr.h>
 #include <linux/completion.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
Index: sys/ofed/drivers/infiniband/core/ib_addr.c
===================================================================
--- sys/ofed/drivers/infiniband/core/ib_addr.c
+++ sys/ofed/drivers/infiniband/core/ib_addr.c
@@ -39,6 +39,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <linux/mutex.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/inetdevice.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
Index: sys/ofed/drivers/infiniband/core/ib_cache.c
===================================================================
--- sys/ofed/drivers/infiniband/core/ib_cache.c
+++ sys/ofed/drivers/infiniband/core/ib_cache.c
@@ -42,6 +42,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/in6.h>
 
Index: sys/ofed/drivers/infiniband/core/ib_cma.c
===================================================================
--- sys/ofed/drivers/infiniband/core/ib_cma.c
+++ sys/ofed/drivers/infiniband/core/ib_cma.c
@@ -46,6 +46,7 @@
 #include <linux/mutex.h>
 #include <linux/random.h>
 #include <linux/idr.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/inetdevice.h>
 #include <linux/slab.h>
 #include <linux/module.h>
Index: sys/ofed/drivers/infiniband/core/ib_device.c
===================================================================
--- sys/ofed/drivers/infiniband/core/ib_device.c
+++ sys/ofed/drivers/infiniband/core/ib_device.c
@@ -42,6 +42,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <rdma/ib_addr.h>
 #include <rdma/ib_cache.h>
Index: sys/ofed/drivers/infiniband/core/ib_sysfs.c
===================================================================
--- sys/ofed/drivers/infiniband/core/ib_sysfs.c
+++ sys/ofed/drivers/infiniband/core/ib_sysfs.c
@@ -41,6 +41,7 @@
 
 #include <linux/slab.h>
 #include <linux/string.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/fs.h>
 #include <linux/printk.h>
Index: sys/ofed/drivers/infiniband/core/iwpm_util.h
===================================================================
--- sys/ofed/drivers/infiniband/core/iwpm_util.h
+++ sys/ofed/drivers/infiniband/core/iwpm_util.h
@@ -44,6 +44,7 @@
 #include <linux/in6.h>
 #include <linux/spinlock.h>
 #include <linux/kernel.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
Index: sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
===================================================================
--- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -36,6 +36,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <linux/kernel.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 
 #include "ipoib.h"
Index: sys/ofed/include/rdma/ib_addr.h
===================================================================
--- sys/ofed/include/rdma/ib_addr.h
+++ sys/ofed/include/rdma/ib_addr.h
@@ -41,6 +41,7 @@
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <linux/if_arp.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>
 #include <linux/socket.h>
Index: sys/ofed/include/rdma/ib_sa.h
===================================================================
--- sys/ofed/include/rdma/ib_sa.h
+++ sys/ofed/include/rdma/ib_sa.h
@@ -41,6 +41,7 @@
 
 #include <linux/completion.h>
 #include <linux/compiler.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 
 #include <rdma/ib_verbs.h>
Index: sys/ofed/include/rdma/ib_verbs.h
===================================================================
--- sys/ofed/include/rdma/ib_verbs.h
+++ sys/ofed/include/rdma/ib_verbs.h
@@ -59,6 +59,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/rcupdate.h>
+#define	_NET_DEVICE_IS_IFNET
 #include <linux/netdevice.h>
 #include <netinet/ip.h>