svn commit: r250700 - in head/sys: conf net netinet6 sys

[Julian Elischer]

On 5/17/13 3:38 AM, Gleb Smirnoff wrote:
>    Sorry, I am slowpoke. Everything had already been noticed by
> other reviewers.
>
> On Fri, May 17, 2013 at 11:37:21AM +0400, Gleb Smirnoff wrote:
> T> On Thu, May 16, 2013 at 04:20:18PM +0000, Julian Elischer wrote:
> T> J> Modified: head/sys/sys/mbuf.h
> T> J> ==============================================================================
> T> J> --- head/sys/sys/mbuf.h	Thu May 16 15:28:38 2013	(r250699)
> T> J> +++ head/sys/sys/mbuf.h	Thu May 16 16:20:17 2013	(r250700)
> T> J> @@ -129,6 +129,8 @@ struct pkthdr {
> T> J>  		u_int16_t vt_vtag;	/* Ethernet 802.1p+q vlan tag */
> T> J>  		u_int16_t vt_nrecs;	/* # of IGMPv3 records in this chain */
> T> J>  	} PH_vt;
> T> J> +	u_int16_t	 fibnum;	/* this packet should use this fib */
> T> J> +	u_int16_t	 pad2;		/* align to 32 bits */
> T> J>  	SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */
> T> J>  };
> T> J>  #define ether_vtag	PH_vt.vt_vtag
> T> J> @@ -171,6 +173,7 @@ struct mbuf {
> T> J>  #define	m_type		m_hdr.mh_type
> T> J>  #define	m_flags		m_hdr.mh_flags
> T> J>  #define	m_nextpkt	m_hdr.mh_nextpkt
> T> J> +#define	m_fibnum	m_hdr.mh_nextpkt
oops this was a leftover.. not actually used..  will remove.
> T> J>  #define	m_act		m_nextpkt
> T> J>  #define	m_pkthdr	M_dat.MH.MH_pkthdr
> T> J>  #define	m_ext		M_dat.MH.MH_dat.MH_ext
> T>
> T> The define definitely looks incorrect.
> T>
> T> J> +static int inline
> T> J> +rt_m_getfib(struct mbuf *m)
> T> J> +{
> T> J> +	KASSERT(m->m_flags & M_EXT , ("attempt to set FIB on non header mbuf"));
> T> J> +	return (m->m_pkthdr.fibnum);
> T> J> +}
> T>
> T> The KASSERT looks incorrect. Text doesn't match the test. IMO, text is
> T> correct, but the test is not.
> T>
> T> J>  #define M_SETFIB(_m, _fib) do {						\
> T> J> -	_m->m_flags &= ~M_FIB;					   	\
> T> J> -	_m->m_flags |= (((_fib) << M_FIBSHIFT) & M_FIB);  \
> T> J> +        KASSERT((_m)->m_flags & M_EXT, ("No FIB on non header mbuf"));	\
> T> J> +	((_m)->m_pkthdr.fibnum) = (_fib);				\
> T> J>  } while (0)
> T>
> T> Same for this KASSERT.

KASSERT has been corrected.. cut-n-paste error
> T>
> T> IMO, any change to struct mbuf should be announced and posted for review
> T> prior to committing.
the change was agreed to at the last 2 devsummits in canada but never 
done...

> T>
> T> --
> T> Totus tuus, Glebius.
>