Page MenuHomeFreeBSD
Files F156434908

D39491.diff
No OneTemporary
Actions

D39491.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/if_vlan.h b/sys/compat/linuxkpi/common/include/linux/if_vlan.h
--- a/sys/compat/linuxkpi/common/include/linux/if_vlan.h
+++ b/sys/compat/linuxkpi/common/include/linux/if_vlan.h
@@ -44,7 +44,7 @@
static inline int
is_vlan_dev(struct ifnet *ifp)
{
- return (ifp->if_type == IFT_L2VLAN);
+ return (if_gettype(ifp) == IFT_L2VLAN);
}
static inline uint16_t
diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h
--- a/sys/compat/linuxkpi/common/include/linux/netdevice.h
+++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h
@@ -106,9 +106,6 @@
};
struct net_device {
- /* BSD specific for compat. */
- struct ifnet bsdifp;
-
/* net_device fields seen publicly. */
/* XXX can we later make some aliases to ifnet? */
char name[IFNAMSIZ];
diff --git a/sys/sys/param.h b/sys/sys/param.h
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -76,7 +76,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1400087
+#define __FreeBSD_version 1400088
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 4:45 PM (2 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33047456
Default Alt Text
D39491.diff (1 KB)

Event Timeline