Skip to content
This repository
Browse code

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

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

0 notes on commit 973df75

Please sign in to comment.
Something went wrong with that request. Please try again.