diff options
author | bms <bms@FreeBSD.org> | 2007-02-08 22:58:01 +0000 |
---|---|---|
committer | bms <bms@FreeBSD.org> | 2007-02-08 22:58:01 +0000 |
commit | 51ca9a4740b35cb1d740ba5773a23fd1820e841f (patch) | |
tree | 5b3b916c1e4ee47d097ea68fe20c5da5fd361d6b /sys/netinet/ip_mroute.h | |
parent | 3ae687fcd52db75e26b6d6ac26952a1aed0fe0d4 (diff) | |
download | FreeBSD-src-51ca9a4740b35cb1d740ba5773a23fd1820e841f.zip FreeBSD-src-51ca9a4740b35cb1d740ba5773a23fd1820e841f.tar.gz |
Nuke the token bucket filter code. Attempting to request rate limiting
by the token bucket filter will result in EINVAL being returned.
If you want to rate-limit traffic in future, use ALTQ or dummynet; this
isn't a general purpose QoS engine.
Preserve the now unused fields in struct vif so as to avoid having to
recompile netstat(1) and other tools.
Reviewed by: Pavlin Radslavov, Bill Fenner
Diffstat (limited to 'sys/netinet/ip_mroute.h')
-rw-r--r-- | sys/netinet/ip_mroute.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 6e5cf15..f2530a8 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -253,8 +253,8 @@ struct sioc_vif_req { struct vif { u_char v_flags; /* VIFF_ flags defined above */ u_char v_threshold; /* min ttl required to forward on vif*/ - u_int v_rate_limit; /* max rate */ - struct tbf *v_tbf; /* token bucket structure at intf. */ + u_int v_rate_limit; /* ignored; kept for compatibility */ + struct tbf *v_tbf; /* ignored; kept for compatibility */ struct in_addr v_lcl_addr; /* local interface address */ struct in_addr v_rmt_addr; /* remote address (tunnels only) */ struct ifnet *v_ifp; /* pointer to interface */ @@ -327,25 +327,6 @@ struct rtdetq { #define MAX_UPQ 4 /* max. no of pkts in upcall Q */ /* - * Token Bucket filter code - */ -#define MAX_BKT_SIZE 10000 /* 10K bytes size */ -#define MAXQSIZE 10 /* max # of pkts in queue */ - -/* - * the token bucket filter at each vif - */ -struct tbf -{ - struct timeval tbf_last_pkt_t; /* arr. time of last pkt */ - u_long tbf_n_tok; /* no of tokens in bucket */ - u_long tbf_q_len; /* length of queue at this vif */ - u_long tbf_max_q_len; /* max. queue length */ - struct mbuf *tbf_q; /* Packet queue */ - struct mbuf *tbf_t; /* tail-insertion pointer */ -}; - -/* * Structure for measuring the bandwidth and sending an upcall if the * measured bandwidth is above or below a threshold. */ |