Date: Wed, 28 Nov 2018 11:58:40 +0000 (UTC) From: Oleg Bulyzhin <oleg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r341139 - stable/12/sys/net Message-ID: <201811281158.wASBwewv039029@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oleg Date: Wed Nov 28 11:58:40 2018 New Revision: 341139 URL: https://svnweb.freebsd.org/changeset/base/341139 Log: MFC r340724: Unbreak kernel build with VLAN_ARRAY defined. Modified: stable/12/sys/net/if_vlan.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/if_vlan.c ============================================================================== --- stable/12/sys/net/if_vlan.c Wed Nov 28 09:25:43 2018 (r341138) +++ stable/12/sys/net/if_vlan.c Wed Nov 28 11:58:40 2018 (r341139) @@ -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?201811281158.wASBwewv039029>