Page MenuHomeFreeBSD
Files F107460578

D36471.diff
No OneTemporary
Actions

D36471.diff
View Options

diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c
--- a/sys/net/altq/altq_subr.c
+++ b/sys/net/altq/altq_subr.c
@@ -78,7 +78,6 @@
* internal function prototypes
*/
static void tbr_timeout(void *);
-int (*altq_input)(struct mbuf *, int) = NULL;
static struct mbuf *tbr_dequeue(struct ifaltq *, int);
static int tbr_timer = 0; /* token bucket regulator timer */
#if !defined(__FreeBSD__) || (__FreeBSD_version < 600000)
diff --git a/sys/net/altq/if_altq.h b/sys/net/altq/if_altq.h
--- a/sys/net/altq/if_altq.h
+++ b/sys/net/altq/if_altq.h
@@ -169,7 +169,6 @@
extern int altq_enable(struct ifaltq *);
extern int altq_disable(struct ifaltq *);
extern struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int);
-extern int (*altq_input)(struct mbuf *, int);
#if 0 /* ALTQ3_CLFIER_COMPAT */
void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
#endif
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -251,14 +251,6 @@
M_ASSERTVALID(m);
M_ASSERTPKTHDR(m);
-#ifdef ALTQ
- /*
- * Is packet dropped by traffic conditioner?
- */
- if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0)
- goto drop;
-#endif
-
/*
* Only IP packets without options
*/
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -532,12 +532,6 @@
goto bad;
}
-#ifdef ALTQ
- if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0)
- /* packet is dropped by traffic conditioner */
- return;
-#endif
-
ip_len = ntohs(ip->ip_len);
if (__predict_false(ip_len < hlen)) {
IPSTAT_INC(ips_badlen);
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -655,12 +655,6 @@
in6_ifstat_inc(rcvif, ifs6_in_addrerr);
goto bad;
}
-#ifdef ALTQ
- if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) {
- /* packet is dropped by traffic conditioner */
- return;
- }
-#endif
/*
* The following check is not documented in specs. A malicious
* party may be able to use IPv4 mapped addr to confuse tcp/udp stack

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 15, 11:57 AM (11 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15810353
Default Alt Text
D36471.diff (2 KB)

Event Timeline