diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-11 09:12:21 -0600 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-11 09:12:21 -0600 |
commit | b24875947f184e461a05c24a653b99071580feef (patch) | |
tree | 37a5ba38e344e1f5b584cce9f0b7d22fa78c8000 /sys/netpfil | |
parent | 53be5c5f6ada07c03bef4582a9634e682f026892 (diff) | |
download | FreeBSD-src-b24875947f184e461a05c24a653b99071580feef.zip FreeBSD-src-b24875947f184e461a05c24a653b99071580feef.tar.gz |
Revert "Importing pfSense patch fairq.RELENG_10.diff"
This reverts commit 570dae5561e54cd2703f546b04a3fa029c92dc62.
TAG: FAIRQ
Diffstat (limited to 'sys/netpfil')
-rw-r--r-- | sys/netpfil/pf/pf.c | 19 | ||||
-rw-r--r-- | sys/netpfil/pf/pf_altq.h | 15 | ||||
-rw-r--r-- | sys/netpfil/pf/pf_mtag.h | 2 |
3 files changed, 0 insertions, 36 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c4f1b9d..91ca4fe 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -614,21 +614,6 @@ pf_hashsrc(struct pf_addr *addr, sa_family_t af) return (h & pf_srchashmask); } -#ifdef ALTQ -/* XXX: revisit this with ALTQ_WFQ/dummynet */ -static int -pf_state_hash(struct pf_state *s) -{ - u_int32_t hv = (intptr_t)s / sizeof(*s); - - hv ^= crc32(&s->src, sizeof(s->src)); - hv ^= crc32(&s->dst, sizeof(s->dst)); - if (hv == 0) - hv = 1; - return (hv); -} -#endif - #ifdef INET6 void pf_addrcpy(struct pf_addr *dst, struct pf_addr *src, sa_family_t af) @@ -6445,8 +6430,6 @@ done: pd.act.qid = r->qid; } if (action == PF_PASS && pd.act.qid) { - if (s != NULL) - pd.pf_mtag->qid_hash = pf_state_hash(s); if (pqid || (pd.tos & IPTOS_LOWDELAY)) pd.pf_mtag->qid = pd.act.pqid; else @@ -7021,8 +7004,6 @@ done: pd.act.qid = r->qid; } if (action == PF_PASS && pd.act.qid) { - if (s != NULL) - pd.pf_mtag->qid_hash = pf_state_hash(s); if (pd.tos & IPTOS_LOWDELAY) pd.pf_mtag->qid = pd.act.pqid; else diff --git a/sys/netpfil/pf/pf_altq.h b/sys/netpfil/pf/pf_altq.h index db681fb..eda0965 100644 --- a/sys/netpfil/pf/pf_altq.h +++ b/sys/netpfil/pf/pf_altq.h @@ -65,20 +65,6 @@ struct hfsc_opts { int flags; }; -/* - * XXX this needs some work - */ -struct fairq_opts { - u_int nbuckets; - u_int hogs_m1; - int flags; - - /* link sharing service curve */ - u_int lssc_m1; - u_int lssc_d; - u_int lssc_m2; -}; - struct pf_altq { char ifname[IFNAMSIZ]; @@ -105,7 +91,6 @@ struct pf_altq { struct cbq_opts cbq_opts; struct priq_opts priq_opts; struct hfsc_opts hfsc_opts; - struct fairq_opts fairq_opts; } pq_u; uint32_t qid; /* return value */ diff --git a/sys/netpfil/pf/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h index 3ec08a2..3aacb2e 100644 --- a/sys/netpfil/pf/pf_mtag.h +++ b/sys/netpfil/pf/pf_mtag.h @@ -44,11 +44,9 @@ struct pf_mtag { void *hdr; /* saved hdr pos in mbuf, for ECN */ u_int32_t qid; /* queue id */ - u_int32_t qid_hash; /* queue hashid used by WFQ like algos */ u_int16_t tag; /* tag id */ u_int8_t flags; u_int8_t routed; - u_int8_t af; /* for ECN */ }; static __inline struct pf_mtag * |