Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid name collision [class_stats]

Browse Source
This commit is contained in:
christos 2003-01-06 03:44:23 +00:00
parent 340ca7145e
commit e1c163ef05
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/altq/altq_hfsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: altq_hfsc.c,v 1.6 2002/05/18 22:53:25 itojun Exp $ */
/* $NetBSD: altq_hfsc.c,v 1.7 2003/01/06 03:44:23 christos Exp $ */
/* $KAME: altq_hfsc.c,v 1.9 2001/10/26 04:56:11 kjc Exp $ */
/*
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.6 2002/05/18 22:53:25 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.7 2003/01/06 03:44:23 christos Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@ -144,7 +144,8 @@ static int hfsccmd_modify_class __P((struct hfsc_modify_class *));
static int hfsccmd_add_filter __P((struct hfsc_add_filter *));
static int hfsccmd_delete_filter __P((struct hfsc_delete_filter *));
static int hfsccmd_class_stats __P((struct hfsc_class_stats *));
static void get_class_stats __P((struct class_stats *, struct hfsc_class *));
static void get_class_stats __P((struct hfsc_basic_class_stats *,
struct hfsc_class *));
static struct hfsc_class *clh_to_clp __P((struct hfsc_if *, u_long));
static u_long clp_to_clh __P((struct hfsc_class *));
@ -1691,7 +1692,7 @@ hfsccmd_class_stats(ap)
{
struct hfsc_if *hif;
struct hfsc_class *cl;
struct class_stats stats, *usp;
struct hfsc_basic_class_stats stats, *usp;
int n, nclasses, error;
if ((hif = altq_lookup(ap->iface.hfsc_ifname, ALTQT_HFSC)) == NULL)
@ -1727,7 +1728,7 @@ hfsccmd_class_stats(ap)
}
static void get_class_stats(sp, cl)
struct class_stats *sp;
struct hfsc_basic_class_stats *sp;
struct hfsc_class *cl;
{
sp->class_id = cl->cl_id;

6
sys/altq/altq_hfsc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: altq_hfsc.h,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
/* $NetBSD: altq_hfsc.h,v 1.3 2003/01/06 03:44:24 christos Exp $ */
/* $KAME: altq_hfsc.h,v 1.6 2000/12/14 08:12:46 thorpej Exp $ */
/*
@ -111,7 +111,7 @@ struct hfsc_delete_filter {
u_long filter_handle;
};
struct class_stats {
struct hfsc_basic_class_stats {
u_int class_id;
u_long class_handle;
struct service_curve rsc;
@ -141,7 +141,7 @@ struct hfsc_class_stats {
u_int64_t cur_time; /* current time */
u_int hif_classes; /* # of classes in the tree */
u_int hif_packets; /* # of packets in the tree */
struct class_stats *stats; /* pointer to stats array */
struct _hsfc_class_stats_ *stats; /* pointer to stats array */
};
#define HFSC_IF_ATTACH _IOW('Q', 1, struct hfsc_attach)

11
sys/altq/altq_priq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: altq_priq.c,v 1.5 2001/11/12 23:14:22 lukem Exp $ */
/* $NetBSD: altq_priq.c,v 1.6 2003/01/06 03:44:24 christos Exp $ */
/* $KAME: altq_priq.c,v 1.2 2001/10/26 04:56:11 kjc Exp $ */
/*
* Copyright (C) 2000
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.5 2001/11/12 23:14:22 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.6 2003/01/06 03:44:24 christos Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@ -93,7 +93,8 @@ static int priqcmd_modify_class __P((struct priq_modify_class *));
static int priqcmd_add_filter __P((struct priq_add_filter *));
static int priqcmd_delete_filter __P((struct priq_delete_filter *));
static int priqcmd_class_stats __P((struct priq_class_stats *));
static void get_class_stats __P((struct class_stats *, struct priq_class *));
static void get_class_stats __P((struct priq_basic_class_stats *,
struct priq_class *));
static struct priq_class *clh_to_clp __P((struct priq_if *, u_long));
static u_long clp_to_clh __P((struct priq_class *));
@ -782,7 +783,7 @@ priqcmd_class_stats(ap)
{
struct priq_if *pif;
struct priq_class *cl;
struct class_stats stats, *usp;
struct priq_basic_class_stats stats, *usp;
int pri, error;
if ((pif = altq_lookup(ap->iface.ifname, ALTQT_PRIQ)) == NULL)
@ -806,7 +807,7 @@ priqcmd_class_stats(ap)
}
static void get_class_stats(sp, cl)
struct class_stats *sp;
struct priq_basic_class_stats *sp;
struct priq_class *cl;
{
sp->class_handle = clp_to_clh(cl);

6
sys/altq/altq_priq.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: altq_priq.h,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
/* $NetBSD: altq_priq.h,v 1.3 2003/01/06 03:44:24 christos Exp $ */
/* $KAME: altq_priq.h,v 1.1 2000/10/18 09:15:23 kjc Exp $ */
/*
* Copyright (C) 2000
@ -90,7 +90,7 @@ struct priq_delete_filter {
u_long filter_handle;
};
struct class_stats {
struct priq_basic_class_stats {
u_long class_handle;
u_int qlength;
@ -107,7 +107,7 @@ struct priq_class_stats {
struct priq_interface iface;
int maxpri; /* in/out */
struct class_stats *stats; /* pointer to stats array */
struct _priq_class_stats_ *stats; /* pointer to stats array */
};
#define PRIQ_IF_ATTACH _IOW('Q', 1, struct priq_interface)