Reviewed by: Archie@freebsd.org

This clears out my outstanding netgraph changes.
There is a netgraph change of design in the offing and this is to some
extent a superset of soem of the new functionality and some of the old
functionality that may be removed.

This code works as before, but allows some new features that I want to
work with and evaluate. It is the basis for a version of netgraph
with integral locking for SMP use.

This is running on my test machine with no new problems :-)

1 files changed, 4 insertions, 3 deletions

diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index ddd48b7040bd..6c84cda4cec2 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -153,7 +153,6 @@ static struct ng_type ng_mppc_typestruct = {
 	NULL,
 	NULL,
 	ng_mppc_rcvdata,
-	ng_mppc_rcvdata,
 	ng_mppc_disconnect,
 	NULL
 };
@@ -347,7 +346,7 @@ done:
  */
 static int
 ng_mppc_rcvdata(hook_p hook, struct mbuf *m, meta_p meta,
-		struct mbuf **ret_m, meta_p *ret_meta)
+		struct mbuf **ret_m, meta_p *ret_meta, struct ng_mesg **resp)
 {
 	const node_p node = hook->node;
 	const priv_p priv = node->private;
@@ -385,7 +384,9 @@ ng_mppc_rcvdata(hook_p hook, struct mbuf *m, meta_p meta,
 				    NGM_MPPC_RESETREQ, 0, M_NOWAIT);
 				if (msg == NULL)
 					return (error);
-				ng_send_msg(node, msg, priv->ctrlpath, NULL);
+				/* XXX can we use a hook instead of ctrlpath? */
+				ng_send_msg(node, msg, priv->ctrlpath,
+					NULL, NULL, NULL); 
 			}
 			return (error);
 		}