From owner-svn-src-stable@FreeBSD.ORG  Thu Jul 24 06:02:04 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7C72051C;
 Thu, 24 Jul 2014 06:02:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 693542805;
 Thu, 24 Jul 2014 06:02:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6O6243h034139;
 Thu, 24 Jul 2014 06:02:04 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6O623Xt034136;
 Thu, 24 Jul 2014 06:02:03 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201407240602.s6O623Xt034136@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Thu, 24 Jul 2014 06:02:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r269046 - in stable/10/sys: kern net
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jul 2014 06:02:04 -0000

Author: kevlo
Date: Thu Jul 24 06:02:03 2014
New Revision: 269046
URL: http://svnweb.freebsd.org/changeset/base/269046

Log:
  MFC r268787:
  
  Deprecate m_act.  Use m_nextpkt always.

Modified:
  stable/10/sys/kern/uipc_usrreq.c
  stable/10/sys/net/if.c
  stable/10/sys/net/if_spppsubr.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/uipc_usrreq.c
==============================================================================
--- stable/10/sys/kern/uipc_usrreq.c	Thu Jul 24 05:59:32 2014	(r269045)
+++ stable/10/sys/kern/uipc_usrreq.c	Thu Jul 24 06:02:03 2014	(r269046)
@@ -2348,7 +2348,7 @@ unp_scan(struct mbuf *m0, void (*op)(str
 				}
 			}
 		}
-		m0 = m0->m_act;
+		m0 = m0->m_nextpkt;
 	}
 }
 

Modified: stable/10/sys/net/if.c
==============================================================================
--- stable/10/sys/net/if.c	Thu Jul 24 05:59:32 2014	(r269045)
+++ stable/10/sys/net/if.c	Thu Jul 24 06:02:03 2014	(r269046)
@@ -2009,7 +2009,7 @@ if_qflush(struct ifnet *ifp)
 #endif
 	n = ifq->ifq_head;
 	while ((m = n) != 0) {
-		n = m->m_act;
+		n = m->m_nextpkt;
 		m_freem(m);
 	}
 	ifq->ifq_head = 0;

Modified: stable/10/sys/net/if_spppsubr.c
==============================================================================
--- stable/10/sys/net/if_spppsubr.c	Thu Jul 24 05:59:32 2014	(r269045)
+++ stable/10/sys/net/if_spppsubr.c	Thu Jul 24 06:02:03 2014	(r269046)
@@ -4778,7 +4778,7 @@ sppp_qflush(struct ifqueue *ifq)
 
 	n = ifq->ifq_head;
 	while ((m = n)) {
-		n = m->m_act;
+		n = m->m_nextpkt;
 		m_freem (m);
 	}
 	ifq->ifq_head = 0;