svn commit: r340724 - head/sys/net
Oleg Bulyzhin
oleg at FreeBSD.org
Wed Nov 21 13:34:23 UTC 2018
Author: oleg
Date: Wed Nov 21 13:34:21 2018
New Revision: 340724
URL: https://svnweb.freebsd.org/changeset/base/340724
Log:
Unbreak kernel build with VLAN_ARRAY defined.
MFC after: 1 week
Modified:
head/sys/net/if_vlan.c
Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c Wed Nov 21 12:46:28 2018 (r340723)
+++ head/sys/net/if_vlan.c Wed Nov 21 13:34:21 2018 (r340724)
@@ -314,15 +314,15 @@ VNET_DEFINE_STATIC(struct if_clone *, vlan_cloner);
#define V_vlan_cloner VNET(vlan_cloner)
#endif
-#ifndef VLAN_ARRAY
-#define HASH(n, m) ((((n) >> 8) ^ ((n) >> 4) ^ (n)) & (m))
-
static void
vlan_mc_free(struct epoch_context *ctx)
{
struct vlan_mc_entry *mc = __containerof(ctx, struct vlan_mc_entry, mc_epoch_ctx);
free(mc, M_VLAN);
}
+
+#ifndef VLAN_ARRAY
+#define HASH(n, m) ((((n) >> 8) ^ ((n) >> 4) ^ (n)) & (m))
static void
vlan_inithash(struct ifvlantrunk *trunk)
More information about the svn-src-all
mailing list