net: remove stale altq_input reference
Code setting it was removed in:
commit 325fab802e
Author: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Tue Dec 4 23:46:43 2018 +0000
altq: remove ALTQ3_COMPAT code
Reviewed by: glebius, kp
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D36471
This commit is contained in:
parent
653c36179d
commit
223a73a1c4
@ -78,7 +78,6 @@
|
|||||||
* internal function prototypes
|
* internal function prototypes
|
||||||
*/
|
*/
|
||||||
static void tbr_timeout(void *);
|
static void tbr_timeout(void *);
|
||||||
int (*altq_input)(struct mbuf *, int) = NULL;
|
|
||||||
static struct mbuf *tbr_dequeue(struct ifaltq *, int);
|
static struct mbuf *tbr_dequeue(struct ifaltq *, int);
|
||||||
static int tbr_timer = 0; /* token bucket regulator timer */
|
static int tbr_timer = 0; /* token bucket regulator timer */
|
||||||
#if !defined(__FreeBSD__) || (__FreeBSD_version < 600000)
|
#if !defined(__FreeBSD__) || (__FreeBSD_version < 600000)
|
||||||
|
@ -169,7 +169,6 @@ extern int altq_detach(struct ifaltq *);
|
|||||||
extern int altq_enable(struct ifaltq *);
|
extern int altq_enable(struct ifaltq *);
|
||||||
extern int altq_disable(struct ifaltq *);
|
extern int altq_disable(struct ifaltq *);
|
||||||
extern struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int);
|
extern struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int);
|
||||||
extern int (*altq_input)(struct mbuf *, int);
|
|
||||||
#if 0 /* ALTQ3_CLFIER_COMPAT */
|
#if 0 /* ALTQ3_CLFIER_COMPAT */
|
||||||
void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
|
void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
|
||||||
#endif
|
#endif
|
||||||
|
@ -251,14 +251,6 @@ ip_tryforward(struct mbuf *m)
|
|||||||
M_ASSERTVALID(m);
|
M_ASSERTVALID(m);
|
||||||
M_ASSERTPKTHDR(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
|
* Only IP packets without options
|
||||||
*/
|
*/
|
||||||
|
@ -532,12 +532,6 @@ ip_input(struct mbuf *m)
|
|||||||
goto bad;
|
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);
|
ip_len = ntohs(ip->ip_len);
|
||||||
if (__predict_false(ip_len < hlen)) {
|
if (__predict_false(ip_len < hlen)) {
|
||||||
IPSTAT_INC(ips_badlen);
|
IPSTAT_INC(ips_badlen);
|
||||||
|
@ -655,12 +655,6 @@ ip6_input(struct mbuf *m)
|
|||||||
in6_ifstat_inc(rcvif, ifs6_in_addrerr);
|
in6_ifstat_inc(rcvif, ifs6_in_addrerr);
|
||||||
goto bad;
|
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
|
* The following check is not documented in specs. A malicious
|
||||||
* party may be able to use IPv4 mapped addr to confuse tcp/udp stack
|
* party may be able to use IPv4 mapped addr to confuse tcp/udp stack
|
||||||
|
Loading…
Reference in New Issue
Block a user