d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove code which would never be used, viz a viz Quality-of-Service;

Browse Source 
the token bucket filter got killed in netinet, so it gets killed here
too. Correct comments.
This commit is contained in:
bms 2007-02-28 20:32:25 +00:00
parent d055e36582
commit ad7a801a07
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/netinet6/ip6_mroute.c
View File

@ -231,9 +231,7 @@ static int pim6;
/*
* Find a route for a given origin IPv6 address and Multicast group address.
* Quality of service parameter to be added in the future!!!
*/
#define MF6CFIND(o, g, rt) do { \
struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \
rt = NULL; \
@ -543,10 +541,6 @@ X_ip6_mrouter_done(void)
}
}
}
#ifdef notyet
bzero((caddr_t)qtable, sizeof(qtable));
bzero((caddr_t)tbftable, sizeof(tbftable));
#endif
bzero((caddr_t)mif6table, sizeof(mif6table));
nummifs = 0;
@ -612,9 +606,6 @@ add_m6if(mifcp)
struct mif6 *mifp;
struct ifnet *ifp;
int error, s;
#ifdef notyet
struct tbf *m_tbf = tbftable + mifcp->mif6c_mifi;
#endif
if (mifcp->mif6c_mifi >= MAXMIFS)
return (EINVAL);
@ -660,10 +651,7 @@ add_m6if(mifcp)
s = splnet();
mifp->m6_flags = mifcp->mif6c_flags;
mifp->m6_ifp = ifp;
#ifdef notyet
/* scaling up here allows division by 1024 in critical code */
mifp->m6_rate_limit = mifcp->mif6c_rate_limit * 1024 / 1000;
#endif
/* initialize per mif pkt counters */
mifp->m6_pkt_in = 0;
mifp->m6_pkt_out = 0;
@ -723,10 +711,6 @@ del_m6if(mifip)
}
}
#ifdef notyet
bzero((caddr_t)qtable[*mifip], sizeof(qtable[*mifip]));
bzero((caddr_t)mifp->m6_tbf, sizeof(*(mifp->m6_tbf)));
#endif
bzero((caddr_t)mifp, sizeof(*mifp));
/* Adjust nummifs down */

6
sys/netinet6/ip6_mroute.h
View File

@ -103,9 +103,6 @@ struct mif6ctl {
mifi_t mif6c_mifi; /* the index of the mif to be added */
u_char mif6c_flags; /* MIFF_ flags defined below */
u_short mif6c_pifi; /* the index of the physical IF */
#ifdef notyet
u_int mif6c_rate_limit; /* max rate */
#endif
};
#define MIFF_REGISTER 0x1 /* mif represents a register end-point */
@ -209,9 +206,6 @@ struct sioc_mif_req6 {
struct mif6 {
u_char m6_flags; /* MIFF_ flags defined above */
u_int m6_rate_limit; /* max rate */
#ifdef notyet
struct tbf *m6_tbf; /* token bucket structure at intf. */
#endif
struct in6_addr m6_lcl_addr; /* local interface address */
struct ifnet *m6_ifp; /* pointer to interface */
u_quad_t m6_pkt_in; /* # pkts in on interface */