Quick Backport of latest OpenWrt changes

diff --git a/applications/luci-fw/luasrc/i18n/luci-fw.de.lua b/applications/luci-fw/luasrc/i18n/luci-fw.de.lua
index 0261d73f0d9e4f9a7360ce7115483cff149a0645..17651d42cc85164aec7fb075325fd247ccfaec3d 100644 (file)
--- a/applications/luci-fw/luasrc/i18n/luci-fw.de.lua
+++ b/applications/luci-fw/luasrc/i18n/luci-fw.de.lua
@@ -11,6 +11,7 @@ firewall_rule_desc = 'Mit erweiterten Regeln kann die Firewall an die eigenen Be
 fw_fw1 = 'Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um den Netzverkehr zu trennen.'
 fw_src = 'Quelle'
 fw_dest = 'Ziel'
+fw_mtufix = 'MSS-Korrektur'
 fw_traffic = 'Verkehrskontrolle'
 firewall_rule_src = 'Eingangszone'
 firewall_rule_dest = 'Ausgangszone'
@@ -33,7 +34,7 @@ firewall_redirect_destport = 'Interner Port (optional)'
 firewall_redirect_destport_desc = 'Port od. Erster-Letzter Port'
 firewall_redirect_srcip = 'Quelladresse'
 firewall_redirect_srcmac = 'Quell-MAC-Adresse'
-fw_forwarding1 = 'An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert.'
+fw_forwarding1 = 'An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert. Bei gelegentlich auftretenden Verbindungsproblemen kann eine MSS-Korrektur helfen, ansonsten sollte dies aus Performancegründen deaktiviert bleiben.'
 firewall_forwarding_src = 'Eingang'
 firewall_forwarding_dest = 'Ausgang'
 firewall_defaults = 'Grundeinstellungen'
@@ -51,4 +52,4 @@ firewall_zone_forward = 'Weitergeleiteter Verkehr'
 firewall_zone_forward_desc = 'Standardaktion'
 firewall_zone_masq = 'MASQ'
 firewall_zone_network = 'Netzwerke'
-firewall_zone_network_desc = 'verbundene Netzwerke'
+firewall_zone_network_desc = 'verbundene Netzwerke'
\ No newline at end of file

diff --git a/applications/luci-fw/luasrc/i18n/luci-fw.en.lua b/applications/luci-fw/luasrc/i18n/luci-fw.en.lua
index 800eee4d6007183e83c4ac8ca1b5d6a6d0f392e1..24eeee8c3b86613eec09215563456ee28a537ac6 100644 (file)
--- a/applications/luci-fw/luasrc/i18n/luci-fw.en.lua
+++ b/applications/luci-fw/luasrc/i18n/luci-fw.en.lua
@@ -22,6 +22,7 @@ fw_reject = 'reject'
 fw_drop = 'drop'
 fw_src = 'Source'
 fw_dest = 'Destination'
+fw_mtufix = 'MSS-Correction'
 fw_traffic = 'Traffic Control'
 fw_portfw1 = 'Port forwarding allows to provide network services in the internal network to an external network.'
 firewall_redirect_src_desc = 'External Zone'
@@ -33,7 +34,7 @@ firewall_redirect_destip = 'Internal address'
 firewall_redirect_destip_desc = 'IP-Address'
 firewall_redirect_destport = 'Internal port (optional)'
 firewall_redirect_destport_desc = 'port or range as first-last'
-fw_forwarding1 = 'Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.'
+fw_forwarding1 = 'Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS-Correction otherwise disable it for performance resons.'
 firewall_forwarding_src = 'Input'
 firewall_forwarding_dest = 'Output'
 firewall_defaults = 'Defaults'

diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
index b810f13341b420a209c626e2e48db784dd2f60df..aa2e46d5a157e9a338eec30564964c6608bbc29c 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
@@ -21,6 +21,7 @@ s.anonymous = true
 
 iface = s:option(ListValue, "src", translate("fw_src"))
 oface = s:option(ListValue, "dest", translate("fw_dest"))
+s:option(Flag, "mtu_fix", translate("fw_mtufix"))
 
 luci.model.uci.cursor():foreach("firewall", "zone",
        function (section)

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index 1b91519528599b337ae790ea710faabed19a49c4..14dc36759707520574f4ecae135d76d6310ae826 100644 (file)
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,7 +1,7 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-UCI_VERSION  = 0.7.0
+UCI_VERSION  = 0.7.1
 UCI_SITE    = http://mirror2.openwrt.org/sources
 UCI_DIR     = uci-$(UCI_VERSION)
 UCI_FILE    = $(UCI_DIR).tar.gz

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index 5ec26bc00e1bf5407b316fbab34c3b5940157401..d3256bcebb1c7f514db5b45b9bf3aa7782d89e44 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -27,49 +27,49 @@ config variable
        option title 'Channel'
 
 config variable
-       option name 'mode'
+       option name 'hwmode'
        option section 'wireless.wifi-device'
        option title 'Mode (atheros)'
        option type enum
        list depends type=atheros
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value ''
        option title 'auto'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11b'
        option title '802.11b'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11g'
        option title '802.11g'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11a'
        option title '802.11a'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11bg'
        option title '802.11b+g'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11gdt'
        option title '802.11adt'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11adt'
        option title '802.11adt'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value 'fh'
        option title 'Frequency Hopping'
 

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 6d46a541f4aebf0ca6e3e0babf14fda24128f17c..b64190bc0a64a8182c9d53b6740bb3a7295aa423 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -62,7 +62,7 @@ end
 ------------------- Madwifi Device ------------------
 
 if hwtype == "atheros" then
-       mode = s:option(ListValue, "mode", translate("mode"))
+       mode = s:option(ListValue, "hwmode", translate("mode"))
        mode:value("", translate("wifi_auto"))
        mode:value("11b", "802.11b")
        mode:value("11g", "802.11g")

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index e7a164562e059bacce44127a55d58a79c250b0ad..8b623090b781063ab818145db349eefee37935b1 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -142,7 +142,7 @@ end
 local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then
-       mode = s:option(ListValue, "mode", translate("mode"))
+       mode = s:option(ListValue, "hwmode", translate("mode"))
        mode.override_values = true
        mode:value("", "auto")
        mode:value("11b", "802.11b")