On Wed, Jan 02, 2013 at 07:40:19PM -0600, Ryan Ozmun wrote:
> On Wed, 2 Jan 2013, Jason McIntyre wrote:
>
> > On Wed, Jan 02, 2013 at 03:07:14PM -0600, r...@ozmun.us wrote:
> > > --- mbuf.9 17 Nov 2012 10:55:21 -0000 1.58
> > > +++ mbuf.9 2 Jan 2013 21:04:56 -0000
> >
> > this diff doesn;t apply cleanly. is your mailer mangling spaces or
> > something?
> >
> > jmc
> >
> >
>
> Yeah, this one should work:
>
yep. fixed now, thanks.
jmc
> --- mbuf.9 17 Nov 2012 10:55:21 -0000 1.58
> +++ mbuf.9 2 Jan 2013 21:04:56 -0000
> @@ -25,7 +25,7 @@
> .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> .\"
> -.Dd $Mdocdate: November 17 2012 $
> +.Dd $Mdocdate: January 2 2013 $
> .Dt MBUF 9
> .Os
> .Sh NAME
> @@ -110,31 +110,38 @@
> };
>
> struct pkthdr {
> - struct ifnet *rcvif;
> - SLIST_HEAD(packet_tags, m_tag) tags;
> - int len;
> - u_int16_t csum_flags;
> - u_int16_t ether_vtag;
> + struct ifnet *rcvif;
> + SLIST_HEAD(packet_tags, m_tag) tags;
> + int len;
> + u_int16_t tagsset;
> + u_int16_t pad;
> + u_int16_t csum_flags;
> + u_int16_t ether_vtag;
> + u_int rdomain;
> struct pkthdr_pf pf;
> };
>
> struct pkthdr_pf {
> void *hdr;
> - u_int rtableid;
> + void *statekey;
> u_int32_t qid;
> u_int16_t tag;
> u_int8_t flags;
> u_int8_t routed;
> + u_int8_t prio;
> + u_int8_t pad[3];
> };
>
> -struct m_ext {
> - caddr_t ext_buf;
> - void (*ext_free)(caddr_t, u_int, void *);
> - void *ext_arg;
> - u_int ext_size;
> - int ext_type;
> - struct mbuf *ext_nextref;
> - struct mbuf *ext_prevref;
> +struct mbuf_ext {
> + caddr_t ext_buf;
> + void (*ext_free)(caddr_t, u_int, void *);
> + void *ext_arg;
> + u_int ext_size;
> + int ext_type;
> + struct ifnet* ext_ifp;
> + int ext_backend;
> + struct mbuf *ext_nextref;
> + struct mbuf *ext_prevref;
> };
>
> struct mbuf {
> @@ -143,7 +150,7 @@
> struct {
> struct pkthdr MH_pkthdr;
> union {
> - struct m_ext MH_ext;
> + struct mbuf_ext MH_ext;
> char MH_databuf[MHLEN];
> } MH_dat;
> } MH;
