revert tc rate filter changes

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index 6b8af879f48a015b9791610efc93bd1fc9d26ef9..fd5207efe2f2f6294736ba1ab31f53a31fd50e7a 100644 (file)
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -16,12 +16,12 @@ sub setup_tc_rate_limit {
 
     run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress");
 
-    # virtio uses large packets 64K, so we need to set mtu to that
-    # value - else filter drops those packets and rate limit does not work.
+    # this does not work wit virtio - don't know why (setting "mtu 64kb" does not help)
+    #run_command("/sbin/tc filter add dev $iface parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${rate}bps burst ${burst}b drop flowid :1");
+    # so we use avrate instead
     run_command("/sbin/tc filter add dev $iface parent ffff: " .
-               "protocol ip prio 50 u32 match ip src 0.0.0.0/0 " .
-               "police rate ${rate}bps burst ${burst}b " .
-               "mtu 64kb drop flowid :1");
+               "protocol ip prio 50 estimator 1sec 8sec " .
+               "u32 match ip src 0.0.0.0/0 police avrate ${rate}bps drop flowid :1");
 
     # tbf does not work for unknown reason
     #$TC qdisc add dev $DEV root tbf rate $RATE latency 100ms burst $BURST

diff --git a/debian/changelog b/debian/changelog
index 6b434fa922248b0b495bc0d9a1e964c86306e25e..1e3e956a1fe2fc2b4cae9500dea2eb88e952ff40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libpve-common-perl (1.0-45) unstable; urgency=low
 
   * read_meminfo: query KSM page sharing
+  
+  * revert tc rate filter changes: they do not work as expected
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 01 Feb 2013 09:04:27 +0100