From owner-svn-src-all@FreeBSD.ORG Wed Mar 12 21:09:25 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BAFCCAC for ; Wed, 12 Mar 2014 21:09:25 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A3A9D17D for ; Wed, 12 Mar 2014 21:09:24 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id s7so63406lbd.15 for ; Wed, 12 Mar 2014 14:09:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=z/yHVsglUZXflixFoGn3PdSp6wgeCXCiq0GNoW3hPJs=; b=jTGKlQXttFlsB4nUFhY6rCosEsWwhM00ZUx02M7K9sApacQbsmWkBl3A6TX/VsQHfg xxVAVs2zIrqrpURsX0xNS+J3vV49W7cu4irSvgN+DcZjMHY1k88H/i8hCi0Cy5zw19mU k7qInkaQKd2zNMVlF87Hk8z1sSH3GgTITW1i7VktvgVIXLWxWSa8AsXAnQ3+OxVmWj/x D3GSSxCNXC/omtlYPzLgY7gp82LSO1iAgA2PnRlC1yGB++4sQ/s9QlRa+3SYvfc6hxBV qVMBRouvtUeBl6U4nx9U2GQfbryXX+boajX1485f55baKo0k04Yh7ofYd/zRJaxwtq5u 47vQ== X-Gm-Message-State: ALoCoQn5xrJ3tApm/JvkRAIjsKnI+VWXqajlVGfLtNFvJBlywRRffyjTB7quvVInGV6lEQCHrokA X-Received: by 10.152.19.7 with SMTP id a7mr10990806lae.16.1394658556801; Wed, 12 Mar 2014 14:09:16 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id th3sm29990910lbb.11.2014.03.12.14.09.15 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 14:09:16 -0700 (PDT) Message-ID: <5320CCFB.7090301@freebsd.org> Date: Thu, 13 Mar 2014 01:09:15 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Gleb Smirnoff , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r263091 - in head/sys: netinet netinet6 References: <201403121429.s2CET8Hh038762@svn.freebsd.org> In-Reply-To: <201403121429.s2CET8Hh038762@svn.freebsd.org> X-Enigmail-Version: 1.7a1pre Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 21:09:25 -0000 On 12.03.2014 18:29, Gleb Smirnoff wrote: > --- head/sys/netinet/ip_input.c Wed Mar 12 12:27:13 2014 (r263090) > +++ head/sys/netinet/ip_input.c Wed Mar 12 14:29:08 2014 (r263091) > @@ -794,6 +795,8 @@ SYSCTL_PROC(_net_inet_ip, OID_AUTO, maxf > NULL, 0, sysctl_maxnipq, "I", > "Maximum number of IPv4 fragment reassembly queue entries"); > > +#define M_IP_FRAG M_PROTO9 > + > /* > * Take incoming datagram fragment and try to reassemble it into > * whole datagram. If the argument is the first fragment or one > > Modified: head/sys/netinet6/in6.h > ============================================================================== > --- head/sys/netinet6/in6.h Wed Mar 12 12:27:13 2014 (r263090) > +++ head/sys/netinet6/in6.h Wed Mar 12 14:29:08 2014 (r263091) > @@ -622,13 +622,18 @@ struct ip6_mtuinfo { > #endif /* __BSD_VISIBLE */ > > /* > - * Redefinition of mbuf flags > + * Since both netinet/ and netinet6/ call into netipsec/ and netpfil/, > + * the protocol specific mbuf flags are shared between them. > */ > -#define M_AUTHIPHDR M_PROTO2 > -#define M_DECRYPTED M_PROTO3 > -#define M_LOOP M_PROTO4 > -#define M_AUTHIPDGM M_PROTO5 > -#define M_RTALERT_MLD M_PROTO6 > +#define M_FASTFWD_OURS M_PROTO1 /* changed dst to local */ > +#define M_IP6_NEXTHOP M_PROTO2 /* explicit ip nexthop */ > +#define M_IP_NEXTHOP M_PROTO2 /* explicit ip nexthop */ > +#define M_SKIP_FIREWALL M_PROTO3 /* skip firewall processing */ > +#define M_AUTHIPHDR M_PROTO4 > +#define M_DECRYPTED M_PROTO5 > +#define M_LOOP M_PROTO6 > +#define M_AUTHIPDGM M_PROTO7 > +#define M_RTALERT_MLD M_PROTO8 > Next time someone add new mbuf flag to in6.h, it will be M_PROTO9 and situation repeat itself, since you left M_PROTO9 in ip_input.c -- http://ache.vniz.net/