svn commit: r269046 - in stable/10/sys: kern net

[Kevin Lo]

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;