Author: oleg
Date: Thu Nov 29 15:26:07 2018
New Revision: 341236
URL: https://svnweb.freebsd.org/changeset/base/341236
Log:
MFS r341139:
MFC r340724:
Unbreak kernel build with VLAN_ARRAY defined.
Approved by: re (gjb)
Modified:
releng/12.0/sys/net/if_vlan.c
Directory Properties:
releng/12.0/ (props changed)
Modified: releng/12.0/sys/net/if_vlan.c
==============================================================================
--- releng/12.0/sys/net/if_vlan.c Thu Nov 29 15:07:59 2018
(r341235)
+++ releng/12.0/sys/net/if_vlan.c Thu Nov 29 15:26:07 2018
(r341236)
@@ -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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
