svn commit: r341508 - in head/sys: conf net/altq

[Eric van Gyzen]

Author: vangyzen
Date: Tue Dec  4 23:53:42 2018
New Revision: 341508
URL: https://svnweb.freebsd.org/changeset/base/341508

Log:
  altq:  manual cleanup after r341507
  
  Remove a file that became practically empty.
  Fix indentation.
  
  Like r341507, I do not plan to MFC, but anyone else can.

Deleted:
  head/sys/net/altq/altq_cdnr.c
Modified:
  head/sys/conf/files
  head/sys/net/altq/altq_cbq.c
  head/sys/net/altq/altq_hfsc.c
  head/sys/net/altq/altq_priq.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Dec  4 23:46:43 2018	(r341507)
+++ head/sys/conf/files	Tue Dec  4 23:53:42 2018	(r341508)
@@ -4058,7 +4058,6 @@ libkern/timingsafe_bcmp.c	standard
 libkern/zlib.c			optional crypto | geom_uzip | ipsec | \
 	ipsec_support | mxge | netgraph_deflate | ddb_ctf | gzio
 net/altq/altq_cbq.c		optional altq
-net/altq/altq_cdnr.c		optional altq
 net/altq/altq_codel.c		optional altq
 net/altq/altq_hfsc.c		optional altq
 net/altq/altq_fairq.c		optional altq

Modified: head/sys/net/altq/altq_cbq.c
==============================================================================
--- head/sys/net/altq/altq_cbq.c	Tue Dec  4 23:46:43 2018	(r341507)
+++ head/sys/net/altq/altq_cbq.c	Tue Dec  4 23:53:42 2018	(r341508)
@@ -483,7 +483,7 @@ cbq_enqueue(struct ifaltq *ifq, struct mbuf *m, struct
 			return (ENOBUFS);
 		}
 	}
-		cl->pktattr_ = NULL;
+	cl->pktattr_ = NULL;
 	len = m_pktlen(m);
 	if (rmc_queue_packet(cl, m) != 0) {
 		/* drop occurred.  some mbuf was freed in rmc_queue_packet. */

Modified: head/sys/net/altq/altq_hfsc.c
==============================================================================
--- head/sys/net/altq/altq_hfsc.c	Tue Dec  4 23:46:43 2018	(r341507)
+++ head/sys/net/altq/altq_hfsc.c	Tue Dec  4 23:53:42 2018	(r341508)
@@ -689,7 +689,7 @@ hfsc_enqueue(struct ifaltq *ifq, struct mbuf *m, struc
 			return (ENOBUFS);
 		}
 	}
-		cl->cl_pktattr = NULL;
+	cl->cl_pktattr = NULL;
 	len = m_pktlen(m);
 	if (hfsc_addq(cl, m) != 0) {
 		/* drop occurred.  mbuf was freed in hfsc_addq. */

Modified: head/sys/net/altq/altq_priq.c
==============================================================================
--- head/sys/net/altq/altq_priq.c	Tue Dec  4 23:46:43 2018	(r341507)
+++ head/sys/net/altq/altq_priq.c	Tue Dec  4 23:53:42 2018	(r341508)
@@ -473,7 +473,7 @@ priq_enqueue(struct ifaltq *ifq, struct mbuf *m, struc
 			return (ENOBUFS);
 		}
 	}
-		cl->cl_pktattr = NULL;
+	cl->cl_pktattr = NULL;
 	len = m_pktlen(m);
 	if (priq_addq(cl, m) != 0) {
 		/* drop occurred.  mbuf was freed in priq_addq. */