Date: Wed, 21 Nov 2018 13:34:22 +0000 (UTC) From: Oleg Bulyzhin <oleg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340724 - head/sys/net Message-ID: <201811211334.wALDYMIB041238@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811211334.wALDYMIB041238>