Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:dtaht/ceropackages-3.3

  • Loading branch information...
commit 973df755ce1fe945524a07b9d6ab301f3d54c858 2 parents 2ea6960 + 0b272f7
Dave Täht authored
2  net/babelm/Makefile
View
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=babelm
+PKG_NAME:=babeld
PKG_VERSION:=20120608-git-1
PKG_RELEASE:=1
2  net/debloat/Makefile
View
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=debloat
-PKG_VERSION:=4
+PKG_VERSION:=5
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
19 net/debloat/files/debloat
View
@@ -24,7 +24,7 @@ params = { "MDISC", "BIGDISC", "NORMDISC", "BINS", "MAX_HWQ_BYTES",
"OVERHEAD", "LINKLAYER", "MPU", "PPPOE", "ADSL",
"NOPRIOHOSTSRC","NOPRIOHOSTDST","NOPRIOPORTSRC",
"NOPRIOPORTDST", "EST_MIN", "EST_MAX", "HEADDROP", "ECNMASK",
- "qlen_vo", "qlen_vi", "qlen_be", "qlen_bk" }
+ "qlen_vo", "qlen_vi", "qlen_be", "qlen_bk", "CODEL_LL_QUANTUM" }
-- Useful defaults
@@ -51,9 +51,10 @@ env = { ["TC"] = "/sbin/tc",
["qlen_vo"] = 2,
["qlen_vi"] = 3,
["qlen_be"] = 3,
- ["qlen_bk"] = 32,
- ["MTU"] = 1500
- }
+ ["qlen_bk"] = 3,
+ ["MTU"] = 1500,
+ ["CODEL_LL_QUANTUM"] = 1514
+ }
wireless_debug = "/sys/kernel/debug/ieee80211/"
qlens = { "qlen_vo", "qlen_vi", "qlen_bk", "qlen_be" }
@@ -1240,10 +1241,12 @@ end
local function wireless_setup_ll(queuetype)
qa("handle 1 root mq")
- qap("1:1 handle %x %s limit 100 ecn target 10ms",VO, queuetype)
- qap("1:2 handle %x %s limit 100 ecn target 27ms quantum 3028",VI, queuetype)
- qap("1:3 handle %x %s limit 400 ecn target 27ms quantum 3028",BE, queuetype)
- qap("1:4 handle %x %s limit 600 ecn target 50ms",BK, queuetype)
+ qap("1:1 handle %x %s limit 100 noecn target 5ms",VO, queuetype)
+ qap("1:2 handle %x %s limit 200 ecn target 13ms quantum %d",VI, queuetype, env.CODEL_LL_QUANTUM)
+ qap("1:3 handle %x %s limit 400 ecn target 13ms quantum %d",BE, queuetype, env.CODEL_LL_QUANTUM)
+-- qap("1:2 handle %x %s limit 200 ecn target 27ms quantum 3028",VI, queuetype)
+-- qap("1:3 handle %x %s limit 400 ecn target 27ms quantum 3028",BE, queuetype)
+ qap("1:4 handle %x %s limit 600 noecn target 50ms",BK, queuetype)
wireless_filters()
end
4 net/quagga/Makefile
View
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=quagga
-PKG_VERSION:=0.99.17.10-10-git
+PKG_VERSION:=0.99.17.11-2-git
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://github.com/Quagga-RE/quagga-RE.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_VERSION:=fcc42fb073ceddcdfa11fe697b654947ec2d5366
+PKG_SOURCE_VERSION:=f6867153a9169406d0d1ec083acab977984d49ac
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
#PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/
3  net/quagga/files/babeld.conf
View
@@ -27,6 +27,7 @@ router babel
network gw01
network gw11
redistribute connected
+! redistribute kernel uncomment if you are a default gw
!
interface ge00
babel wired
@@ -53,6 +54,8 @@ interface gw01
! babel authentication mode sha512 key-chain home
interface gw11
babel wireless
+! the rxcost difference is there to give 5.x ghz a preference in case of tie
+ babel rxcost 253
! Allow buddy2 to get on your net via 5ghz only
! babel authentication mode sha512 key-chain buddy2
! babel authentication mode sha512 key-chain home
Please sign in to comment.
Something went wrong with that request. Please try again.