Permalink
Browse files

sync with -current

  • Loading branch information...
1 parent 4a22e7a commit d477d9c66f45588b99d09e0dbafd42adfef62ed8 kent committed Apr 29, 2005
Showing 4,153 changed files with 172,988 additions and 103,480 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_afmap.c,v 1.7 2004/04/21 18:40:37 itojun Exp $ */
+/* $NetBSD: altq_afmap.c,v 1.7.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_afmap.c,v 1.7 2004/04/21 18:40:37 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_afmap.c,v 1.7.4.1 2005/04/29 11:27:58 kent Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -79,7 +79,7 @@ afm_alloc(ifp)
struct ifnet *ifp;
{
struct afm_head *head;
-
+
MALLOC(head, struct afm_head *, sizeof(struct afm_head),
M_DEVBUF, M_WAITOK);
if (head == NULL)
@@ -90,10 +90,10 @@ afm_alloc(ifp)
LIST_INIT(&head->afh_head);
head->afh_ifp = ifp;
-
+
/* add this afm_head to the chain */
LIST_INSERT_HEAD(&afhead_chain, head, afh_chain);
-
+
return (0);
}
@@ -130,7 +130,7 @@ afm_top(ifp)
break;
if (head == NULL)
return NULL;
-
+
return (head->afh_head.lh_first);
}
@@ -174,7 +174,7 @@ int afm_add(ifp, flowmap)
return 0;
}
-int
+int
afm_remove(afm)
struct afm *afm;
{
@@ -183,7 +183,7 @@ afm_remove(afm)
return (0);
}
-int
+int
afm_removeall(ifp)
struct ifnet *ifp;
{
@@ -395,7 +395,7 @@ afmioctl(dev, cmd, addr, flag, p)
/* lookup interface */
flowmap = (struct atm_flowmap *)addr;
- flowmap->af_ifname[IFNAMSIZ-1] = '\0';
+ flowmap->af_ifname[IFNAMSIZ-1] = '\0';
ifp = ifunit(flowmap->af_ifname);
if (ifp == NULL || ifp->if_ioctl == NULL ||
(ifp->if_flags & IFF_RUNNING) == 0)
View
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.c,v 1.10 2004/06/26 07:22:11 abs Exp $ */
+/* $NetBSD: altq_blue.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_blue.c,v 1.8 2002/01/07 11:25:40 kjc Exp $ */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.10 2004/06/26 07:22:11 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -181,7 +181,7 @@ blueioctl(dev, cmd, addr, flag, p)
#endif
break;
}
-
+
switch (cmd) {
case BLUE_ENABLE:
@@ -217,7 +217,7 @@ blueioctl(dev, cmd, addr, flag, p)
M_DEVBUF, M_WAITOK);
(void)memset(rqp->rq_q, 0, sizeof(class_queue_t));
- MALLOC(rqp->rq_blue, blue_t *, sizeof(blue_t), M_DEVBUF, M_WAITOK);
+ MALLOC(rqp->rq_blue, blue_t *, sizeof(blue_t), M_DEVBUF, M_WAITOK);
(void)memset(rqp->rq_blue, 0, sizeof(blue_t));
rqp->rq_ifq = &ifp->if_snd;
@@ -304,7 +304,7 @@ blueioctl(dev, cmd, addr, flag, p)
if (fc->blue_hold_time > 0)
rqp->rq_blue->blue_hold_time = fc->blue_hold_time;
rqp->rq_blue->blue_flags = fc->blue_flags;
-
+
blue_init(rqp->rq_blue, rqp->rq_blue->blue_flags,
rqp->rq_blue->blue_pkttime,
rqp->rq_blue->blue_max_pmark,
@@ -353,7 +353,7 @@ static int blue_detach(rqp)
* blue support routines
*/
-int
+int
blue_init(rp, flags, pkttime, blue_max_pmark, blue_hold_time)
blue_t *rp;
int flags;
@@ -362,7 +362,7 @@ blue_init(rp, flags, pkttime, blue_max_pmark, blue_hold_time)
int blue_hold_time;
{
int npkts_per_sec;
-
+
rp->blue_idle = 1;
rp->blue_flags = flags;
rp->blue_pkttime = pkttime;
@@ -416,11 +416,11 @@ blue_addq(rp, q, m, pktattr)
struct altq_pktattr *pktattr;
{
int droptype;
-
+
/*
* if we were idle, this is an enqueue onto an empty queue
* and we should decrement marking probability
- *
+ *
*/
if (rp->blue_idle) {
struct timeval now;
@@ -451,7 +451,7 @@ blue_addq(rp, q, m, pktattr)
#ifdef BLUE_STATS
rp->blue_stats.marked_packets++;
#endif
- } else {
+ } else {
/* unforced drop by blue */
droptype = DTYPE_EARLY;
}
@@ -551,7 +551,7 @@ mark_ecn(m, pktattr, flags)
struct ip *ip = (struct ip *)pktattr->pattr_hdr;
u_int8_t otos;
int sum;
-
+
if (ip->ip_v != 4)
return (0); /* version mismatch! */
if ((ip->ip_tos & IPTOS_ECN_MASK) == IPTOS_ECN_NOTECT)
@@ -625,7 +625,7 @@ blue_dequeue(ifq, op)
if (op == ALTDQ_POLL)
return (qhead(rqp->rq_q));
-
+
m = blue_getq(rqp->rq_blue, rqp->rq_q);
if (m != NULL)
ifq->ifq_len--;
@@ -637,7 +637,7 @@ struct mbuf *blue_getq(rp, q)
class_queue_t *q;
{
struct mbuf *m;
-
+
if ((m = _getq(q)) == NULL) {
if (rp->blue_idle == 0) {
rp->blue_idle = 1;
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.h,v 1.2 2000/12/14 08:49:49 thorpej Exp $ */
+/* $NetBSD: altq_blue.h,v 1.2.34.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_blue.h,v 1.5 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -64,7 +64,7 @@ struct blue_conf {
#define BLUEF_ECN6 0x02 /* use packet marking for IPv6 packets */
#define BLUEF_ECN (BLUEF_ECN4 | BLUEF_ECN6)
-/*
+/*
* IOCTLs for BLUE
*/
#define BLUE_IF_ATTACH _IOW('Q', 1, struct blue_interface)
View
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.10 2004/04/23 02:58:28 simonb Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_cbq.c,v 1.11 2002/10/04 14:24:09 kjc Exp $ */
/*
@@ -27,12 +27,12 @@
* SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
* SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE. The software is
* provided "as is" without express or implied warranty of any kind.
- *
+ *
* These notices must be retained in any copies of any part of this software.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.10 2004/04/23 02:58:28 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -378,11 +378,11 @@ cbq_delete_filter(dfp)
{
char *ifacename;
cbq_state_t *cbqp;
-
+
ifacename = dfp->cbq_iface.cbq_ifacename;
if ((cbqp = altq_lookup(ifacename, ALTQT_CBQ)) == NULL)
return (EBADF);
-
+
return acc_delete_filter(&cbqp->cbq_classifier,
dfp->cbq_filter_handle);
}
@@ -632,7 +632,7 @@ cbq_ifattach(ifacep)
sizeof(struct rm_class *) * CBQ_MAX_CLASSES);
new_cbqp->cbq_qlen = 0;
new_cbqp->ifnp.ifq_ = &ifp->if_snd; /* keep the ifq */
-
+
/*
* set CBQ to this ifnet structure.
*/
@@ -939,7 +939,7 @@ static void cbq_class_dump(i)
return;
}
cl = cbq_list->cbq_class_tbl[i];
-
+
printf("class %d cl=%p\n", i, cl);
if (cl != NULL) {
s = &cl->stats_;
View
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.h,v 1.5 2003/08/20 23:32:25 itojun Exp $ */
+/* $NetBSD: altq_cbq.h,v 1.5.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_cbq.h,v 1.5 2000/12/02 13:44:40 kjc Exp $ */
/*
@@ -27,7 +27,7 @@
* SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
* SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE. The software is
* provided "as is" without express or implied warranty of any kind.
- *
+ *
* These notices must be retained in any copies of any part of this software.
*/
@@ -44,7 +44,7 @@
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
/*
* Define a well known class handles
@@ -72,7 +72,7 @@ typedef struct cbq_class_spec {
u_int nano_sec_per_byte;
u_int maxq;
u_int maxidle;
- int minidle;
+ int minidle;
u_int offtime;
u_long parent_class_handle;
u_long borrow_class_handle;
@@ -104,7 +104,7 @@ typedef struct cbq_class_spec {
struct cbq_add_class {
struct cbq_interface cbq_iface;
- cbq_class_spec_t cbq_class;
+ cbq_class_spec_t cbq_class;
u_long cbq_class_handle;
};
@@ -116,7 +116,7 @@ struct cbq_delete_class {
struct cbq_modify_class {
struct cbq_interface cbq_iface;
- cbq_class_spec_t cbq_class;
+ cbq_class_spec_t cbq_class;
u_long cbq_class_handle;
};
@@ -168,7 +168,7 @@ struct cbq_getstats {
class_stats_t *stats;
};
-/*
+/*
* Define IOCTLs for CBQ.
*/
#define CBQ_IF_ATTACH _IOW('Q', 1, struct cbq_interface)
@@ -216,6 +216,6 @@ typedef struct cbqstate {
#ifdef __cplusplus
}
-#endif
+#endif
#endif /* !_ALTQ_ALTQ_CBQ_H_ */
Oops, something went wrong.

0 comments on commit d477d9c

Please sign in to comment.