From owner-svn-src-projects@FreeBSD.ORG Wed Oct 13 11:23:28 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30A1C1065675; Wed, 13 Oct 2010 11:23:28 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1EEA78FC12; Wed, 13 Oct 2010 11:23:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9DBNSoC085767; Wed, 13 Oct 2010 11:23:28 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DBNSuo085765; Wed, 13 Oct 2010 11:23:28 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201010131123.o9DBNSuo085765@svn.freebsd.org> From: Attilio Rao Date: Wed, 13 Oct 2010 11:23:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213768 - projects/sv/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 11:23:28 -0000 Author: attilio Date: Wed Oct 13 11:23:27 2010 New Revision: 213768 URL: http://svn.freebsd.org/changeset/base/213768 Log: In HEAD, don't use the spare but just add the member at the right place. Modified: projects/sv/sys/net/if_var.h Modified: projects/sv/sys/net/if_var.h ============================================================================== --- projects/sv/sys/net/if_var.h Wed Oct 13 11:04:55 2010 (r213767) +++ projects/sv/sys/net/if_var.h Wed Oct 13 11:23:27 2010 (r213768) @@ -197,6 +197,7 @@ struct ifnet { void *if_pf_kif; void *if_lagg; /* lagg glue */ u_char if_alloctype; /* if_type at time of allocation */ + struct netdump_methods *if_ndumpfuncs; /* netdump virtual methods */ /* * Spare fields are added so that we can modify sensitive data @@ -205,8 +206,7 @@ struct ifnet { */ char if_cspare[3]; char *if_description; /* interface description */ - struct netdump_methods *if_ndumpfuncs; /* netdump virtual methods */ - void *if_pspare[6]; + void *if_pspare[7]; int if_ispare[4]; };