Luka Perkov
12 years ago
parent
5be36cbe83
commit
580481cd6d
@ -1,36 +0,0 @@ |
||||
--- a/include/linux/pkt_sched.h
|
||||
+++ b/include/linux/pkt_sched.h
|
||||
@@ -214,6 +214,33 @@ struct tc_sfq_xstats {
|
||||
__s32 allot;
|
||||
};
|
||||
|
||||
+/* ESFQ section */
|
||||
+
|
||||
+enum
|
||||
+{
|
||||
+ /* traditional */
|
||||
+ TCA_SFQ_HASH_CLASSIC,
|
||||
+ TCA_SFQ_HASH_DST,
|
||||
+ TCA_SFQ_HASH_SRC,
|
||||
+ TCA_SFQ_HASH_FWMARK,
|
||||
+ /* conntrack */
|
||||
+ TCA_SFQ_HASH_CTORIGDST,
|
||||
+ TCA_SFQ_HASH_CTORIGSRC,
|
||||
+ TCA_SFQ_HASH_CTREPLDST,
|
||||
+ TCA_SFQ_HASH_CTREPLSRC,
|
||||
+ TCA_SFQ_HASH_CTNATCHG,
|
||||
+};
|
||||
+
|
||||
+struct tc_esfq_qopt
|
||||
+{
|
||||
+ unsigned quantum; /* Bytes per round allocated to flow */
|
||||
+ int perturb_period; /* Period of hash perturbation */
|
||||
+ __u32 limit; /* Maximal packets in queue */
|
||||
+ unsigned divisor; /* Hash divisor */
|
||||
+ unsigned flows; /* Maximal number of flows */
|
||||
+ unsigned hash_kind; /* Hash function to use for flow identification */
|
||||
+};
|
||||
+
|
||||
/* RED section */
|
||||
|
||||
enum {
|
||||
@ -1,8 +1,10 @@ |
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -1,6 +1,6 @@
|
||||
include ../Config
|
||||
|
||||
-CFLAGS += -fPIC
|
||||
+CFLAGS+=$(FPIC)
|
||||
+CFLAGS += $(FPIC)
|
||||
|
||||
UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o
|
||||
|
||||
|
||||
@ -1,58 +0,0 @@ |
||||
From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Tue, 18 Dec 2012 09:18:45 -0800
|
||||
Subject: [PATCH] build: unbreak linakge of m_xt.so
|
||||
|
||||
Commit v3.7.0~10 caused the variable new PKG_CONFIG variable never
|
||||
to be present at the time of calling make, leading to tc/m_xt.so
|
||||
not linked with -lxtables (result from pkg-config xtables --libs),
|
||||
that in turn leading to
|
||||
|
||||
tc: symbol lookup error: /usr/lib64/tc//m_xt.so: undefined symbol:
|
||||
xtables_init_all
|
||||
|
||||
Fixing that.
|
||||
|
||||
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
Conflicts:
|
||||
configure
|
||||
---
|
||||
configure | 14 +++++++++++---
|
||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2,14 +2,20 @@
|
||||
# This is not an autconf generated configure
|
||||
#
|
||||
INCLUDE=${1:-"$PWD/include"}
|
||||
-: ${PKG_CONFIG:=pkg-config}
|
||||
-: ${CC=gcc}
|
||||
-echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
|
||||
|
||||
# Make a temp directory in build tree.
|
||||
TMPDIR=$(mktemp -d config.XXXXXX)
|
||||
trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
|
||||
|
||||
+check_toolchain()
|
||||
+{
|
||||
+: ${PKG_CONFIG:=pkg-config}
|
||||
+: ${AR=ar}
|
||||
+: ${CC=gcc}
|
||||
+echo "AR:=${AR}" >>Config
|
||||
+echo "CC:=${CC}" >>Config
|
||||
+}
|
||||
+
|
||||
check_atm()
|
||||
{
|
||||
cat >$TMPDIR/atmtest.c <<EOF
|
||||
@@ -224,6 +230,8 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsett
|
||||
}
|
||||
|
||||
echo "# Generated config based on" $INCLUDE >Config
|
||||
+echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config
|
||||
+check_toolchain
|
||||
|
||||
echo "TC schedulers"
|
||||
|
||||
Loading…
Reference in new issue