Sync with OpenWrt

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index ac5f3b2..4b94355 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -63,16 +63,6 @@ if pats then
        end
 end
 
        end
 end
 

-p2p = s:option(ListValue, "ipp2p", "P2P")
-p2p:value("", "-")
-p2p:value("all", translate("all"))
-p2p:value("bit", "BIT")
-p2p:value("dc", "DC")
-p2p:value("edk", "EDK")
-p2p:value("gnu", "GNU")
-p2p:value("kazaa", "KAZ")
-p2p.rmempty = true
-

 p = s:option(Value, "proto", translate("protocol"))
 p:value("", translate("all"))
 p:value("tcp", "TCP")
 p = s:option(Value, "proto", translate("protocol"))
 p:value("", translate("all"))
 p:value("tcp", "TCP")

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
index e80e4e5..ec93694 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
@@ -56,16 +56,6 @@ if pats then
        end
 end
 
        end
 end
 

-p2p = s:option(ListValue, "ipp2p", "P2P")
-p2p:value("", "-")
-p2p:value("all", translate("all"))
-p2p:value("bit", "BIT")
-p2p:value("dc", "DC")
-p2p:value("edk", "EDK")
-p2p:value("gnu", "GNU")
-p2p:value("kazaa", "KAZ")
-p2p.rmempty = true
-

 p = s:option(ListValue, "proto", translate("protocol"))
 p:value("", translate("all"))
 p:value("tcp", "TCP")
 p = s:option(ListValue, "proto", translate("protocol"))
 p:value("", translate("all"))
 p:value("tcp", "TCP")