svn commit: r248373 - head/sys/netinet

Gleb Smirnoff glebius at FreeBSD.org
Sat Mar 16 08:58:29 UTC 2013


Author: glebius
Date: Sat Mar 16 08:58:28 2013
New Revision: 248373
URL: http://svnweb.freebsd.org/changeset/base/248373

Log:
  - Replace compat macros with function calls.

Modified:
  head/sys/netinet/igmp.c
  head/sys/netinet/ip_options.c
  head/sys/netinet/tcp_output.c

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Sat Mar 16 08:57:36 2013	(r248372)
+++ head/sys/netinet/igmp.c	Sat Mar 16 08:58:28 2013	(r248373)
@@ -2203,7 +2203,7 @@ igmp_v1v2_queue_report(struct in_multi *
 
 	ifp = inm->inm_ifp;
 
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOMEM);
 	MH_ALIGN(m, sizeof(struct ip) + sizeof(struct igmp));

Modified: head/sys/netinet/ip_options.c
==============================================================================
--- head/sys/netinet/ip_options.c	Sat Mar 16 08:57:36 2013	(r248372)
+++ head/sys/netinet/ip_options.c	Sat Mar 16 08:58:28 2013	(r248373)
@@ -500,7 +500,7 @@ ip_insertoptions(struct mbuf *m, struct 
 			*phlen = 0;
 			return (m);
 		}
-		M_MOVE_PKTHDR(n, m);
+		m_move_pkthdr(n, m);
 		n->m_pkthdr.rcvif = NULL;
 		n->m_pkthdr.len += optlen;
 		m->m_len -= sizeof(struct ip);

Modified: head/sys/netinet/tcp_output.c
==============================================================================
--- head/sys/netinet/tcp_output.c	Sat Mar 16 08:57:36 2013	(r248372)
+++ head/sys/netinet/tcp_output.c	Sat Mar 16 08:58:28 2013	(r248373)
@@ -898,7 +898,7 @@ send:
 		else
 			TCPSTAT_INC(tcps_sndwinup);
 
-		MGETHDR(m, M_NOWAIT, MT_DATA);
+		m = m_gethdr(M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;


More information about the svn-src-all mailing list