[src/netbsd-2-0]: src/sys/net Pull up revision 1.116 (requested by jonathan i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa74f0e3f08b
branches:  netbsd-2-0
changeset: 561962:aa74f0e3f08b
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Jul 14 11:08:01 2004 +0000

description:
Pull up revision 1.116 (requested by jonathan in ticket #648):
Rename MBUFTRACE helper function m_claim() to m_claimm(),
for consistency with M_FREE() and m_freem().  Affected files:
sys/mbuf.h
kern/uipc_socket2.c
kern/uipc_mbuf.c
net/if_ethersubr.c
netatalk/ddp_input.c
nfs/nfs_socket.c

diffstat:

 sys/net/if_ethersubr.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r ce4c2b0c5ad2 -r aa74f0e3f08b sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Wed Jul 14 11:07:35 2004 +0000
+++ b/sys/net/if_ethersubr.c    Wed Jul 14 11:08:01 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.114.2.1 2004/06/07 06:30:11 jdc Exp $       */
+/*     $NetBSD: if_ethersubr.c,v 1.114.2.2 2004/07/14 11:08:01 tron Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.114.2.1 2004/06/07 06:30:11 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.114.2.2 2004/07/14 11:08:01 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -211,7 +211,7 @@
        short mflags;
 
 #ifdef MBUFTRACE
-       m_claim(m, ifp->if_mowner);
+       m_claimm(m, ifp->if_mowner);
 #endif
        if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
                senderr(ENETDOWN);
@@ -672,7 +672,7 @@
        }
 
 #ifdef MBUFTRACE
-       m_claim(m, &ec->ec_rx_mowner);
+       m_claimm(m, &ec->ec_rx_mowner);
 #endif
        eh = mtod(m, struct ether_header *);
        etype = ntohs(eh->ether_type);