docs, README: Gluon v2018.2.1

8de93ce745 mt76: update to the latest version
85cb473f93 mac80211: add a fix to prevent unsafe queue wake calls during restart
08db9397c9 mac80211: backport tx queue start/stop fix
810ee3b84a kernel: bump 4.14 to 4.14.104
5183df0dbf kernel: bump 4.9 to 4.9.161
eea538204b kernel: fix refcnt leak in LED netdev trigger on interface rename
f1803e3492 oxnas: add SoC restart driver for reboot
1bfe1ce5c4 oxnas: cheery-pick DTS improvements from master
9ee8c8daf4 kernel: bump 4.14 to 4.14.103
e2ba7a4b47 kernel: bump 4.9 to 4.9.160

Compile-tested: ramips-mt7621, ar71xx-generic

README.md

@@ -4,7 +4,9 @@ https://gluon.readthedocs.io/.
 If you're new to Gluon and ready to get your feet wet, have a look at the
 [Getting Started Guide](https://gluon.readthedocs.io/en/latest/user/getting_started.html).
 
-**Gluon IRC channel: `#gluon` in [hackint](https://hackint.org/)**
+Gluon's developers frequent an IRC chatroom at [#gluon](ircs://irc.hackint.org/#gluon)
+on [hackint](https://hackint.org/). There is also a [webchat](https://webirc.hackint.org/#irc://irc.hackint.org/#gluon)
+that allows for access from within your browser.
 
 ## Issues & Feature requests
 
@@ -19,7 +21,7 @@ the future development of Gluon.
 
 Please refrain from using the `master` branch for anything else but development purposes!
 Use the most recent release instead. You can list all releases by running `git tag`
-and switch to one by running `git checkout v2018.2 && make update`.
+and switch to one by running `git checkout v2018.2.1 && make update`.
 
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *will break* eventually.

docs/conf.py

@@ -47,12 +47,12 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Gluon'
-copyright = '2015-2018, Project Gluon'
+copyright = '2015-2019, Project Gluon'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-version = release = '2018.2'
+version = release = '2018.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/dev/basics.rst

@@ -15,9 +15,13 @@ The `main repo`_ does have issues enabled.
 IRC
 ---
 
-Gluon's developers frequent `#gluon on hackint`_. You're welcome to join us!
+Gluon's developers frequent the IRC chatroom `#gluon`_ on `hackint`_.
+There is a `webchat`_ that allows for easy access from within your
+webbrowser. You're welcome to join us!
 
-.. _#gluon on hackint: irc://irc.hackint.org/#gluon
+.. _#gluon: ircs://irc.hackint.org/#gluon
+.. _hackint: https://hackint.org/
+.. _webchat: https://webirc.hackint.org/#irc://irc.hackint.org/#gluon
 
 
 Working with repositories

docs/index.rst

@@ -63,6 +63,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
    package/gluon-ebtables-limit-arp
    package/gluon-ebtables-source-filter
    package/gluon-radv-filterd
+   package/gluon-scheduled-domain-switch
    package/gluon-web-admin
    package/gluon-web-logging
 
@@ -70,6 +71,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
    :caption: Releases
    :maxdepth: 1
 
+   releases/v2018.2.1
    releases/v2018.2
    releases/v2018.1.4
    releases/v2018.1.3
@@ -135,6 +137,7 @@ ar71xx-generic
 * AVM
 
   - Fritz!Box 4020 [#avmflash]_
+  - Fritz!WLAN Repeater 300E [#avmflash]_
   - Fritz!WLAN Repeater 450E [#avmflash]_
 
 * Buffalo
@@ -351,6 +354,10 @@ ramips-mt7620
   - GL-MT300N [#80211s]_
   - GL-MT750 [#80211s]_
 
+* Nexx
+
+  - WT3020AD/F/H
+
 ramips-mt7621
 ^^^^^^^^^^^^^
 
@@ -371,6 +378,20 @@ ramips-mt7621
 ramips-mt76x8
 ^^^^^^^^^^^^^
 
+* GL.iNet
+
+  - GL-MT300N v2 [#80211s]_
+
+* NETGEAR
+
+  - R6120 [#80211s]_
+
+* TP-Link
+
+  - TL-WR841N v13 [#80211s]_
+  - Archer C50 v3 [#80211s]_
+  - Archer C50 v4 [#80211s]_
+
 * VoCore
 
   - VoCore2 [#80211s]_

docs/package/gluon-scheduled-domain-switch.rst

@@ -0,0 +1,38 @@
+gluon-scheduled-domain-switch
+=============================
+
+This package allows to switch a routers domain at a given point
+in time. This is needed for switching between incompatible transport
+protocols (e.g. 802.11s and IBSS or VXLAN).
+
+Nodes will switch when the defined *switch-time* has passed. In case the node was
+powered off while this was supposed to happen, it might not be able to aquire the
+correct time. In this case, the node will switch after it has not seen any gateway
+for a given period of time.
+
+site.conf
+---------
+All those settings have to be defined exclusively in the domain, not the site.
+
+domain_switch : optional (needed for domains to switch)
+    target_domain :
+        - target domain to switch to
+    switch_after_offline_mins :
+        - amount of time without reachable gateway to switch unconditionally
+    switch_time :
+        - UNIX epoch after which domain will be switched
+    connection_check_targets :
+        - array of IPv6 addresses which are probed to determine if the node is
+	  connected to the mesh
+
+Example::
+
+  domain_switch = {
+    target_domain = 'new_domain',
+    switch_after_offline_mins = 120,
+    switch_time = 1546344000, -- 01.01.2019 - 12:00 UTC
+    connection_check_targets = {
+      '2001:4860:4860::8888',
+      '2001:4860:4860::8844',
+    },
+  },

docs/releases/v2018.2.1.rst

@@ -0,0 +1,128 @@
+Gluon 2018.2.1
+==============
+
+Added hardware support
+~~~~~~~~~~~~~~~~~~~~~~
+
+ar71xx-generic
+^^^^^^^^^^^^^^
+
+* AVM
+
+  - Fritz!WLAN Repeater 300E
+
+ramips-mt7620
+^^^^^^^^^^^^^
+
+* Nexx
+
+  - WT3020AD/F/H [#noibss]_
+
+ramips-mt76x8
+^^^^^^^^^^^^^
+
+* Gl.iNet
+
+  - MT300N (v2) [#noibss]_
+
+* Netgear
+
+  - R6120 [#noibss]_
+
+* TP-Link
+
+  - Archer C50 (v3, v4) [#noibss]_
+  - TL-WR841N (v13) [#noibss]_
+
+Bugfixes
+~~~~~~~~
+
+* Fixes a bug in the batman-adv respondd module that caused duplicate
+  IPv6 addresses in nodeinfo replies (`#1615 <https://github.com/freifunk-gluon/gluon/issues/1615>`_)
+
+  This was visible on the status page and several map implementations.
+  The new implementation uses netlink instead of parsing `/proc/net/if_inet6`.
+
+* Fixes a localization issue in gluon-config-mode-geo-location which 
+  resulted in a partial translation of the wizard's location section
+  text. (`#1611 <https://github.com/freifunk-gluon/gluon/issues/1611>`_)
+
+* Fixes the display of the improved memory usage estimation in gluon-status-page
+
+  This change was actually already merged in time for v2018.2 but the 
+  JavaScript was not rebuilt.
+
+* Fixes automatic updates for several devices by adding and updating 
+  the autoupdater image names
+
+  This affects the following devices:
+
+  * GL.iNet GL-AR150, 
+  * GL.iNet GL-AR300M
+  * GL.iNet GL-AR750
+  * Raspberry Pi Model B+ Rev 1.2
+
+* Fixes the primary MAC address selection for Unifi AC 
+  Lite/Mesh/Pro/Mesh Pro (`#1629 <https://github.com/freifunk-gluon/gluon/issues/1629>`_)
+
+* Fixes low data rate selection for multicast and management frames on
+  ath10k and ath10k-ct (`#1644 <https://github.com/freifunk-gluon/gluon/pull/1644>`_)
+
+  A patchset has been backported that notifies these drivers of requested data rate changes
+
+* Fixes the data rate selection in ath10k and ath10k-ct when no 
+  `mcast_rate` is configured (`#1657 <https://github.com/freifunk-gluon/gluon/pull/1657>`_)
+
+  Previously a missing mcast_rate could result in broken 5 GHz connectivity
+
+New features
+~~~~~~~~~~~~
+
+Scheduled domain switch
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Gluon has support for multiple domains since its v2018.1 release.
+The scheduled domain switch allows for reliable migrations between 
+domains at a preconfigured time.
+This can be useful for communities that, among other things, plan to
+
+  * migrate between IBSS and 802.11s
+  * activate VXLAN encapsulation on wired mesh links
+
+Improved frequency band distribution of dual-band radios
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A new algorithm that improves the distribution of dual-band radios was
+added. They will now be evenly distributed between the 2.4 and 5 GHz
+band, with a preference towards 2.4 GHz. 
+
+If a device has only a single dual-band radio, like the AVM FRITZ!WLAN
+Repeater 300E, it will be configured for 2.4 GHz.
+
+Known issues
+~~~~~~~~~~~~
+
+* Default TX power on many Ubiquiti devices is too high, correct offsets are
+  unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
+
+  Reducing the TX power in the Advanced Settings is recommended.
+
+* The MAC address of the WAN interface is modified even when Mesh-on-WAN is
+  disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
+
+  This may lead to issues in environments where a fixed MAC address is expected
+  (like VMware when promiscuous mode is disallowed).
+
+* Inconsistent respondd API
+  (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
+
+  The current API is inconsistent and will be replaced eventually. The old API
+  will still be supported for a while.
+
+* Frequent reboots due to out-of-memory or high load due to memory pressure on
+  weak hardware specially in larger meshes
+  (`#1243 <https://github.com/freifunk-gluon/gluon/issues/1243>`_)
+
+  Optimizations in Gluon 2018.1 have significantly improved memory usage.
+  There are still known bugs leading to unreasonably high load that we hope to
+  solve in future releases.

docs/releases/v2018.2.rst

@@ -81,6 +81,12 @@ ramips-mt7621 [#noibss]_
   AP+IBSS mode unsupported: This target is not built when *GLUON_WLAN_MESH* is
   set to ``ibss``.
 
+.. note::
+
+    The *ramips-mt7628* target has been renamed to *ramips-mt76x8*, and the *sunxi*
+    target has been renamed to *sunxi-cortexa7*. You might have to update your build
+    scripts accordingly.
+
 New features
 ************
 
@@ -90,10 +96,11 @@ following larger new features:
 OpenStreetMap-based map in config wizard
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-When the features *web-wizard* and *web-osm* are enabled, the configuration
+When the feature *config-mode-geo-location-osm* (package
-wizard will try to load an OSM-based map to allow the user to specify the node
+*gluon-config-mode-geo-location-osm*) is enabled, the configuration wizard will
-location. Loading the map requires a working internet connection, for example
+try to load an OSM-based map to allow the user to specify the node location.
-via WLAN (while connected to the Gluon node via Ethernet).
+Loading the map requires a working internet connection, for example via WLAN
+(while connected to the Gluon node via Ethernet).
 
 See the :ref:`config_mode <user-site-config_mode>` section for the *site.conf*
 configuration of this feature.

docs/site-example/site.conf

@@ -1,4 +1,4 @@
--- This is an example site configuration for Gluon v2018.2
+-- This is an example site configuration for Gluon v2018.2.1
 --
 -- Take a look at the documentation located at
 -- https://gluon.readthedocs.io/ for details.

docs/user/getting_started.rst

@@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
 started with Gluon we recommend to use the latest stable release of Gluon.
 
 Take a look at the `list of gluon releases`_ and notice the latest release,
-e.g. *v2018.2*. Always get Gluon using git and don't try to download it
+e.g. *v2018.2.1*. Always get Gluon using git and don't try to download it
 as a Zip archive as the archive will be missing version information.
 
 Please keep in mind that there is no "default Gluon" build; a site configuration
@@ -44,7 +44,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2018.2*.
+version you'd like to checkout, e.g. *v2018.2.1*.
 
 ::
 

modules

@@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing luci gluon'
 
 OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-18.06
-OPENWRT_COMMIT=eef6bd3393f406f73187a670fa34d5e6a228f9e8
+OPENWRT_COMMIT=8de93ce7455a61838871b43f1d69be3b67a2741e
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-18.06
-PACKAGES_PACKAGES_COMMIT=d05b98c6c86da58db5cbda3c945007be09583609
+PACKAGES_PACKAGES_COMMIT=5de163d67cf461db4c79a19c6dfe6c15d31b9bbc
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_BRANCH=openwrt-18.06
-PACKAGES_ROUTING_COMMIT=bc6e7f6903c8237c77131aedfc92dba40e1bc6ac
+PACKAGES_ROUTING_COMMIT=ea345d16a6e27c2a8fdf67bf543cc36a5f189131
 
 PACKAGES_LUCI_REPO=https://github.com/openwrt/luci.git
 PACKAGES_LUCI_BRANCH=openwrt-18.06

package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua

@@ -15,7 +15,7 @@ return function(form, uci)
 	if not text then
 		text = pkg_i18n.translate(
 			'If you want the location of your node to ' ..
-			'be displayed on the map, you can enter its coordinates here.'
+			'be displayed on public maps, you can enter its coordinates here.'
 		)
 		if osm then
 			text = text .. ' ' .. osm.help(i18n)

package/gluon-core/check_site.lua

@@ -3,15 +3,6 @@ need_string(in_site({'site_name'}))
 
 -- this_domain() returns nil when multidomain support is disabled
 if this_domain() then
-	function need_domain_name(path)
-		need_string(path)
-		need(path, function(default_domain)
-			local f = io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/domains/' .. default_domain .. '.json')
-			if not f then return false end
-			f:close()
-			return true
-		end, nil, 'be a valid domain name')
-	end
 	need_domain_name(in_site({'default_domain'}))
 
 	need_table(in_domain({'domain_names'}), function(domain)

package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac

@@ -26,10 +26,10 @@ end
 if platform.match('ar71xx', 'generic', {'tl-wdr3600', 'tl-wdr4300',
                                         'tl-wr902ac-v1'}) then
   table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress')
-elseif platform.match('ramips', 'mt7621', {'dir-860l-b1'}) then
+elseif platform.match('ar71xx', 'generic', {'a40', 'a60',
-  table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress')
+                                            'archer-c7-v4', 'archer-c7-v5',
-elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus', 'carambola2',
+                                            'carambola2',
-                                            'a40', 'a60', 'koala',
+                                            'koala',
                                             'mr600', 'mr600v2',
                                             'mr900', 'mr900v2',
                                             'mr1750', 'mr1750v2',
@@ -39,7 +39,8 @@ elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus', 'carambola2',
                                             'om2p-lc',
                                             'om5p', 'om5p-an',
                                             'om5p-ac', 'om5p-acv2',
-                                            'archer-c7-v4', 'archer-c7-v5'}) then
+                                            'unifi-outdoor-plus',
+                                            'unifiac-lite', 'unifiac-pro'}) then
   table.insert(try_files, 1, '/sys/class/net/eth0/address')
 elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c58-v1',
                                             'archer-c59-v1', 'archer-c60-v1',
@@ -48,6 +49,8 @@ elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c58-v1',
 elseif platform.match('ipq40xx', nil, {'avm,fritzbox-4040',
                                        'openmesh,a42', 'openmesh,a62'}) then
   table.insert(try_files, 1, '/sys/class/net/eth0/address')
+elseif platform.match('ramips', 'mt7621', {'dir-860l-b1'}) then
+  table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress')
 end
 
 

package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless

@@ -10,6 +10,43 @@ local uci = require('simple-uci').cursor()
 -- Initial
 if not sysconfig.gluon_version then
 	uci:delete_all('wireless', 'wifi-iface')
+
+	-- First count all radios with a fixed frequency band.
+	-- This is needed to distribute devices which have radios
+	-- capable of operating in the 2.4 GHz and 5 GHz band need
+	-- to be distributed evenly.
+	local radio_band_count = {band24=0, band5=0}
+	util.foreach_radio(uci, function(radio, index, config)
+		local hwmodes = iwinfo.nl80211.hwmodelist(util.find_phy(radio))
+		if (hwmodes.a or hwmodes.ac) and hwmodes.g then
+			-- Dualband - do nothing in this step
+		elseif hwmodes.g then
+			-- 2.4 GHz
+			radio_band_count["band24"] = radio_band_count["band24"] + 1
+		elseif hwmodes.a or hwmodes.ac then
+			-- 5 GHz
+			radio_band_count["band5"] = radio_band_count["band5"] + 1
+		end
+	end)
+
+	-- Use the number of all fixed 2.4G GHz and 5 GHz radios to
+	-- distribute dualband radios in this step.
+	util.foreach_radio(uci, function(radio, index, config)
+		local radio_name = radio['.name']
+		local hwmodes = iwinfo.nl80211.hwmodelist(util.find_phy(radio))
+		if (hwmodes.a or hwmodes.ac) and hwmodes.g then
+			-- Dualband radio
+			if radio_band_count["band24"] <= radio_band_count["band5"] then
+				-- Assign radio to 2.4GHz band
+				radio_band_count["band24"] = radio_band_count["band24"] + 1
+				uci:set('wireless', radio_name, 'hwmode', '11g')
+			else
+				-- Assign radio to 5GHz band
+				radio_band_count["band5"] = radio_band_count["band5"] + 1
+				uci:set('wireless', radio_name, 'hwmode', '11a')
+			end
+		end
+	end)
 end
 
 local function get_channel(radio, config)

package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua

@@ -253,3 +253,12 @@ function foreach_radio(uci, f)
 		end
 	end
 end
+
+function get_uptime()
+	local uptime_file = readfile("/proc/uptime")
+	if uptime_file == nil then
+		-- Something went wrong reading "/proc/uptime"
+		return nil
+	end
+	return tonumber(uptime_file:match('^[^ ]+'))
+end

package/gluon-mesh-batman-adv/src/respondd.c

@@ -26,6 +26,7 @@
 
 #include <respondd.h>
 
+#include <ifaddrs.h>
 #include <iwinfo.h>
 #include <json-c/json.h>
 #include <libgluonutil.h>
@@ -43,12 +44,16 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #include <linux/ethtool.h>
 #include <linux/if_addr.h>
+#include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 
 #include <batadv-genl.h>
@@ -76,50 +81,69 @@ struct clients_netlink_opts {
 	struct batadv_nlquery_opts query_opts;
 };
 
+struct ip_address_information {
+	unsigned int ifindex;
+	struct json_object *addresses;
+};
 
-static struct json_object * get_addresses(void) {
+static int get_addresses_cb(struct nl_msg *msg, void *arg) {
-	FILE *f = fopen("/proc/net/if_inet6", "r");
+	struct ip_address_information *info = (struct ip_address_information*) arg;
-	if (!f)
-		return NULL;
 
-	char *line = NULL;
+	struct nlmsghdr *nlh = nlmsg_hdr(msg);
-	size_t len = 0;
+	struct ifaddrmsg *msg_content = NLMSG_DATA(nlh);
+	int remaining = nlh->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg));
+	struct rtattr *hdr;
 
-	struct json_object *ret = json_object_new_array();
+	for (hdr = IFA_RTA(msg_content); RTA_OK(hdr, remaining); hdr = RTA_NEXT(hdr, remaining)) {
+		char addr_str_buf[INET6_ADDRSTRLEN];
 
-	while (getline(&line, &len, f) >= 0) {
+		/* We are only interested in IP-addresses of br-client */
-		/* IF_NAMESIZE would be enough, but adding 1 here is simpler than subtracting 1 in the format string */
+		if (hdr->rta_type != IFA_ADDRESS ||
-		char ifname[IF_NAMESIZE+1];
+			msg_content->ifa_index != info->ifindex ||
-		unsigned int flags;
+			msg_content->ifa_flags & (IFA_F_TENTATIVE|IFA_F_DEPRECATED)) {
-		struct in6_addr addr;
-		char buf[INET6_ADDRSTRLEN];
-
-		if (sscanf(line,
-			   "%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8
-			   "%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8
-			   "  %*x %*x %*x %x %"STRINGIFY(IF_NAMESIZE)"s",
-			   &addr.s6_addr[0], &addr.s6_addr[1], &addr.s6_addr[2], &addr.s6_addr[3],
-			   &addr.s6_addr[4], &addr.s6_addr[5], &addr.s6_addr[6], &addr.s6_addr[7],
-			   &addr.s6_addr[8], &addr.s6_addr[9], &addr.s6_addr[10], &addr.s6_addr[11],
-			   &addr.s6_addr[12], &addr.s6_addr[13], &addr.s6_addr[14], &addr.s6_addr[15],
-			   &flags, ifname) != 18)
 			continue;
-
-		if (strcmp(ifname, "br-client"))
-			continue;
-
-		if (flags & (IFA_F_TENTATIVE|IFA_F_DEPRECATED))
-			continue;
-
-		inet_ntop(AF_INET6, &addr, buf, sizeof(buf));
-
-		json_object_array_add(ret, json_object_new_string(buf));
 		}
 
-	fclose(f);
+		if (inet_ntop(AF_INET6, (struct in6_addr *) RTA_DATA(hdr), addr_str_buf, INET6_ADDRSTRLEN)) {
-	free(line);
+			json_object_array_add(info->addresses, json_object_new_string(addr_str_buf));
+		}
+	}
 
-	return ret;
+	return NL_OK;
+}
+
+static struct json_object *get_addresses(void) {
+	struct ip_address_information info = {
+		.ifindex = if_nametoindex("br-client"),
+		.addresses = json_object_new_array(),
+	};
+	int err;
+
+	/* Open socket */
+	struct nl_sock *socket = nl_socket_alloc();
+	if (!socket) {
+		return info.addresses;
+	}
+
+	err = nl_connect(socket, NETLINK_ROUTE);
+	if (err < 0) {
+		goto out_free;
+	}
+
+	/* Send message */
+	struct ifaddrmsg rt_hdr = { .ifa_family = AF_INET6, };
+	err = nl_send_simple(socket, RTM_GETADDR, NLM_F_REQUEST | NLM_F_ROOT, &rt_hdr, sizeof(struct ifaddrmsg));
+	if (err < 0) {
+		goto out_free;
+	}
+
+	/* Retrieve answer. Message is handled by get_addresses_cb */
+	nl_socket_modify_cb(socket, NL_CB_VALID, NL_CB_CUSTOM, get_addresses_cb, &info);
+	nl_recvmsgs_default(socket);
+
+out_free:
+	nl_socket_free(socket);
+	return info.addresses;
 }
 
 static void add_if_not_empty(struct json_object *obj, const char *key, struct json_object *val) {

package/gluon-scheduled-domain-switch/Makefile

@@ -0,0 +1,13 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-scheduled-domain-switch
+PKG_VERSION:=1
+
+include ../gluon.mk
+
+define Package/gluon-scheduled-domain-switch
+  TITLE:=Allows scheduled migrations between domains
+  DEPENDS:=+gluon-core @GLUON_MULTIDOMAIN
+endef
+
+$(eval $(call BuildPackageGluon,gluon-scheduled-domain-switch))

package/gluon-scheduled-domain-switch/check_site.lua

@@ -0,0 +1,6 @@
+if need_table(in_domain({'domain_switch'}), check_domain_switch, false) then
+	need_domain_name(in_domain({'domain_switch', 'target_domain'}))
+	need_number(in_domain({'domain_switch', 'switch_after_offline_mins'}))
+	need_number(in_domain({'domain_switch', 'switch_time'}))
+	need_string_array_match(in_domain({'domain_switch', 'connection_check_targets'}), '^[%x:]+$')
+end

package/gluon-scheduled-domain-switch/luasrc/lib/gluon/upgrade/950-gluon-scheduled-domain-switch

@@ -0,0 +1,20 @@
+#!/usr/bin/lua
+
+local json = require 'jsonc'
+local site = require 'gluon.site'
+local unistd = require 'posix.unistd'
+
+local cronfile = "/usr/lib/micron.d/gluon-scheduled-domain-switch"
+
+-- Check if domain switch is scheduled
+if site.domain_switch() == nil then
+	-- In case no domain switch is scheduled, remove cronfile
+	os.remove(cronfile)
+	os.exit(0)
+end
+
+-- Only in case domain switch is scheduled
+local f = io.open(cronfile, "w")
+f:write("* * * * *  /usr/bin/gluon-check-connection\n")
+f:write("*/5 * * * *  /usr/bin/gluon-switch-domain\n")
+f:close()

package/gluon-scheduled-domain-switch/luasrc/usr/bin/gluon-check-connection

@@ -0,0 +1,36 @@
+#!/usr/bin/lua
+
+local unistd = require 'posix.unistd'
+local util = require 'gluon.util'
+local site = require 'gluon.site'
+
+local offline_flag_file = "/tmp/gluon_offline"
+local is_offline = true
+
+-- Check if domain-switch is scheduled
+if site.domain_switch() == nil then
+	-- Switch not applicable for current domain
+	os.exit(0)
+end
+
+-- Check reachability of pre-defined targets
+for _, ip in ipairs(site.domain_switch.connection_check_targets()) do
+	local exit_code = os.execute("ping -c 1 -w 10 " .. ip)
+	if exit_code == 0 then
+		is_offline = false
+		break
+	end
+end
+
+if is_offline then
+	-- Check if we were previously offline
+	if unistd.access(offline_flag_file) then
+		os.exit(0)
+	end
+	-- Create offline flag
+	local f = io.open(offline_flag_file, "w")
+	f:write(tostring(util.get_uptime()))
+	f:close()
+else
+	os.remove(offline_flag_file)
+end

package/gluon-scheduled-domain-switch/luasrc/usr/bin/gluon-switch-domain

@@ -0,0 +1,67 @@
+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+local unistd = require 'posix.unistd'
+local util = require 'gluon.util'
+local site = require 'gluon.site'
+
+-- Returns true if node was offline long enough to perform domain switch
+function switch_after_min_reached()
+	if not unistd.access("/tmp/gluon_offline") then
+		return false
+	end
+
+	local switch_after_sec = site.domain_switch.switch_after_offline_mins() * 60
+
+	local current_uptime = util.get_uptime()
+	if current_uptime == nil then
+		return false
+	end
+
+	local f = util.readfile("/tmp/gluon_offline")
+	if f == nil then
+		return false
+	end
+	local offline_since = tonumber(f)
+
+	local offline_time_sec = current_uptime - offline_since
+
+	if offline_time_sec > switch_after_sec then
+		return true
+	end
+	return false
+end
+
+-- Returns true in case switch time has passed
+function switch_time_passed()
+	local current_time = os.time()
+	local switch_time = site.domain_switch.switch_time()
+
+	return switch_time < current_time
+end
+
+if site.domain_switch() == nil then
+	-- Switch not applicable for current domain
+	print("No domain switch defined for the current domain.")
+	os.exit(0)
+end
+
+local current_domain = uci:get("gluon", "core", "domain")
+local target_domain = site.domain_switch.target_domain()
+
+if target_domain == current_domain then
+	-- Current and target domain are equal
+	print("Domain '" .. target_domain .. "' equals current domain.")
+	os.exit(1)
+end
+
+if not switch_after_min_reached() and not switch_time_passed() then
+	-- Neither switch-time passed nor switch_after_min reached
+	os.exit(0)
+end
+
+uci:set("gluon", "core", "domain", target_domain)
+uci:commit("gluon")
+
+os.execute("gluon-reconfigure")
+os.execute("reboot")

package/gluon-web-node-role/i18n/de.po

@@ -10,18 +10,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Node role"
-msgstr "Verwendungszweck"
-
-msgid "Role"
-msgstr "Rolle"
-
 msgid ""
 "If this node has a special role within the mesh network you can specify this "
 "role here. Please find out about the available roles and their impact first. "
 "Only change the role if you know what you are doing."
 msgstr ""
-"Wenn dein Knoten eine besondere Rolle im Mesh-Netzwerk einnimmt, "
+"Wenn dein Knoten eine besondere Rolle im Mesh-Netzwerk einnimmt, kannst du "
-"kannst du diese hier angeben. Bringe bitte zuvor in Erfahrung, welche "
+"diese hier angeben. Bringe bitte zuvor in Erfahrung, welche Bedeutung die "
-"Bedeutung die zur Verfügung stehenden Rollen haben. "
+"zur Verfügung stehenden Rollen haben. Setze die Rolle nur, wenn du weißt, "
-"Setze die Rolle nur, wenn du weißt, was du tust."
+"was du tust."
+
+msgid "Node role"
+msgstr "Verwendungszweck"
+
+msgid "Role"
+msgstr "Rolle"

package/gluon-web-node-role/i18n/fr.po

@@ -10,18 +10,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Node role"
-msgstr "Rôle du nœud"
-
-msgid "Role"
-msgstr "Rôle"
-
 msgid ""
 "If this node has a special role within the mesh network you can specify this "
 "role here. Please find out about the available roles and their impact first. "
 "Only change the role if you know what you are doing."
 msgstr ""
-"Si votre nœud a un rôle spécial dans le réseau MESH, vous pouvez "
+"Si votre nœud a un rôle spécial dans le réseau MESH, vous pouvez spécifier "
-"spécifier ce rôle ici. Avant de changer, informez vous sur les rôles "
+"ce rôle ici. Avant de changer, informez vous sur les rôles disponibles et "
-"disponibles et sur leur impacts. Changez de rôle uniquement si vous "
+"sur leur impacts. Changez de rôle uniquement si vous comprenez ce que vous "
-"comprenez ce que vous faites."
+"faites."
+
+msgid "Node role"
+msgstr "Rôle du nœud"
+
+msgid "Role"
+msgstr "Rôle"

package/gluon-web-node-role/i18n/gluon-web-node-role.pot

@@ -1,14 +1,14 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid ""
+"If this node has a special role within the mesh network you can specify this "
+"role here. Please find out about the available roles and their impact first. "
+"Only change the role if you know what you are doing."
+msgstr ""
+
 msgid "Node role"
 msgstr ""
 
 msgid "Role"
 msgstr ""
-
-msgid ""
-"If this node has a special role within the mesh network you can specify this role here. "
-"Please find out about the available roles and their impact first. "
-"Only change the role if you know what you are doing."
-msgstr ""

package/gluon-web-node-role/luasrc/lib/gluon/config-mode/model/admin/noderole.lua

@@ -1,5 +1,6 @@
 local f, s, o
 local site = require 'gluon.site'
+local site_i18n = i18n 'gluon-site'
 local uci = require("simple-uci").cursor()
 local config = 'gluon-node-info'
 
@@ -9,7 +10,7 @@ local role = uci:get(config, uci:get_first(config, "system"), "role")
 f = Form(translate("Node role"))
 
 s = f:section(Section, nil, translate(
-	"If this node has a special role within the freifunk network you can specify this role here. "
+	"If this node has a special role within the mesh network you can specify this role here. "
 	.. "Please find out about the available roles and their impact first. "
 	.. "Only change the role if you know what you are doing."
 ))
@@ -17,7 +18,7 @@ s = f:section(Section, nil, translate(
 o = s:option(ListValue, "role", translate("Role"))
 o.default = role
 for _, role in ipairs(site.roles.list()) do
-	o:value(role, translate('gluon-web-node-role:role:' .. role))
+	o:value(role, site_i18n.translate('gluon-web-node-role:role:' .. role))
 end
 
 function o:write(data)

patches/openwrt/0006-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6-to-4.9.patch

@@ -182,10 +182,10 @@ index 0000000000000000000000000000000000000000..b38b9977bca192eafe9a0d9b8c36a120
 +
 diff --git a/target/linux/generic/backport-4.9/095-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch b/target/linux/generic/backport-4.9/095-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch
 new file mode 100644
-index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd00331b629
+index 0000000000000000000000000000000000000000..89523ac027b227a9f84b1130db06a7fc67ff68ce
 --- /dev/null
 +++ b/target/linux/generic/backport-4.9/095-0003-vxlan-fix-snooping-for-link-local-IPv6-addresses.patch
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,88 @@
 +From 010b2b541d958e12d78ba1c79734c700f169610b Mon Sep 17 00:00:00 2001
 +Message-Id: <010b2b541d958e12d78ba1c79734c700f169610b.1515533863.git.mschiffer@universe-factory.net>
 +In-Reply-To: <f45ba82cd83d27b5d44d3dc417e0e480ba0d3703.1515533863.git.mschiffer@universe-factory.net>
@@ -209,11 +209,9 @@ index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd0
 + drivers/net/vxlan.c | 20 +++++++++++++++-----
 + 1 file changed, 15 insertions(+), 5 deletions(-)
 +
-+diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-+index 863d9528b900..c28c6f34b3b3 100644
 +--- a/drivers/net/vxlan.c
 ++++ b/drivers/net/vxlan.c
-+@@ -917,16 +917,25 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
++@@ -917,16 +917,25 @@ out:
 +  * Return true if packet is bogus and should be dropped.
 +  */
 + static bool vxlan_snoop(struct net_device *dev,
@@ -241,7 +239,7 @@ index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd0
 + 			return false;
 + 
 + 		/* Don't migrate static entries, drop packets */
-+@@ -952,7 +961,7 @@ static bool vxlan_snoop(struct net_device *dev,
++@@ -952,7 +961,7 @@ static bool vxlan_snoop(struct net_devic
 + 					 NLM_F_EXCL|NLM_F_CREATE,
 + 					 vxlan->cfg.dst_port,
 + 					 vxlan->default_dst.remote_vni,
@@ -250,7 +248,7 @@ index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd0
 + 		spin_unlock(&vxlan->hash_lock);
 + 	}
 + 
-+@@ -1223,6 +1232,7 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
++@@ -1223,6 +1232,7 @@ static bool vxlan_set_mac(struct vxlan_d
 + 			  struct sk_buff *skb)
 + {
 + 	union vxlan_addr saddr;
@@ -258,7 +256,7 @@ index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd0
 + 
 + 	skb_reset_mac_header(skb);
 + 	skb->protocol = eth_type_trans(skb, vxlan->dev);
-+@@ -1244,7 +1254,7 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
++@@ -1244,7 +1254,7 @@ static bool vxlan_set_mac(struct vxlan_d
 + 	}
 + 
 + 	if ((vxlan->flags & VXLAN_F_LEARN) &&
@@ -267,18 +265,15 @@ index 0000000000000000000000000000000000000000..dcfd1ce7c2f015354d21a65f12f6ebd0
 + 		return false;
 + 
 + 	return true;
-+@@ -1932,7 +1942,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
++@@ -1939,7 +1949,7 @@ static void vxlan_encap_bypass(struct sk
 + 	}
 + 
 + 	if (dst_vxlan->flags & VXLAN_F_LEARN)
-+-		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source);
++-		vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source);
-++		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source, 0);
+++		vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source, 0);
 + 
 + 	u64_stats_update_begin(&tx_stats->syncp);
 + 	tx_stats->tx_packets++;
-+-- 
-+2.15.1
-+
 diff --git a/target/linux/generic/backport-4.9/095-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch b/target/linux/generic/backport-4.9/095-0004-vxlan-allow-multiple-VXLANs-with-same-VNI-for-IPv6-l.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..18ae230a3b04d2b57184109fa14f9533f0fb7192

patches/openwrt/0012-ramips-mt7621-fix-5GHz-WiFi-LED-on-ZBT-WG3526.patch

@@ -1,23 +0,0 @@
-From: Andreas Ziegler <dev@andreas-ziegler.de>
-Date: Thu, 27 Dec 2018 15:02:41 +0100
-Subject: ramips: mt7621: fix 5GHz WiFi LED on ZBT WG3526
-
-This fixes the 5GHz WiFi LED which was previously not working.
-
-Signed-off-by: Andreas Ziegler <dev@andreas-ziegler.de>
-
-diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi
-index 104a51f8de7110c0f65f760af70033853f3da745..e42ec5e33de7fb69a9c668406f876f6443d2912b 100644
---- a/target/linux/ramips/dts/ZBT-WG3526.dtsi
-+++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi
-@@ -101,6 +101,10 @@
- 			mediatek,mtd-eeprom = <&factory 0x8000>;
- 			ieee80211-freq-limit = <5000000 6000000>;
- 		};
-+
-+		led {
-+			led-sources = <2>;
-+		};
- 	};
- };
- 

patches/openwrt/0012-tools-mktplinkfw2-add-split-uboot-layout.patch

@@ -0,0 +1,26 @@
+From: David Bauer <mail@david-bauer.net>
+Date: Wed, 28 Nov 2018 23:56:31 +0100
+Subject: tools: mktplinkfw2: add split-uboot layout
+
+This commit adds the split-uboot partition layout used by the
+Archer C50 v4 to mktplinkfw2.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+diff --git a/tools/firmware-utils/src/mktplinkfw2.c b/tools/firmware-utils/src/mktplinkfw2.c
+index dead49e7af8839bac5d1dee7445cf8921208c970..35db848bbab9f8315526dfa24ed351ad58878dde 100644
+--- a/tools/firmware-utils/src/mktplinkfw2.c
++++ b/tools/firmware-utils/src/mktplinkfw2.c
+@@ -146,6 +146,12 @@ static struct flash_layout layouts[] = {
+ 		.kernel_la	= 0x80000000,
+ 		.kernel_ep	= 0x80000000,
+ 		.rootfs_ofs	= 0x140000,
++	}, {
++		.id		= "8MSUmtk", /* Split U-Boot OS */
++		.fw_max_len	= 0x770000,
++		.kernel_la	= 0x80000000,
++		.kernel_ep	= 0x80000000,
++		.rootfs_ofs	= 0x140000,
+ 	}, {
+ 		.id		= "8MLmtk",
+ 		.fw_max_len	= 0x7b0000,

patches/openwrt/0013-ramips-add-support-for-Archer-C50-v4.patch

@@ -0,0 +1,370 @@
+From: David Bauer <mail@david-bauer.net>
+Date: Sun, 3 Feb 2019 00:23:18 +0100
+Subject: ramips: add support for Archer C50 v4
+
+This adds support for the TP-Link Archer C50 v4.
+It uses the same hardware as the v3 variant, sharing the same FCC-ID.
+
+CPU:   MediaTek MT7628 (580MHz)
+RAM:   64M DDR2
+FLASH: 8M SPI
+WiFi:  2.4GHz 2x2 MT7628 b/g/n integrated
+WiFI:  5GHz 2x2 MT7612 a/n/ac
+ETH:   1x WAN 4x LAN
+LED:   Power, WiFi2, WiFi5, LAN, WAN, WPS
+BTN:   WPS/WiFi, RESET
+UART:  Near ETH ports, 115200 8n1, TP-Link pinout
+
+Create Factory image
+--------------------
+As all installation methods require a U-Boot to be integrated into the
+Image (and we do not ship one with the image) we are not able to create
+an image in the OpenWRT build-process.
+
+Download a TP-Link image from their Wesite and a OpenWRT sysupgrade
+image for the device and build yourself a factory image like following:
+
+TP-Link image:             tpl.bin
+OpenWRT sysupgrade image:  owrt.bin
+
+ > dd if=tpl.bin of=boot.bin bs=131584 count=1
+ > cat owrt.bin >> boot.bin
+
+Installing via Web-UI
+---------------------
+Upload the boot.bin via TP-Links firmware upgrade tool in the
+web-interface.
+
+Installing via Recovery
+-----------------------
+Activate Web-Recovery by beginning the upgrade Process with a
+Firmware-Image from TP-Link. After starting the Firmware Upgrade,
+wait ~3 seconds (When update status is switching to 0%), then
+disconnect the power supply from the device. Upgrade flag (which
+activates Web-Recovery) is written before the OS-image is touched and
+removed after write is succesfull, so this procedure should be safe.
+
+Plug the power back in. It will come up in Recovery-Mode on 192.168.0.1.
+When active, all LEDs but the WPS LED are off.
+Remeber to assign yourself a static IP-address as DHCP is not active in
+this mode.
+
+The boot.bin can now be uploaded and flashed using the web-recovery.
+
+Installing via TFTP
+-------------------
+Prepare an image like following (Filenames from factory image steps
+apply here)
+
+ > dd if=/dev/zero of=tp_recovery.bin bs=196608 count=1
+ > dd if=tpl.bin of=tmp.bin bs=131584 count=1
+ > dd if=tmp.bin of=boot.bin bs=512 skip=1
+ > cat boot.bin >> tp_recovery.bin
+ > cat owrt.bin >> tp_recovery.bin
+
+Place tp_recovery.bin in root directory of TFTP server and listen on
+192.168.0.66/24.
+
+Connect router LAN ports with your computer and power up the router
+while pressing the reset button. The router will download the image via
+tftp and after ~1 Minute reboot into OpenWRT.
+
+U-Boot CLI
+----------
+U-Boot CLI can be activated by holding down '4' on bootup.
+
+Dual U-Boot
+-----------
+This is the first TP-Link MediaTek device to feature a split-uboot
+design. The first (factory-uboot) provides recovery via TFTP and HTTP,
+jumping straight into the second (firmware-uboot) if no recovery needs
+to be performed. The firmware-uboot unpacks and executed the kernel.
+
+Web-Recovery
+------------
+TP-Link integrated a new Web-Recovery like the one on the Archer C7v4 /
+TL-WR1043v5. Stock-firmware sets a flag in the "romfile" partition
+before beginning to write and removes it afterwards. If the router boots
+with this flag set, bootloader will automatically start Web-recovery and
+listens on 192.168.0.1. This way, the vendor-firmware or an OpenWRT
+factory image can be written.
+
+It is important to note that Web-Recovery is only based on this flag. It
+can't detect e.g. a crashing kernel or other means. Once activated it
+won't boot the OS before a recovery action (either via TFTP or HTTP) is
+performed. This recovery-mode is indicated by an illuminated WPS-LED on
+boot.
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
+index 6057275978591192e3b7799a8e6d97761c3e23a5..19386b9e139a25fd1ac29cd9a66b738b5b092cdf 100755
+--- a/target/linux/ramips/base-files/etc/board.d/01_leds
++++ b/target/linux/ramips/base-files/etc/board.d/01_leds
+@@ -410,7 +410,8 @@ tplink,c20-v4)
+ 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
+ 	ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" "wlan0"
+ 	;;
+-tplink,c50-v3)
++tplink,c50-v3|\
++tplink,c50-v4)
+ 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
+ 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
+ 	ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan2g" "phy0tpt"
+diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
+index ebf40ad1fa874d324b43c8f0613bca53a19ab2d0..1c6cc6b0af745b43b81bbfffc9b5462c1b88defc 100755
+--- a/target/linux/ramips/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/base-files/etc/board.d/02_network
+@@ -205,6 +205,7 @@ ramips_setup_interfaces()
+ 	rt-n14u|\
+ 	tplink,c20-v4|\
+ 	tplink,c50-v3|\
++	tplink,c50-v4|\
+ 	tplink,tl-mr3420-v5|\
+ 	tplink,tl-wr842n-v5|\
+ 	tl-wr840n-v4|\
+diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
+index 2f51add331fef4693e997433a4ab0e665da80e02..6d021b6def2f1fe7b71a67f36749c440f3bad1d4 100644
+--- a/target/linux/ramips/base-files/etc/diag.sh
++++ b/target/linux/ramips/base-files/etc/diag.sh
+@@ -42,6 +42,7 @@ get_status_led() {
+ 	r6220|\
+ 	tplink,c20-v4|\
+ 	tplink,c50-v3|\
++	tplink,c50-v4|\
+ 	tplink,tl-mr3420-v5|\
+ 	tplink,tl-wr842n-v5|\
+ 	tplink,tl-wr902ac-v3|\
+diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+index ffdc5e73e0ede286c10396810954a230c8ea32fc..8055853508fc850a1826166c7e0cbdf443df27cb 100755
+--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+@@ -256,6 +256,7 @@ platform_check_image() {
+ 	tplink,c20-v1|\
+ 	tplink,c20-v4|\
+ 	tplink,c50-v3|\
++	tplink,c50-v4|\
+ 	tplink,tl-mr3420-v5|\
+ 	tplink,tl-wr842n-v5|\
+ 	tplink,tl-wr902ac-v3|\
+diff --git a/target/linux/ramips/dts/ArcherC50V4.dts b/target/linux/ramips/dts/ArcherC50V4.dts
+new file mode 100644
+index 0000000000000000000000000000000000000000..bb4a65436fa435e5636aca3bf326b5a3ca61f7e3
+--- /dev/null
++++ b/target/linux/ramips/dts/ArcherC50V4.dts
+@@ -0,0 +1,93 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/dts-v1/;
++
++#include "TPLINK-8M-SPLIT-UBOOT.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	compatible = "tplink,c50-v4", "mediatek,mt7628an-soc";
++	model = "TP-Link Archer C50 v4";
++
++	keys {
++		compatible = "gpio-keys-polled";
++		poll-interval = <20>;
++
++		reset {
++			label = "reset";
++			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RESTART>;
++		};
++
++		rfkill {
++			label = "rfkill";
++			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RFKILL>;
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		led_power: power {
++			label = "c50-v4:green:power";
++			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
++		};
++
++		wlan2 {
++			label = "c50-v4:green:wlan2g";
++			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
++		};
++
++		wlan5 {
++			label = "c50-v4:green:wlan5g";
++			gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
++		};
++
++		lan {
++			label = "c50-v4:green:lan";
++			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
++		};
++
++		wan {
++			label = "c50-v4:green:wan";
++			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
++		};
++
++		wan_orange {
++			label = "c50-v4:orange:wan";
++			gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
++		};
++
++		wps {
++			label = "c50-v4:green:wps";
++			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
++
++&pinctrl {
++	state_default: pinctrl0 {
++		gpio {
++			ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an",
++				       "p3led_an", "p4led_an", "wdt", "wled_an";
++			ralink,function = "gpio";
++		};
++	};
++};
++
++&pcie {
++	status = "okay";
++
++	pcie-bridge {
++		mt76@0,0 {
++			reg = <0x0000 0 0 0 0>;
++			device_type = "pci";
++			mediatek,mtd-eeprom = <&radio 0x8000>;
++			ieee80211-freq-limit = <5000000 6000000>;
++			mtd-mac-address = <&rom 0xf100>;
++			mtd-mac-address-increment = <(-1)>;
++		};
++	};
++};
+\ No newline at end of file
+diff --git a/target/linux/ramips/dts/TPLINK-8M-SPLIT-UBOOT.dtsi b/target/linux/ramips/dts/TPLINK-8M-SPLIT-UBOOT.dtsi
+new file mode 100644
+index 0000000000000000000000000000000000000000..539f476dce6e1fe43769f3ed41ae94d5f6fbc2cc
+--- /dev/null
++++ b/target/linux/ramips/dts/TPLINK-8M-SPLIT-UBOOT.dtsi
+@@ -0,0 +1,90 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++#include "mt7628an.dtsi"
++
++/ {
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x0 0x4000000>;
++	};
++};
++
++&spi0 {
++	status = "okay";
++
++	flash@0 {
++		compatible = "jedec,spi-nor";
++		reg = <0>;
++		spi-max-frequency = <10000000>;
++		m25p,chunked-io = <32>;
++
++		partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				label = "factory-uboot";
++				reg = <0x0 0x30000>;
++				read-only;
++			};
++
++			partition@30000 {
++				label = "boot";
++				reg = <0x30000 0x20000>;
++				read-only;
++			};
++
++			partition@50000 {
++				compatible = "tplink,firmware";
++				label = "firmware";
++				reg = <0x50000 0x770000>;
++			};
++
++			partition@7c0000 {
++				label = "config";
++				reg = <0x7c0000 0x10000>;
++				read-only;
++			};
++
++			rom: partition@7d0000 {
++				label = "rom";
++				reg = <0x7d0000 0x10000>;
++				read-only;
++			};
++
++			partition@7e0000 {
++				label = "romfile";
++				reg = <0x7e0000 0x10000>;
++			};
++
++			radio: partition@7f0000 {
++				label = "radio";
++				reg = <0x7f0000 0x10000>;
++				read-only;
++			};
++		};
++	};
++};
++
++&ehci {
++	status = "disabled";
++};
++
++&ohci {
++	status = "disabled";
++};
++
++&wmac {
++	status = "okay";
++	mtd-mac-address = <&rom 0xf100>;
++	mediatek,mtd-eeprom = <&radio 0x0>;
++};
++
++&ethernet {
++	mtd-mac-address = <&rom 0xf100>;
++	mediatek,portmap = "llllw";
++};
+diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
+index 21c5357a089fdd0675afa6f131ff5b34a9a8f54d..34bd662f3a9490bdb0fd125af5ffa8a0f77c5f16 100644
+--- a/target/linux/ramips/image/mt76x8.mk
++++ b/target/linux/ramips/image/mt76x8.mk
+@@ -182,6 +182,20 @@ define Device/tplink_c50-v3
+ endef
+ TARGET_DEVICES += tplink_c50-v3
+ 
++define Device/tplink_c50-v4
++  $(Device/tplink)
++  DTS := ArcherC50V4
++  IMAGE_SIZE := 7616k
++  DEVICE_TITLE := TP-Link ArcherC50 v4
++  TPLINK_FLASHLAYOUT := 8MSUmtk
++  TPLINK_HWID := 0x001D589B
++  TPLINK_HWREV := 0x93
++  TPLINK_HWREVADD := 0x2
++  TPLINK_HVERSION := 3
++  IMAGES := sysupgrade.bin
++endef
++TARGET_DEVICES += tplink_c50-v4
++
+ define Device/tplink_tl-mr3420-v5
+   $(Device/tplink)
+   DTS := TL-MR3420V5

patches/openwrt/0014-mac80211-ath10k-support-for-multicast-and-management-rate-control.patch

@@ -0,0 +1,420 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 8 Feb 2019 21:20:20 +0100
+Subject: mac80211: ath10k: support for multicast and management rate control
+
+Drivers with software rate control can directly use the selected multicast
+rate for multicast/broadcast frames and the minimal basic rate for
+management frames. But drivers with offloaded rate control algorithms must
+be informed about such upper layer decisions to configure the
+hardware/firmware.
+
+A new BSS_CHANGED_MCAST_RATE is introduced in mac80211 to automatically
+inform all drivers. ath10k can detect this event and forward it via WMI to
+the driver. The already existing BSS_CHANGED_BASIC_RATES can be used to
+select the management rate.
+
+Without the WMI commands, a low rate (not necessarily one from the basic
+rates) is used for bcast/mcast/management frames. This means that the
+/etc/config/wireless settings basic_rate and mcast_rate would have no
+effect on the rates selected by this driver for the mentioned frames.
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+diff --git a/package/kernel/mac80211/patches/975-mac80211-notify-driver-for-change-in-multicast-rates.patch b/package/kernel/mac80211/patches/975-mac80211-notify-driver-for-change-in-multicast-rates.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..fb07fa23ecc0518d69eef1f5064328f5c5968360
+--- /dev/null
++++ b/package/kernel/mac80211/patches/975-mac80211-notify-driver-for-change-in-multicast-rates.patch
+@@ -0,0 +1,98 @@
++From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++Date: Thu, 22 Mar 2018 12:18:03 -0700
++Subject: [PATCH] mac80211: notify driver for change in multicast rates
++
++With drivers implementing rate control in driver or firmware
++rate_control_send_low() may not get called, and thus the
++driver needs to know about changes in the multicast rate.
++
++Add and use a new BSS change flag for this.
++
++Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++[rewrite commit message]
++Signed-off-by: Johannes Berg <johannes.berg@intel.com>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dcbe73ca55a42712bfd0e9966cd2d5a48355ace3
++---
++ include/net/mac80211.h | 3 +++
++ net/mac80211/cfg.c     | 2 ++
++ net/mac80211/ibss.c    | 2 +-
++ net/mac80211/mesh.c    | 3 ++-
++ net/mac80211/util.c    | 3 ++-
++ 5 files changed, 10 insertions(+), 3 deletions(-)
++
++diff --git a/include/net/mac80211.h b/include/net/mac80211.h
++index 885690fa39c8d8f4a48f2fa25447646d3d0a7856..48cfee4e26bdf3c7b7dbaaeecd6520492fa375a9 100644
++--- a/include/net/mac80211.h
+++++ b/include/net/mac80211.h
++@@ -301,6 +301,8 @@ struct ieee80211_vif_chanctx_switch {
++  * @BSS_CHANGED_MU_GROUPS: VHT MU-MIMO group id or user position changed
++  * @BSS_CHANGED_KEEP_ALIVE: keep alive options (idle period or protected
++  *	keep alive) changed.
+++ * @BSS_CHANGED_MCAST_RATE: Multicast Rate setting changed for this interface
+++ *
++  */
++ enum ieee80211_bss_change {
++ 	BSS_CHANGED_ASSOC		= 1<<0,
++@@ -328,6 +330,7 @@ enum ieee80211_bss_change {
++ 	BSS_CHANGED_OCB                 = 1<<22,
++ 	BSS_CHANGED_MU_GROUPS		= 1<<23,
++ 	BSS_CHANGED_KEEP_ALIVE		= 1<<24,
+++	BSS_CHANGED_MCAST_RATE		= 1<<25,
++ 
++ 	/* when adding here, make sure to change ieee80211_reconfig */
++ };
++diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
++index fb15d3b97cb214078f1533f880350fe280b57c69..0b1984b8e3ab4184b009b6423c73dd0b6959d777 100644
++--- a/net/mac80211/cfg.c
+++++ b/net/mac80211/cfg.c
++@@ -2310,6 +2310,8 @@ static int ieee80211_set_mcast_rate(struct wiphy *wiphy, struct net_device *dev,
++ 	memcpy(sdata->vif.bss_conf.mcast_rate, rate,
++ 	       sizeof(int) * NUM_NL80211_BANDS);
++ 
+++	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_MCAST_RATE);
+++
++ 	return 0;
++ }
++ 
++diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
++index e9c6aa3ed05b8ddb8cf03decce82c00e59b4c0a7..f4b0634b80dedecfc3c05998132bdb6dcd043ed1 100644
++--- a/net/mac80211/ibss.c
+++++ b/net/mac80211/ibss.c
++@@ -1840,7 +1840,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
++ 		  IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED
++ 		| IEEE80211_HT_PARAM_RIFS_MODE;
++ 
++-	changed |= BSS_CHANGED_HT;
+++	changed |= BSS_CHANGED_HT | BSS_CHANGED_MCAST_RATE;
++ 	ieee80211_bss_info_change_notify(sdata, changed);
++ 
++ 	sdata->smps_mode = IEEE80211_SMPS_OFF;
++diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
++index a550c707cd8a6130ef5756cedf2fa4738ae9a0e7..e9f5c2ae46a7bd83907d0b5ca1ceb0b8d6afd3fe 100644
++--- a/net/mac80211/mesh.c
+++++ b/net/mac80211/mesh.c
++@@ -880,7 +880,8 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
++ 		      BSS_CHANGED_BEACON_ENABLED |
++ 		      BSS_CHANGED_HT |
++ 		      BSS_CHANGED_BASIC_RATES |
++-		      BSS_CHANGED_BEACON_INT;
+++		      BSS_CHANGED_BEACON_INT |
+++		      BSS_CHANGED_MCAST_RATE;
++ 
++ 	local->fif_other_bss++;
++ 	/* mesh ifaces must set allmulti to forward mcast traffic */
++diff --git a/net/mac80211/util.c b/net/mac80211/util.c
++index 6aef6793d05236c19afe00a51f4ddc91bc060a39..6594df0c3e7afe90cf103bac89580e0ad71ed045 100644
++--- a/net/mac80211/util.c
+++++ b/net/mac80211/util.c
++@@ -1971,7 +1971,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
++ 			  BSS_CHANGED_CQM |
++ 			  BSS_CHANGED_QOS |
++ 			  BSS_CHANGED_IDLE |
++-			  BSS_CHANGED_TXPOWER;
+++			  BSS_CHANGED_TXPOWER |
+++			  BSS_CHANGED_MCAST_RATE;
++ 
++ 		if (sdata->vif.mu_mimo_owner)
++ 			changed |= BSS_CHANGED_MU_GROUPS;
+diff --git a/package/kernel/mac80211/patches/976-ath10k-support-for-multicast-rate-control.patch b/package/kernel/mac80211/patches/976-ath10k-support-for-multicast-rate-control.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..94bc108fb2e1a99f716135d842e0959f8c7cb602
+--- /dev/null
++++ b/package/kernel/mac80211/patches/976-ath10k-support-for-multicast-rate-control.patch
+@@ -0,0 +1,112 @@
++From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++Date: Wed, 25 Jul 2018 10:59:39 +0300
++Subject: [PATCH] ath10k: support for multicast rate control
++
++Issues a wmi command to firmware when multicast rate change is received with the
++new BSS_CHANGED_MCAST_RATE flag.  Also fixes the incorrect fixed_rate setting
++for CCK rates which got introduced with addition of ath10k_rates_rev2 enum.
++
++Tested on QCA9984 with firmware ver 10.4-3.6-00104
++
++Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cd93b83ad927b2c7979e0add0343ace59328b461
++---
++ drivers/net/wireless/ath/ath10k/mac.c | 54 +++++++++++++++++++++++++--
++ 1 file changed, 50 insertions(+), 4 deletions(-)
++
++diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
++index 5683f1a5330eedae677aad5bf2621a6232781346..1937526c8c18da85f7730429759391d47e12cf81 100644
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -100,6 +100,8 @@ static struct ieee80211_rate ath10k_rates_rev2[] = {
++ #define ath10k_g_rates_rev2 (ath10k_rates_rev2 + 0)
++ #define ath10k_g_rates_rev2_size (ARRAY_SIZE(ath10k_rates_rev2))
++ 
+++#define ath10k_wmi_legacy_rates ath10k_rates
+++
++ static bool ath10k_mac_bitrate_is_cck(int bitrate)
++ {
++ 	switch (bitrate) {
++@@ -5389,8 +5391,12 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ {
++ 	struct ath10k *ar = hw->priv;
++ 	struct ath10k_vif *arvif = (void *)vif->drv_priv;
++-	int ret = 0;
+++	struct cfg80211_chan_def def;
++ 	u32 vdev_param, pdev_param, slottime, preamble;
+++	u16 bitrate, hw_value;
+++	u8 rate;
+++	int rateidx, ret = 0;
+++	enum nl80211_band band;
++ 
++ 	mutex_lock(&ar->conf_mutex);
++ 
++@@ -5558,6 +5564,44 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 				    arvif->vdev_id, ret);
++ 	}
++ 
+++	if (changed & BSS_CHANGED_MCAST_RATE &&
+++	    !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
+++		band = def.chan->band;
+++		rateidx = vif->bss_conf.mcast_rate[band] - 1;
+++
+++		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
+++			rateidx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;
+++
+++		bitrate = ath10k_wmi_legacy_rates[rateidx].bitrate;
+++		hw_value = ath10k_wmi_legacy_rates[rateidx].hw_value;
+++		if (ath10k_mac_bitrate_is_cck(bitrate))
+++			preamble = WMI_RATE_PREAMBLE_CCK;
+++		else
+++			preamble = WMI_RATE_PREAMBLE_OFDM;
+++
+++		rate = ATH10K_HW_RATECODE(hw_value, 0, preamble);
+++
+++		ath10k_dbg(ar, ATH10K_DBG_MAC,
+++			   "mac vdev %d mcast_rate %x\n",
+++			   arvif->vdev_id, rate);
+++
+++		vdev_param = ar->wmi.vdev_param->mcast_data_rate;
+++		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
+++						vdev_param, rate);
+++		if (ret)
+++			ath10k_warn(ar,
+++				    "failed to set mcast rate on vdev %i: %d\n",
+++				    arvif->vdev_id,  ret);
+++
+++		vdev_param = ar->wmi.vdev_param->bcast_data_rate;
+++		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
+++						vdev_param, rate);
+++		if (ret)
+++			ath10k_warn(ar,
+++				    "failed to set bcast rate on vdev %i: %d\n",
+++				    arvif->vdev_id,  ret);
+++	}
+++
++ 	mutex_unlock(&ar->conf_mutex);
++ }
++ 
++@@ -6826,7 +6870,6 @@ ath10k_mac_bitrate_mask_get_single_rate(struct ath10k *ar,
++ 					const struct cfg80211_bitrate_mask *mask,
++ 					u8 *rate, u8 *nss)
++ {
++-	struct ieee80211_supported_band *sband = &ar->mac.sbands[band];
++ 	int rate_idx;
++ 	int i;
++ 	u16 bitrate;
++@@ -6836,8 +6879,11 @@ ath10k_mac_bitrate_mask_get_single_rate(struct ath10k *ar,
++ 	if (hweight32(mask->control[band].legacy) == 1) {
++ 		rate_idx = ffs(mask->control[band].legacy) - 1;
++ 
++-		hw_rate = sband->bitrates[rate_idx].hw_value;
++-		bitrate = sband->bitrates[rate_idx].bitrate;
+++		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
+++			rate_idx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;
+++
+++		hw_rate = ath10k_wmi_legacy_rates[rate_idx].hw_value;
+++		bitrate = ath10k_wmi_legacy_rates[rate_idx].bitrate;
++ 
++ 		if (ath10k_mac_bitrate_is_cck(bitrate))
++ 			preamble = WMI_RATE_PREAMBLE_CCK;
+diff --git a/package/kernel/mac80211/patches/977-ath10k-add-support-for-configuring-management-packet.patch b/package/kernel/mac80211/patches/977-ath10k-add-support-for-configuring-management-packet.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..4b2aa5effdb19141178a5bb71eb9488ee7575b93
+--- /dev/null
++++ b/package/kernel/mac80211/patches/977-ath10k-add-support-for-configuring-management-packet.patch
+@@ -0,0 +1,94 @@
++From: Sriram R <srirrama@codeaurora.org>
++Date: Mon, 10 Sep 2018 11:09:40 +0530
++Subject: [PATCH] ath10k: add support for configuring management packet rate
++
++By default the firmware uses 1Mbps and 6Mbps rate for management packets
++in 2G and 5G bands respectively. But when the user selects different
++basic rates from the userspace, we need to send the management
++packets at the lowest basic rate selected by the user.
++
++This change makes use of WMI_VDEV_PARAM_MGMT_RATE param for configuring the
++management packets rate to the firmware.
++
++Chipsets Tested : QCA988X, QCA9887, QCA9984
++FW Tested 	: 10.2.4-1.0-41, 10.4-3.6.104
++
++Signed-off-by: Sriram R <srirrama@codeaurora.org>
++Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f279294e9ee22a8f306fdc8e4181cf555e6f0f70
++---
++ drivers/net/wireless/ath/ath10k/mac.c | 45 +++++++++++++++++++++++++--
++ 1 file changed, 43 insertions(+), 2 deletions(-)
++
++diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
++index 1937526c8c18da85f7730429759391d47e12cf81..47e5992afcd7564743f513eb250b57381aba3233 100644
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -155,6 +155,22 @@ u8 ath10k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband,
++ 	return 0;
++ }
++ 
+++static int ath10k_mac_get_rate_hw_value(int bitrate)
+++{
+++	int i;
+++	u8 hw_value_prefix = 0;
+++
+++	if (ath10k_mac_bitrate_is_cck(bitrate))
+++		hw_value_prefix = WMI_RATE_PREAMBLE_CCK << 6;
+++
+++	for (i = 0; i < sizeof(ath10k_rates); i++) {
+++		if (ath10k_rates[i].bitrate == bitrate)
+++			return hw_value_prefix | ath10k_rates[i].hw_value;
+++	}
+++
+++	return -EINVAL;
+++}
+++
++ static int ath10k_mac_get_max_vht_mcs_map(u16 mcs_map, int nss)
++ {
++ 	switch ((mcs_map >> (2 * nss)) & 0x3) {
++@@ -5394,9 +5410,10 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 	struct cfg80211_chan_def def;
++ 	u32 vdev_param, pdev_param, slottime, preamble;
++ 	u16 bitrate, hw_value;
++-	u8 rate;
++-	int rateidx, ret = 0;
+++	u8 rate, basic_rate_idx;
+++	int rateidx, ret = 0, hw_rate_code;
++ 	enum nl80211_band band;
+++	const struct ieee80211_supported_band *sband;
++ 
++ 	mutex_lock(&ar->conf_mutex);
++ 
++@@ -5602,6 +5619,30 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 				    arvif->vdev_id,  ret);
++ 	}
++ 
+++	if (changed & BSS_CHANGED_BASIC_RATES) {
+++		if (WARN_ON(ath10k_mac_vif_chan(vif, &def))) {
+++			mutex_unlock(&ar->conf_mutex);
+++			return;
+++		}
+++
+++	sband = ar->hw->wiphy->bands[def.chan->band];
+++	basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
+++	bitrate = sband->bitrates[basic_rate_idx].bitrate;
+++
+++	hw_rate_code = ath10k_mac_get_rate_hw_value(bitrate);
+++	if (hw_rate_code < 0) {
+++		ath10k_warn(ar, "bitrate not supported %d\n", bitrate);
+++		mutex_unlock(&ar->conf_mutex);
+++		return;
+++	}
+++
+++	vdev_param = ar->wmi.vdev_param->mgmt_rate;
+++	ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
+++					hw_rate_code);
+++	if (ret)
+++		ath10k_warn(ar, "failed to set mgmt tx rate %d\n", ret);
+++	}
+++
++ 	mutex_unlock(&ar->conf_mutex);
++ }
++ 
+diff --git a/package/kernel/mac80211/patches/978-ath10k-fix-possible-out-of-bound-access-of-ath10k_ra.patch b/package/kernel/mac80211/patches/978-ath10k-fix-possible-out-of-bound-access-of-ath10k_ra.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..b496332574f93b1f6474226e8c09970d6fe0e2fe
+--- /dev/null
++++ b/package/kernel/mac80211/patches/978-ath10k-fix-possible-out-of-bound-access-of-ath10k_ra.patch
+@@ -0,0 +1,70 @@
++From: Sriram R <srirrama@codeaurora.org>
++Date: Wed, 3 Oct 2018 08:43:50 +0530
++Subject: [PATCH] ath10k: fix possible out of bound access of ath10k_rates array
++
++While using 'ath10k_mac_get_rate_hw_value()' to obtain the hw value
++from the passed bitrate, there is a chance of out of bound array access
++when wrong bitrate is passed. This is fixed by comparing the bitrates
++within the correct size of the ath10k_rates array.
++
++Fixes commit f279294e9ee2 ("ath10k: add support for configuring management
++packet rate"). Also correction made to some indents used in the above commit.
++
++Signed-off-by: Sriram R <srirrama@codeaurora.org>
++Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=34e141eea7dd8525dd1ef7a925459e455b4d307f
++---
++ drivers/net/wireless/ath/ath10k/mac.c | 30 +++++++++++++--------------
++ 1 file changed, 15 insertions(+), 15 deletions(-)
++
++diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
++index 47e5992afcd7564743f513eb250b57381aba3233..e93b04c8e6fb2fa7968b910e0cc97ad8144bd7e8 100644
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -163,7 +163,7 @@ static int ath10k_mac_get_rate_hw_value(int bitrate)
++ 	if (ath10k_mac_bitrate_is_cck(bitrate))
++ 		hw_value_prefix = WMI_RATE_PREAMBLE_CCK << 6;
++ 
++-	for (i = 0; i < sizeof(ath10k_rates); i++) {
+++	for (i = 0; i < ARRAY_SIZE(ath10k_rates); i++) {
++ 		if (ath10k_rates[i].bitrate == bitrate)
++ 			return hw_value_prefix | ath10k_rates[i].hw_value;
++ 	}
++@@ -5625,22 +5625,22 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 			return;
++ 		}
++ 
++-	sband = ar->hw->wiphy->bands[def.chan->band];
++-	basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
++-	bitrate = sband->bitrates[basic_rate_idx].bitrate;
+++		sband = ar->hw->wiphy->bands[def.chan->band];
+++		basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
+++		bitrate = sband->bitrates[basic_rate_idx].bitrate;
++ 
++-	hw_rate_code = ath10k_mac_get_rate_hw_value(bitrate);
++-	if (hw_rate_code < 0) {
++-		ath10k_warn(ar, "bitrate not supported %d\n", bitrate);
++-		mutex_unlock(&ar->conf_mutex);
++-		return;
++-	}
+++		hw_rate_code = ath10k_mac_get_rate_hw_value(bitrate);
+++		if (hw_rate_code < 0) {
+++			ath10k_warn(ar, "bitrate not supported %d\n", bitrate);
+++			mutex_unlock(&ar->conf_mutex);
+++			return;
+++		}
++ 
++-	vdev_param = ar->wmi.vdev_param->mgmt_rate;
++-	ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
++-					hw_rate_code);
++-	if (ret)
++-		ath10k_warn(ar, "failed to set mgmt tx rate %d\n", ret);
+++		vdev_param = ar->wmi.vdev_param->mgmt_rate;
+++		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
+++						hw_rate_code);
+++		if (ret)
+++			ath10k_warn(ar, "failed to set mgmt tx rate %d\n", ret);
++ 	}
++ 
++ 	mutex_unlock(&ar->conf_mutex);

patches/openwrt/0015-ath10k-ct-support-for-multicast-and-management-rate-control.patch

@@ -0,0 +1,316 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 8 Feb 2019 21:20:20 +0100
+Subject: ath10k-ct: support for multicast and management rate control
+
+Drivers with software rate control can directly use the selected multicast
+rate for multicast/broadcast frames and the minimal basic rate for
+management frames. But drivers with offloaded rate control algorithms must
+be informed about such upper layer decisions to configure the
+hardware/firmware.
+
+A new BSS_CHANGED_MCAST_RATE is introduced in mac80211 to automatically
+inform all drivers. ath10k-ct can detect this event and forward it via WMI
+to the driver. The already existing BSS_CHANGED_BASIC_RATES can be used to
+select the management rate.
+
+Without the WMI commands, a low rate (not necessarily one from the basic
+rates) is used for bcast/mcast/management frames. This means that the
+/etc/config/wireless settings basic_rate and mcast_rate would have no
+effect on the rates selected by this driver for the mentioned frames.
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+diff --git a/package/kernel/ath10k-ct/patches/976-ath10k-support-for-multicast-rate-control.patch b/package/kernel/ath10k-ct/patches/976-ath10k-support-for-multicast-rate-control.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..bd60bf317dec3a2eec1fd9263037acc30d272e39
+--- /dev/null
++++ b/package/kernel/ath10k-ct/patches/976-ath10k-support-for-multicast-rate-control.patch
+@@ -0,0 +1,112 @@
++From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++Date: Wed, 25 Jul 2018 10:59:39 +0300
++Subject: [PATCH] ath10k: support for multicast rate control
++
++Issues a wmi command to firmware when multicast rate change is received with the
++new BSS_CHANGED_MCAST_RATE flag.  Also fixes the incorrect fixed_rate setting
++for CCK rates which got introduced with addition of ath10k_rates_rev2 enum.
++
++Tested on QCA9984 with firmware ver 10.4-3.6-00104
++
++Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cd93b83ad927b2c7979e0add0343ace59328b461
++---
++ ath10k-4.13/mac.c | 54 +++++++++++++++++++++++++--
++ 1 file changed, 50 insertions(+), 4 deletions(-)
++
++diff --git a/ath10k-4.13/mac.c b/ath10k-4.13/mac.c
++index 5683f1a5330eedae677aad5bf2621a6232781346..1937526c8c18da85f7730429759391d47e12cf81 100644
++--- a/ath10k-4.13/mac.c
+++++ b/ath10k-4.13/mac.c
++@@ -100,6 +100,8 @@ static struct ieee80211_rate ath10k_rates_rev2[] = {
++ #define ath10k_g_rates_rev2 (ath10k_rates_rev2 + 0)
++ #define ath10k_g_rates_rev2_size (ARRAY_SIZE(ath10k_rates_rev2))
++ 
+++#define ath10k_wmi_legacy_rates ath10k_rates
+++
++ static bool ath10k_mac_bitrate_is_cck(int bitrate)
++ {
++ 	switch (bitrate) {
++@@ -5389,8 +5391,12 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ {
++ 	struct ath10k *ar = hw->priv;
++ 	struct ath10k_vif *arvif = (void *)vif->drv_priv;
++-	int ret = 0;
+++	struct cfg80211_chan_def def;
++ 	u32 vdev_param, pdev_param, slottime, preamble;
+++	u16 bitrate, hw_value;
+++	u8 rate;
+++	int rateidx, ret = 0;
+++	enum nl80211_band band;
++ 
++ 	mutex_lock(&ar->conf_mutex);
++ 
++@@ -5558,6 +5564,44 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 				    arvif->vdev_id, ret);
++ 	}
++ 
+++	if (changed & BSS_CHANGED_MCAST_RATE &&
+++	    !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
+++		band = def.chan->band;
+++		rateidx = vif->bss_conf.mcast_rate[band] - 1;
+++
+++		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
+++			rateidx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;
+++
+++		bitrate = ath10k_wmi_legacy_rates[rateidx].bitrate;
+++		hw_value = ath10k_wmi_legacy_rates[rateidx].hw_value;
+++		if (ath10k_mac_bitrate_is_cck(bitrate))
+++			preamble = WMI_RATE_PREAMBLE_CCK;
+++		else
+++			preamble = WMI_RATE_PREAMBLE_OFDM;
+++
+++		rate = ATH10K_HW_RATECODE(hw_value, 0, preamble);
+++
+++		ath10k_dbg(ar, ATH10K_DBG_MAC,
+++			   "mac vdev %d mcast_rate %x\n",
+++			   arvif->vdev_id, rate);
+++
+++		vdev_param = ar->wmi.vdev_param->mcast_data_rate;
+++		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
+++						vdev_param, rate);
+++		if (ret)
+++			ath10k_warn(ar,
+++				    "failed to set mcast rate on vdev %i: %d\n",
+++				    arvif->vdev_id,  ret);
+++
+++		vdev_param = ar->wmi.vdev_param->bcast_data_rate;
+++		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
+++						vdev_param, rate);
+++		if (ret)
+++			ath10k_warn(ar,
+++				    "failed to set bcast rate on vdev %i: %d\n",
+++				    arvif->vdev_id,  ret);
+++	}
+++
++ 	mutex_unlock(&ar->conf_mutex);
++ }
++ 
++@@ -6826,7 +6870,6 @@ ath10k_mac_bitrate_mask_get_single_rate(struct ath10k *ar,
++ 					const struct cfg80211_bitrate_mask *mask,
++ 					u8 *rate, u8 *nss)
++ {
++-	struct ieee80211_supported_band *sband = &ar->mac.sbands[band];
++ 	int rate_idx;
++ 	int i;
++ 	u16 bitrate;
++@@ -6836,8 +6879,11 @@ ath10k_mac_bitrate_mask_get_single_rate(struct ath10k *ar,
++ 	if (hweight32(mask->control[band].legacy) == 1) {
++ 		rate_idx = ffs(mask->control[band].legacy) - 1;
++ 
++-		hw_rate = sband->bitrates[rate_idx].hw_value;
++-		bitrate = sband->bitrates[rate_idx].bitrate;
+++		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
+++			rate_idx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;
+++
+++		hw_rate = ath10k_wmi_legacy_rates[rate_idx].hw_value;
+++		bitrate = ath10k_wmi_legacy_rates[rate_idx].bitrate;
++ 
++ 		if (ath10k_mac_bitrate_is_cck(bitrate))
++ 			preamble = WMI_RATE_PREAMBLE_CCK;
+diff --git a/package/kernel/ath10k-ct/patches/977-ath10k-add-support-for-configuring-management-packet.patch b/package/kernel/ath10k-ct/patches/977-ath10k-add-support-for-configuring-management-packet.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..6cc6df271fc73431b9467ac9878c360345e0754f
+--- /dev/null
++++ b/package/kernel/ath10k-ct/patches/977-ath10k-add-support-for-configuring-management-packet.patch
+@@ -0,0 +1,94 @@
++From: Sriram R <srirrama@codeaurora.org>
++Date: Mon, 10 Sep 2018 11:09:40 +0530
++Subject: [PATCH] ath10k: add support for configuring management packet rate
++
++By default the firmware uses 1Mbps and 6Mbps rate for management packets
++in 2G and 5G bands respectively. But when the user selects different
++basic rates from the userspace, we need to send the management
++packets at the lowest basic rate selected by the user.
++
++This change makes use of WMI_VDEV_PARAM_MGMT_RATE param for configuring the
++management packets rate to the firmware.
++
++Chipsets Tested : QCA988X, QCA9887, QCA9984
++FW Tested 	: 10.2.4-1.0-41, 10.4-3.6.104
++
++Signed-off-by: Sriram R <srirrama@codeaurora.org>
++Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f279294e9ee22a8f306fdc8e4181cf555e6f0f70
++---
++ ath10k-4.13/mac.c | 45 +++++++++++++++++++++++++--
++ 1 file changed, 43 insertions(+), 2 deletions(-)
++
++diff --git a/ath10k-4.13/mac.c b/ath10k-4.13/mac.c
++index 1937526c8c18da85f7730429759391d47e12cf81..47e5992afcd7564743f513eb250b57381aba3233 100644
++--- a/ath10k-4.13/mac.c
+++++ b/ath10k-4.13/mac.c
++@@ -155,6 +155,22 @@ u8 ath10k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband,
++ 	return 0;
++ }
++ 
+++static int ath10k_mac_get_rate_hw_value(int bitrate)
+++{
+++	int i;
+++	u8 hw_value_prefix = 0;
+++
+++	if (ath10k_mac_bitrate_is_cck(bitrate))
+++		hw_value_prefix = WMI_RATE_PREAMBLE_CCK << 6;
+++
+++	for (i = 0; i < sizeof(ath10k_rates); i++) {
+++		if (ath10k_rates[i].bitrate == bitrate)
+++			return hw_value_prefix | ath10k_rates[i].hw_value;
+++	}
+++
+++	return -EINVAL;
+++}
+++
++ static int ath10k_mac_get_max_vht_mcs_map(u16 mcs_map, int nss)
++ {
++ 	switch ((mcs_map >> (2 * nss)) & 0x3) {
++@@ -5394,9 +5410,10 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 	struct cfg80211_chan_def def;
++ 	u32 vdev_param, pdev_param, slottime, preamble;
++ 	u16 bitrate, hw_value;
++-	u8 rate;
++-	int rateidx, ret = 0;
+++	u8 rate, basic_rate_idx;
+++	int rateidx, ret = 0, hw_rate_code;
++ 	enum nl80211_band band;
+++	const struct ieee80211_supported_band *sband;
++ 
++ 	mutex_lock(&ar->conf_mutex);
++ 
++@@ -5602,6 +5619,30 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 				    arvif->vdev_id,  ret);
++ 	}
++ 
+++	if (changed & BSS_CHANGED_BASIC_RATES) {
+++		if (WARN_ON(ath10k_mac_vif_chan(vif, &def))) {
+++			mutex_unlock(&ar->conf_mutex);
+++			return;
+++		}
+++
+++	sband = ar->hw->wiphy->bands[def.chan->band];
+++	basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
+++	bitrate = sband->bitrates[basic_rate_idx].bitrate;
+++
+++	hw_rate_code = ath10k_mac_get_rate_hw_value(bitrate);
+++	if (hw_rate_code < 0) {
+++		ath10k_warn(ar, "bitrate not supported %d\n", bitrate);
+++		mutex_unlock(&ar->conf_mutex);
+++		return;
+++	}
+++
+++	vdev_param = ar->wmi.vdev_param->mgmt_rate;
+++	ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
+++					hw_rate_code);
+++	if (ret)
+++		ath10k_warn(ar, "failed to set mgmt tx rate %d\n", ret);
+++	}
+++
++ 	mutex_unlock(&ar->conf_mutex);
++ }
++ 
+diff --git a/package/kernel/ath10k-ct/patches/978-ath10k-fix-possible-out-of-bound-access-of-ath10k_ra.patch b/package/kernel/ath10k-ct/patches/978-ath10k-fix-possible-out-of-bound-access-of-ath10k_ra.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..cc13e547aa7e983fcff6137de9463e0b706651c5
+--- /dev/null
++++ b/package/kernel/ath10k-ct/patches/978-ath10k-fix-possible-out-of-bound-access-of-ath10k_ra.patch
+@@ -0,0 +1,70 @@
++From: Sriram R <srirrama@codeaurora.org>
++Date: Wed, 3 Oct 2018 08:43:50 +0530
++Subject: [PATCH] ath10k: fix possible out of bound access of ath10k_rates array
++
++While using 'ath10k_mac_get_rate_hw_value()' to obtain the hw value
++from the passed bitrate, there is a chance of out of bound array access
++when wrong bitrate is passed. This is fixed by comparing the bitrates
++within the correct size of the ath10k_rates array.
++
++Fixes commit f279294e9ee2 ("ath10k: add support for configuring management
++packet rate"). Also correction made to some indents used in the above commit.
++
++Signed-off-by: Sriram R <srirrama@codeaurora.org>
++Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
++
++Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=34e141eea7dd8525dd1ef7a925459e455b4d307f
++---
++ ath10k-4.13/mac.c | 30 +++++++++++++--------------
++ 1 file changed, 15 insertions(+), 15 deletions(-)
++
++diff --git a/ath10k-4.13/mac.c b/ath10k-4.13/mac.c
++index 47e5992afcd7564743f513eb250b57381aba3233..e93b04c8e6fb2fa7968b910e0cc97ad8144bd7e8 100644
++--- a/ath10k-4.13/mac.c
+++++ b/ath10k-4.13/mac.c
++@@ -163,7 +163,7 @@ static int ath10k_mac_get_rate_hw_value(int bitrate)
++ 	if (ath10k_mac_bitrate_is_cck(bitrate))
++ 		hw_value_prefix = WMI_RATE_PREAMBLE_CCK << 6;
++ 
++-	for (i = 0; i < sizeof(ath10k_rates); i++) {
+++	for (i = 0; i < ARRAY_SIZE(ath10k_rates); i++) {
++ 		if (ath10k_rates[i].bitrate == bitrate)
++ 			return hw_value_prefix | ath10k_rates[i].hw_value;
++ 	}
++@@ -5625,22 +5625,22 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
++ 			return;
++ 		}
++ 
++-	sband = ar->hw->wiphy->bands[def.chan->band];
++-	basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
++-	bitrate = sband->bitrates[basic_rate_idx].bitrate;
+++		sband = ar->hw->wiphy->bands[def.chan->band];
+++		basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
+++		bitrate = sband->bitrates[basic_rate_idx].bitrate;
++ 
++-	hw_rate_code = ath10k_mac_get_rate_hw_value(bitrate);
++-	if (hw_rate_code < 0) {
++-		ath10k_warn(ar, "bitrate not supported %d\n", bitrate);
++-		mutex_unlock(&ar->conf_mutex);
++-		return;
++-	}
+++		hw_rate_code = ath10k_mac_get_rate_hw_value(bitrate);
+++		if (hw_rate_code < 0) {
+++			ath10k_warn(ar, "bitrate not supported %d\n", bitrate);
+++			mutex_unlock(&ar->conf_mutex);
+++			return;
+++		}
++ 
++-	vdev_param = ar->wmi.vdev_param->mgmt_rate;
++-	ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
++-					hw_rate_code);
++-	if (ret)
++-		ath10k_warn(ar, "failed to set mgmt tx rate %d\n", ret);
+++		vdev_param = ar->wmi.vdev_param->mgmt_rate;
+++		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
+++						hw_rate_code);
+++		if (ret)
+++			ath10k_warn(ar, "failed to set mgmt tx rate %d\n", ret);
++ 	}
++ 
++ 	mutex_unlock(&ar->conf_mutex);

patches/openwrt/0016-ramips-add-support-for-Netgear-R6120.patch

@@ -0,0 +1,271 @@
+From: Ludwig Thomeczek <ledesrc@wxorx.net>
+Date: Tue, 12 Jun 2018 21:17:23 +0200
+Subject: ramips: add support for Netgear R6120
+
+This patch adds support for the Netgear R6120, aka Netgear AC1200.
+
+Specification:
+- SoC: MediaTek MT7628 (580 MHz)
+- Flash: 16 MiB
+- RAM: 64 MiB
+- Wireless: 2.4Ghz(builtin) and 5Ghz (MT7612E)
+- LAN speed: 10/100
+- LAN ports: 4
+- WAN speed: 10/100
+- WAN ports: 1
+- Serial baud rate of Bootloader and factory firmware: 57600
+
+To flash use nmrpflash with the provided factory.img.
+Flashing via webinterface will not work, for now.
+
+Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
+
+diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
+index 19386b9e139a25fd1ac29cd9a66b738b5b092cdf..4203773b4fa3ec771f07b7a8c414a416a0da0f20 100755
+--- a/target/linux/ramips/base-files/etc/board.d/01_leds
++++ b/target/linux/ramips/base-files/etc/board.d/01_leds
+@@ -301,6 +301,11 @@ mzk-ex750np)
+ na930)
+ 	set_usb_led "$boardname:blue:status"
+ 	;;
++netgear,r6120)
++	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0f"
++	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10"
++	ucidef_set_led_wlan "wlan2g" "WiFi 2.4GHz" "$boardname:green:wlan2g" "phy0tpt"
++	;;
+ newifi-d1)
+ 	set_usb_led "$boardname:red:status"
+ 	;;
+diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
+index 1c6cc6b0af745b43b81bbfffc9b5462c1b88defc..9424c7ddfd64f9149a24ff91e63b71990265d211 100755
+--- a/target/linux/ramips/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/base-files/etc/board.d/02_network
+@@ -301,6 +301,10 @@ ramips_setup_interfaces()
+ 			"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
+ 		ucidef_set_interface_wan "usb0"
+ 		;;
++	netgear,r6120)
++		ucidef_add_switch "switch0" \
++			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"
++		;;
+ 	mzk-dp150n|\
+ 	vocore-8M|\
+ 	vocore-16M)
+diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
+index 6d021b6def2f1fe7b71a67f36749c440f3bad1d4..097cc6df569518f64dbfd641eeccc1a4b1b37a2b 100644
+--- a/target/linux/ramips/base-files/etc/diag.sh
++++ b/target/linux/ramips/base-files/etc/diag.sh
+@@ -38,6 +38,7 @@ get_status_led() {
+ 	mzk-w300nh2|\
+ 	nbg-419n|\
+ 	nbg-419n2|\
++	netgear,r6120|\
+ 	pwh2004|\
+ 	r6220|\
+ 	tplink,c20-v4|\
+diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+index 8055853508fc850a1826166c7e0cbdf443df27cb..7213b22d0c2734488bd96bc34e921f08649b8c2f 100755
+--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+@@ -129,6 +129,7 @@ platform_check_image() {
+ 	psr-680w|\
+ 	px-4885-4M|\
+ 	px-4885-8M|\
++	netgear,r6120|\
+ 	rb750gr3|\
+ 	re6500|\
+ 	rp-n53|\
+diff --git a/target/linux/ramips/dts/R6120.dts b/target/linux/ramips/dts/R6120.dts
+new file mode 100644
+index 0000000000000000000000000000000000000000..a0df0072379a7d8f974ec8025483410d5f9f1da1
+--- /dev/null
++++ b/target/linux/ramips/dts/R6120.dts
+@@ -0,0 +1,142 @@
++/dts-v1/;
++
++#include "mt7628an.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	compatible = "netgear,r6120", "mediatek,mt7628an-soc";
++	model = "Netgear R6120";
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x0 0x4000000>;
++	};
++
++	gpio-keys-polled {
++		compatible = "gpio-keys-polled";
++		poll-interval = <20>;
++
++		reset {
++			label = "reset";
++			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RESTART>;
++		};
++	};
++
++	gpio-leds {
++		compatible = "gpio-leds";
++
++		lan {
++			label = "r6120:green:lan";
++			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
++		};
++
++		led_power: power {
++			label = "r6120:green:power";
++			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
++		};
++
++		wlan {
++			label = "r6120:green:wlan2g";
++			gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
++		};
++
++		wlan_orange {
++			label = "r6120:orange:wlan2g";
++			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
++		};
++
++		wan {
++			label = "r6120:green:wan";
++			gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
++		};
++
++		wan_orange {
++			label = "r6120:orange:wan";
++			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
++
++&pinctrl {
++	state_default: pinctrl0 {
++		gpio {
++			ralink,group = "p0led_an", "p1led_an", "p2led_an",
++				       "p3led_an", "p4led_an", "wdt", "wled_an";
++			ralink,function = "gpio";
++		};
++	};
++};
++
++&spi0 {
++	status = "okay";
++
++	flash@0 {
++		compatible = "jedec,spi-nor";
++		reg = <0>;
++		spi-max-frequency = <10000000>;
++		m25p,chunked-io = <32>;
++
++		partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				label = "u-boot";
++				reg = <0x0 0x40000>;
++				read-only;
++			};
++
++			factory: partition@40000 {
++				label = "factory";
++				reg = <0x40000 0x20000>;
++				read-only;
++			};
++
++			partition@60000 {
++				label = "nvram";
++				reg = <0x60000 0x30000>;
++				read-only;
++			};
++
++			partition@90000 {
++				label = "firmware";
++				reg = <0x90000 0xf60000>;
++			};
++
++			partition@ff0000 {
++				label = "reserved";
++				reg = <0xff0000 0x10000>;
++				read-only;
++			};
++		};
++	};
++};
++
++&wmac {
++	status = "okay";
++	mtd-mac-address = <&factory 0x4>;
++	mediatek,mtd-eeprom = <&factory 0x0>;
++};
++
++&ethernet {
++	mtd-mac-address = <&factory 0x4>;
++};
++
++&pcie {
++	status = "okay";
++
++	pcie-bridge {
++		mt76@0,0 {
++			reg = <0x0000 0 0 0 0>;
++			device_type = "pci";
++			mediatek,mtd-eeprom = <&factory 0x8000>;
++			ieee80211-freq-limit = <5000000 6000000>;
++			mtd-mac-address = <&factory 0x4>;
++			mtd-mac-address-increment = <(2)>;
++		};
++	};
++};
+diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
+index 34bd662f3a9490bdb0fd125af5ffa8a0f77c5f16..bc282666d8c1a4b6ce5beabe2b492331fb48a23a 100644
+--- a/target/linux/ramips/image/mt76x8.mk
++++ b/target/linux/ramips/image/mt76x8.mk
+@@ -2,6 +2,17 @@
+ # MT76x8 Profiles
+ #
+ 
++DEVICE_VARS += SERCOMM_KERNEL_OFFSET SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
++
++define Build/mksercommfw
++	$(STAGING_DIR_HOST)/bin/mksercommfw \
++		$@ \
++		$(SERCOMM_KERNEL_OFFSET) \
++		$(SERCOMM_HWID) \
++		$(SERCOMM_HWVER) \
++		$(SERCOMM_SWVER)
++endef
++
+ define Device/tplink
+   TPLINK_FLASHLAYOUT :=
+   TPLINK_HWID :=
+@@ -90,6 +101,23 @@ define Device/mt7628
+ endef
+ TARGET_DEVICES += mt7628
+ 
++define Device/netgear_r6120
++  DTS := R6120
++  BLOCKSIZE := 64k
++  IMAGE_SIZE := $(ralink_default_fw_size_16M)
++  DEVICE_TITLE := Netgear R6120
++  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
++  SERCOMM_KERNEL_OFFSET := 90000
++  SERCOMM_HWID := CGQ
++  SERCOMM_HWVER := A001
++  SERCOMM_SWVER := 0040
++  IMAGES += factory.img
++  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | pad-rootfs
++  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
++  IMAGE/factory.img := $$(IMAGE/default) | mksercommfw
++endef
++TARGET_DEVICES += netgear_r6120
++
+ define Device/omega2
+   DTS := OMEGA2
+   IMAGE_SIZE := $(ralink_default_fw_size_16M)

patches/openwrt/0017-tools-add-zip-utility.patch

@@ -0,0 +1,465 @@
+From: Mathias Kresin <dev@kresin.me>
+Date: Sat, 5 Jan 2019 20:51:00 +0100
+Subject: tools: add zip utility
+
+One image requires a zip compressed image, so add the zip util found in
+the packages feed, and extend it with some useful debian patches.
+
+Signed-off-by: Mathias Kresin <dev@kresin.me>
+
+tools: zip: add option for reproducible archives
+
+Add the option -mt/--mtime to pass a timestamp which is used as filedate
+for the containing files.
+
+So far, it isn't used for anything written to the extra fields,
+therefore requires the -X (eXclude eXtra file attributes) parameter to
+be effective.
+
+Signed-off-by: Mathias Kresin <dev@kresin.me>
+
+diff --git a/tools/Makefile b/tools/Makefile
+index d2b5daf18c233c8e94657fd61922c75770a3b35b..3ac3b226d35311c606e6dcc562fb8a2d31cec584 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -32,7 +32,7 @@ tools-$(CONFIG_TARGET_x86) += qemu
+ tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
+ tools-$(CONFIG_TARGET_ar71xx) += lzma-old squashfs
+ tools-$(CONFIG_USES_MINOR) += kernel2minor
+-tools-y += lzma squashfs4
++tools-y += lzma squashfs4 zip
+ tools-$(BUILD_B43_TOOLS) += b43-tools
+ tools-$(BUILD_ISL) += isl
+ tools-$(CONFIG_USE_SPARSE) += sparse
+diff --git a/tools/zip/Makefile b/tools/zip/Makefile
+new file mode 100644
+index 0000000000000000000000000000000000000000..7dd81a1b8bc3bfeb5773d0770cb57c164f6db157
+--- /dev/null
++++ b/tools/zip/Makefile
+@@ -0,0 +1,36 @@
++#
++# Copyright (C) 2007-2016 OpenWrt.org
++#
++# This is free software, licensed under the GNU General Public License v2.
++# See /LICENSE for more information.
++#
++
++include $(TOPDIR)/rules.mk
++
++PKG_NAME:=zip
++PKG_REV:=30
++PKG_VERSION:=3.0
++
++PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz
++PKG_SOURCE_URL:=@SF/infozip
++PKG_HASH:=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
++
++PKG_LICENSE:=BSD-4-Clause
++PKG_LICENSE_FILES:=LICENSE
++
++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/zip$(PKG_REV)
++HOST_BUILD_PARALLEL:=1
++
++include $(INCLUDE_DIR)/host-build.mk
++
++define Host/Compile
++	+$(HOST_MAKE_VARS) $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) -I. -f unix/Makefile zip
++endef
++
++define Host/Install
++	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
++	$(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(STAGING_DIR_HOST)/bin/
++endef
++
++$(eval $(call HostBuild))
++#$(eval $(call BuildPackage,zip))
+diff --git a/tools/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch b/tools/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..ef0de6fd9b9bb1f2ee29a9609ce0dbd7799f3410
+--- /dev/null
++++ b/tools/zip/patches/001-unix-configure-borrow-the-LFS-test-from-autotools.patch
+@@ -0,0 +1,89 @@
++From fc392c939b9a18959482f588aff0afc29dd6d30a Mon Sep 17 00:00:00 2001
++From: Romain Naour <romain.naour at openwide.fr>
++Date: Fri, 23 Jan 2015 22:20:18 +0100
++Subject: [PATCH 6/6] unix/configure: borrow the LFS test from autotools.
++
++Infozip's LFS check can't work for cross-compilation
++since it try to run a target's binary on the host system.
++
++Instead, use to LFS test used by autotools which is a
++compilation test.
++(see autotools/lib/autoconf/specific.m4)
++
++Reported-by: Richard Genoud <richard.genoud at gmail.com>
++Signed-off-by: Romain Naour <romain.naour at openwide.fr>
++---
++ configure |   46 +++++++++++++++-------------------------------
++ 1 file changed, 15 insertions(+), 31 deletions(-)
++
++--- a/unix/configure
+++++ b/unix/configure
++@@ -399,9 +399,8 @@ else
++ fi
++ 
++ 
++-# Now we set the 64-bit file environment and check the size of off_t
++-# Added 11/4/2003 EG
++-# Revised 8/12/2004 EG
+++# LFS check borrowed from autotools sources
+++# lib/autoconf/specific.m4
++ 
++ echo Check for Large File Support
++ cat > conftest.c << _EOF_
++@@ -410,23 +409,19 @@ cat > conftest.c << _EOF_
++ # define _FILE_OFFSET_BITS 64       /* select default interface as 64 bit */
++ # define _LARGE_FILES        /* some OSes need this for 64-bit off_t */
++ #include <sys/types.h>
++-#include <sys/stat.h>
++-#include <unistd.h>
++-#include <stdio.h>
+++
+++ /* Check that off_t can represent 2**63 - 1 correctly.
+++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+++    since some C++ compilers masquerading as C compilers
+++    incorrectly reject 9223372036854775807.  */
+++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
+++
++ int main()
++ {
++-  off_t offset;
++-  struct stat s;
++-  /* see if have 64-bit off_t */
++-  if (sizeof(offset) < 8)
++-    return 1;
++-  printf("  off_t is %d bytes\n", sizeof(off_t));
++-  /* see if have 64-bit stat */
++-  if (sizeof(s.st_size) < 8) {
++-    printf("  s.st_size is %d bytes\n", sizeof(s.st_size));
++-    return 2;
++-  }
++-  return 3;
+++  return 0;
++ }
++ _EOF_
++ # compile it
++@@ -434,19 +429,8 @@ $CC -o conftest conftest.c >/dev/null 2>
++ if [ $? -ne 0 ]; then
++   echo -- no Large File Support
++ else
++-# run it
++-  ./conftest
++-  r=$?
++-  if [ $r -eq 1 ]; then
++-    echo -- no Large File Support - no 64-bit off_t
++-  elif [ $r -eq 2 ]; then
++-    echo -- no Large File Support - no 64-bit stat
++-  elif [ $r -eq 3 ]; then
++-    echo -- yes we have Large File Support!
++-    CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT"
++-  else
++-    echo -- no Large File Support - conftest returned $r
++-  fi
+++  echo -- yes we have Large File Support!
+++  CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT"
++ fi
++ 
++ 
+diff --git a/tools/zip/patches/004-do-not-set-unwanted-cflags.patch b/tools/zip/patches/004-do-not-set-unwanted-cflags.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..bfd226077a9742f87a1988747a81e9226e89dfaf
+--- /dev/null
++++ b/tools/zip/patches/004-do-not-set-unwanted-cflags.patch
+@@ -0,0 +1,15 @@
++From: Santiago Vila <sanvila@debian.org>
++Subject: Do not set unwanted CFLAGS, as it breaks DEB_BUILD_OPTIONS
++X-Debian-version: 2.32-1
++
++--- a/unix/configure
+++++ b/unix/configure
++@@ -98,7 +98,7 @@ int main()
++ _EOF_
++       $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
++       if test $? -eq 0; then
++-        CFLAGS_OPT='-O3'
+++        # CFLAGS_OPT='-O3'
++         echo "  GNU C ($CFLAGS_OPT)"
++         # Special Mac OS X shared library "ld" option?
++         if test ` uname -s 2> /dev/null ` = 'Darwin'; then
+diff --git a/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch b/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..8b479faedaeedbe83d378306d386a0a88493b282
+--- /dev/null
++++ b/tools/zip/patches/006-stack-markings-to-avoid-executable-stack.patch
+@@ -0,0 +1,21 @@
++From: Kees Cook <kees@debian.org>
++Subject: put stack markings in i386 assembly to avoid executable stack
++Bug-Debian: http://bugs.debian.org/528280
++X-Debian-version: 3.0-2
++
++--- a/crc_i386.S
+++++ b/crc_i386.S
++@@ -302,3 +302,5 @@ _crc32:                         /* ulg c
++ #endif /* i386 || _i386 || _I386 || __i386 */
++ 
++ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
+++.section .note.GNU-stack, "", @progbits
+++.previous
++--- a/match.S
+++++ b/match.S
++@@ -405,3 +405,5 @@ L__return:
++ #endif /* i386 || _I386 || _i386 || __i386  */
++ 
++ #endif /* !USE_ZLIB */
+++.section .note.GNU-stack, "", @progbits
+++.previous
+diff --git a/tools/zip/patches/007-fclose-in-file-not-fclose-x.patch b/tools/zip/patches/007-fclose-in-file-not-fclose-x.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..402f90a2d5ef3d08a7d71268fe4f5e2484a10664
+--- /dev/null
++++ b/tools/zip/patches/007-fclose-in-file-not-fclose-x.patch
+@@ -0,0 +1,16 @@
++From: Christian Spieler
++Subject: zipnote.c: Close in_file instead of undefined file x
++Bug-Debian: http://bugs.debian.org/628594
++X-Debian-version: 3.0-4
++
++--- a/zipnote.c
+++++ b/zipnote.c
++@@ -661,7 +661,7 @@ char **argv;            /* command line
++     if ((r = zipcopy(z)) != ZE_OK)
++       ziperr(r, "was copying an entry");
++   }
++-  fclose(x);
+++  fclose(in_file);
++ 
++   /* Write central directory and end of central directory with new comments */
++   if ((c = zftello(y)) == (zoff_t)-1)    /* get start of central */
+diff --git a/tools/zip/patches/008-hardening-build-fix-1.patch b/tools/zip/patches/008-hardening-build-fix-1.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..a0c3a91eeec064b2305c3873a8a95669c750ea9b
+--- /dev/null
++++ b/tools/zip/patches/008-hardening-build-fix-1.patch
+@@ -0,0 +1,25 @@
++From: Santiago Vila <sanvila@debian.org>
++Subject: Use format specifier %s to print strings, not the string itself
++Bug-Debian: http://bugs.debian.org/673476
++X-Debian-version: 3.0-5
++
++--- a/zip.c
+++++ b/zip.c
++@@ -1028,7 +1028,7 @@ local void help_extended()
++ 
++   for (i = 0; i < sizeof(text)/sizeof(char *); i++)
++   {
++-    printf(text[i]);
+++    printf("%s", text[i]);
++     putchar('\n');
++   }
++ #ifdef DOS
++@@ -1225,7 +1225,7 @@ local void version_info()
++             CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE);
++   for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++)
++   {
++-    printf(cryptnote[i]);
+++    printf("%s", cryptnote[i]);
++     putchar('\n');
++   }
++   ++i;  /* crypt support means there IS at least one compilation option */
+diff --git a/tools/zip/patches/009-hardening-build-fix-2.patch b/tools/zip/patches/009-hardening-build-fix-2.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..e295ffbc641879768cc9257641fae85af327a338
+--- /dev/null
++++ b/tools/zip/patches/009-hardening-build-fix-2.patch
+@@ -0,0 +1,16 @@
++From: Santiago Vila <sanvila@debian.org>
++Subject: unix/configure: Take linking flags from the environment
++Bug-Debian: http://bugs.debian.org/673476
++X-Debian-version: 3.0-5
++
++--- a/unix/configure
+++++ b/unix/configure
++@@ -18,7 +18,7 @@ trap "rm -f conftest* core a.out; exit 1
++ 
++ CC=${1-cc}
++ CFLAGS=${2-"-I. -DUNIX"}
++-LFLAGS1=''
+++LFLAGS1=${LDFLAGS}
++ LFLAGS2=''
++ LN="ln -s"
++ 
+diff --git a/tools/zip/patches/010-remove-build-date.patch b/tools/zip/patches/010-remove-build-date.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..5fc385228a8f6bff01416748bb6c392f2e986322
+--- /dev/null
++++ b/tools/zip/patches/010-remove-build-date.patch
+@@ -0,0 +1,15 @@
++From: Santiago Vila <sanvila@debian.org>
++Subject: Remove (optional) build date to make the build reproducible
++Bug-Debian: http://bugs.debian.org/779042
++
++--- a/unix/unix.c
+++++ b/unix/unix.c
++@@ -1020,7 +1020,7 @@ void version_local()
++ 
++ 
++ /* Define the compile date string */
++-#ifdef __DATE__
+++#if 0
++ #  define COMPILE_DATE " on " __DATE__
++ #else
++ #  define COMPILE_DATE ""
+diff --git a/tools/zip/patches/011-add-option-for-reproducible-archives.patch b/tools/zip/patches/011-add-option-for-reproducible-archives.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..45b9d67e159327798535db55cd264ab9eeec6c38
+--- /dev/null
++++ b/tools/zip/patches/011-add-option-for-reproducible-archives.patch
+@@ -0,0 +1,145 @@
++From 6d659fc87451c02c8777dc33f750b16834e4c715 Mon Sep 17 00:00:00 2001
++From: Mathias Kresin <dev@kresin.me>
++Date: Sat, 12 Jan 2019 19:33:33 +0100
++Subject: [PATCH] add option for reproducible archives
++
++Add the option -mt/--mtime to pass a timestamp which is used as filedate
++for the containing files.
++
++So far, it isn't used for anything written to the extra fields,
++therefore requires the -X (eXclude eXtra file attributes) parameter to
++be effective.
++
++Signed-off-by: Mathias Kresin <dev@kresin.me>
++---
++ globals.c |  1 +
++ util.c    | 22 ++++++++++++++++++++++
++ zip.c     |  6 ++++++
++ zip.h     |  1 +
++ zipup.c   |  4 +++-
++ 5 files changed, 33 insertions(+), 1 deletion(-)
++
++--- a/globals.c
+++++ b/globals.c
++@@ -205,6 +205,7 @@ uzoff_t bytes_this_split = 0;     /* byt
++ int read_split_archive = 0;       /* 1=scanzipf_reg detected spanning signature */
++ int split_method = 0;             /* 0=no splits, 1=seekable, 2=data desc, -1=no */
++ uzoff_t split_size = 0;           /* how big each split should be */
+++time_t timestamp = -1;             /* fixed timestamp for archive content filedate */
++ int split_bell = 0;               /* when pause for next split ring bell */
++ uzoff_t bytes_prev_splits = 0;    /* total bytes written to all splits before this */
++ uzoff_t bytes_this_entry = 0;     /* bytes written for this entry across all splits */
++--- a/util.c
+++++ b/util.c
++@@ -1217,6 +1217,7 @@ int DisplayNumString(file, i)
++   return 0;
++ }
++ 
+++
++ /* Read numbers with trailing size multiplier (like 10M) and return number.
++    10/30/04 EG */
++ 
++@@ -1279,6 +1280,29 @@ uzoff_t ReadNumString( numstring )
++ }
++ 
++ 
+++uzoff_t ReadNumStringUL( numstring )
+++  char *numstring;
+++{
+++  zoff_t num = 0;
+++
+++  /* check if valid number (currently no negatives) */
+++  if (numstring == NULL) {
+++    zipwarn("Unable to read empty number in ReadNumString", "");
+++    return (uzoff_t)-1;
+++  }
+++  if (numstring[0] < '0' || numstring[0] > '9') {
+++    zipwarn("Unable to read number (must start with digit): ", numstring);
+++    return (uzoff_t)-1;
+++  }
+++  if (strlen(numstring) > 10) {
+++    zipwarn("Number too long to read (10 characters max): ", numstring);
+++    return (uzoff_t)-1;
+++  }
+++
+++  return (uzoff_t)atoll(numstring);
+++}
+++
+++
++ /* Write the number as a string with a multiplier (like 10M) to outstring.
++    Always writes no more than 3 digits followed maybe by a multiplier and
++    returns the characters written or -1 if error.
++--- a/zip.c
+++++ b/zip.c
++@@ -1942,6 +1942,7 @@ int set_filetype(out_path)
++ #ifdef UNICODE_TEST
++ #define o_sC            0x146
++ #endif
+++#define o_mt            0x255
++ 
++ 
++ /* the below is mainly from the old main command line
++@@ -2036,6 +2037,7 @@ struct option_struct far options[] = {
++     {"m",  "move",        o_NO_VALUE,       o_NOT_NEGATABLE, 'm',  "add files to archive then delete files"},
++     {"mm", "",            o_NO_VALUE,       o_NOT_NEGATABLE, o_mm, "not used"},
++     {"MM", "must-match",  o_NO_VALUE,       o_NOT_NEGATABLE, o_MM, "error if in file not matched/not readable"},
+++    {"mt", "mtime",       o_REQUIRED_VALUE, o_NOT_NEGATABLE, o_mt, "use fixed timestamp for archive content filedate"},
++     {"n",  "suffixes",    o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'n',  "suffixes to not compress: .gz:.zip"},
++     {"nw", "no-wild",     o_NO_VALUE,       o_NOT_NEGATABLE, o_nw, "no wildcards during add or update"},
++ #if defined(AMIGA) || defined(MACOS)
++@@ -2440,6 +2442,7 @@ char **argv;            /* command line
++   split_method = 0;           /* 0=no splits, 1=update LHs, 2=data descriptors */
++   split_size = 0;             /* how big each split should be */
++   split_bell = 0;             /* when pause for next split ring bell */
+++  timestamp = -1;             /* fixed timestamp for archive content filedate */
++   bytes_prev_splits = 0;      /* total bytes written to all splits before this */
++   bytes_this_entry = 0;       /* bytes written for this entry across all splits */
++   noisy_splits = 0;           /* be verbose about creating splits */
++@@ -2897,6 +2900,9 @@ char **argv;            /* command line
++           dispose = 1;  break;
++         case o_MM:  /* Exit with error if input file can't be read */
++           bad_open_is_error = 1; break;
+++        case o_mt:  /* fixed timestamp for archive content filedate */
+++          timestamp = ReadNumStringUL(value);
+++          break;
++         case 'n':   /* Don't compress files with a special suffix */
++           special = value;
++           /* special = NULL; */ /* will be set at next argument */
++--- a/zip.h
+++++ b/zip.h
++@@ -502,6 +502,7 @@ extern uzoff_t bytes_this_split; /* byte
++ extern int read_split_archive;   /* 1=scanzipf_reg detected spanning signature */
++ extern int split_method;         /* 0=no splits, 1=seekable, 2=data descs, -1=no */
++ extern uzoff_t split_size;       /* how big each split should be */
+++extern time_t timestamp;         /* fixed timestamp for archive content filedate */
++ extern int split_bell;           /* when pause for next split ring bell */
++ extern uzoff_t bytes_prev_splits; /* total bytes written to all splits before this */
++ extern uzoff_t bytes_this_entry; /* bytes written for this entry across all splits */
++@@ -789,6 +790,7 @@ char *zip_fzofft       OF((zoff_t, char
++ int DisplayNumString OF ((FILE *file, uzoff_t i));
++ int WriteNumString OF((uzoff_t num, char *outstring));
++ uzoff_t ReadNumString OF((char *numstring));
+++uzoff_t ReadNumStringUL OF((char *numstring));
++ 
++ /* returns true if abbrev is abbreviation for string */
++ int abbrevmatch OF((char *, char *, int, int));
++--- a/zipup.c
+++++ b/zipup.c
++@@ -415,7 +415,6 @@ struct zlist far *z;    /* zip entry to
++   char *tempextra = NULL;
++   char *tempcextra = NULL;
++ 
++-
++ #ifdef WINDLL
++ # ifdef ZIP64_SUPPORT
++   extern _int64 filesize64;
++@@ -441,6 +440,9 @@ struct zlist far *z;    /* zip entry to
++   if (tim == 0 || q == (zoff_t) -3)
++     return ZE_OPEN;
++ 
+++  if (timestamp > 0)
+++    tim = unix2dostime(&timestamp);
+++
++   /* q is set to -1 if the input file is a device, -2 for a volume label */
++   if (q == (zoff_t) -2) {
++      isdir = 1;

patches/openwrt/0018-firmware-utils-add-sercomm-netgear-tool.patch

@@ -0,0 +1,469 @@
+From: Ludwig Thomeczek <ledesrc@wxorx.net>
+Date: Tue, 12 Jun 2018 21:16:40 +0200
+Subject: firmware-utils: add sercomm/netgear tool
+
+This adds a tool to generate a firmware file accepted
+by Netgear or sercomm devices.
+
+They use a zip-packed rootfs with header and a custom
+checksum. The generated Image can be flashed via the
+nmrpflash tool or the webinterface of the router.
+
+Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
+
+firmware-utils/mksercommfw: fix musl build
+
+* add missing <sys/types.h> for musl
+
+Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
+
+firmware-utils/mksercommfw: fix build with clang/macOS
+
+fixes error: non-void function 'main' should return a value
+
+Fixes: FS#1770
+
+Signed-off-by: Ryan Mounce <ryan@mounce.com.au>
+
+ramips: fix image generation for mt76x8
+
+Buildbot fails to generate images for targets also generating a
+Sercomm binary with following error:
+
+Opening file: /mnt/ramdisk/koen/firmware/builds/owrt_mt76x8/build_dir/target-mipsel_24kc_musl/linux-ramips_mt76x8/tmp/openwrt-ramips-mt76x8-netgear_r6120-squashfs-factory.img.rootfs.zip
+Filesize: 3648606 .
+mksercommfw: malloc.c:2427: sysmalloc: Assertion `(old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0)' failed.
+Makefile:287: recipe for target '/mnt/ramdisk/koen/firmware/builds/owrt_mt76x8/build_dir/target-mipsel_24kc_musl/linux-ramips_mt76x8/tmp/openwrt-ramips-mt76x8-netgear_r6120-squashfs-factory.img' failed
+
+Debugging using valgrind shows stack corruption due to a buffer overflow.
+The author of the generator assumes the filename ends with "root",
+while it should be "rootfs".
+
+Fix this by accounting for the 2 missing characters which solves the build issues.
+
+More work is required to cleanup this source, which will be done later on.
+
+Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
+Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
+
+ramips: fix netgear r6120 factory image generation
+
+as indicated in commit c5bf408ed6bd "(ramips: fix image generation for mt76x8")
+more rework was needed to fix the other issues.
+
+Building on another machine, but using the same arch, showed
+the application failing again for different reasons.
+
+Fix this by completely rewriting the application, fixing following found issues:
+
+- buffer overflows, resulting in stack corruption
+- flaws in memory requirement calculations (too small, too large)
+- memory leaks
+- missing bounds checking on string handling
+- non-reproducable images, by using unitilized memory in checksum calculation
+- missing error handling, resulting in succes on specific image errors
+- endianness errors when building on BE machines
+- various minor build warnings
+- documentation did not match the code actions (header item locations)
+- allowing input to be decimal, hex or octal now
+
+Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
+
+tools: firmware-utils: mksercommfw build on Darwin
+
+asm/byteorder.h & hence __cpu_to_be32() doesn't exist on Darwin
+
+Shamelessly copy some byte swap functions from oseama.c
+
+Acked-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+
+firmware-utils: mksercommfw: overhaul image creation
+
+Move the zip compression into a build recipe. Pad the image using the
+existing build recipes as well to remove duplicate functionality
+
+Change the code to append header and footer in two steps. Allow to use a
+fixed filename as the netgear update image does.
+
+Use a fixed timestamp within the zip archive to make the images
+reproducible.
+
+Due to the changes we are now compatible to the gnu89 c standard used by
+default on the buildbots and we don't need to force a more recent
+standard anymore.
+
+Beside all changes, the footer still looks wrong in compare to the
+netgear update image.
+
+Signed-off-by: Mathias Kresin <dev@kresin.me>
+
+diff --git a/include/image-commands.mk b/include/image-commands.mk
+index 552d8db1cbacf533c12d0d8e2e5cffbe5591adb4..aec044294365bf5e964906e022d468d1a1c95fba 100644
+--- a/include/image-commands.mk
++++ b/include/image-commands.mk
+@@ -115,6 +115,16 @@ define Build/tplink-safeloader
+ 		$(if $(findstring sysupgrade,$(word 1,$(1))),-S) && mv $@.new $@ || rm -f $@
+ endef
+ 
++define Build/mksercommfw
++	-$(STAGING_DIR_HOST)/bin/mksercommfw \
++		$@ \
++		$(KERNEL_OFFSET) \
++		$(HWID) \
++		$(HWVER) \
++		$(SWVER)
++endef
++
++
+ define Build/append-dtb
+ 	cat $(KDIR)/image-$(firstword $(DEVICE_DTS)).dtb >> $@
+ endef
+@@ -152,6 +162,16 @@ define Build/gzip
+ 	@mv $@.new $@
+ endef
+ 
++define Build/zip
++	mkdir $@.tmp
++	mv $@ $@.tmp/$(1)
++
++	zip -j -X \
++		$(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \
++		$@ $@.tmp/$(if $(1),$(1),$@)
++	rm -rf $@.tmp
++endef
++
+ define Build/jffs2
+ 	rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
+ 		mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
+diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
+index bc282666d8c1a4b6ce5beabe2b492331fb48a23a..f1bf78e0713a1bc47d4ac384efdac1d08c1bd8bc 100644
+--- a/target/linux/ramips/image/mt76x8.mk
++++ b/target/linux/ramips/image/mt76x8.mk
+@@ -2,17 +2,22 @@
+ # MT76x8 Profiles
+ #
+ 
+-DEVICE_VARS += SERCOMM_KERNEL_OFFSET SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
++DEVICE_VARS += SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
+ 
+-define Build/mksercommfw
++define Build/sercom-seal
+ 	$(STAGING_DIR_HOST)/bin/mksercommfw \
+-		$@ \
+-		$(SERCOMM_KERNEL_OFFSET) \
+-		$(SERCOMM_HWID) \
+-		$(SERCOMM_HWVER) \
+-		$(SERCOMM_SWVER)
++		-i $@ \
++		-b $(SERCOMM_HWID) \
++		-r $(SERCOMM_HWVER) \
++		-v $(SERCOMM_SWVER) \
++		$(1)
+ endef
+ 
++define Build/sercom-footer
++	$(call Build/sercom-seal,-f)
++endef
++
++
+ define Device/tplink
+   TPLINK_FLASHLAYOUT :=
+   TPLINK_HWID :=
+@@ -107,14 +112,14 @@ define Device/netgear_r6120
+   IMAGE_SIZE := $(ralink_default_fw_size_16M)
+   DEVICE_TITLE := Netgear R6120
+   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+-  SERCOMM_KERNEL_OFFSET := 90000
+   SERCOMM_HWID := CGQ
+   SERCOMM_HWVER := A001
+-  SERCOMM_SWVER := 0040
++  SERCOMM_SWVER := 0x0040
+   IMAGES += factory.img
+   IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | pad-rootfs
+   IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
+-  IMAGE/factory.img := $$(IMAGE/default) | mksercommfw
++  IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \
++	sercom-footer | pad-to 128 | zip R6120.bin | sercom-seal
+ endef
+ TARGET_DEVICES += netgear_r6120
+ 
+diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
+index a6379e35eb01f1cbbe2b1ece3fc9eb20bcd68d90..ca7722163d68d028b88e4cca2f0457875e633af6 100644
+--- a/tools/firmware-utils/Makefile
++++ b/tools/firmware-utils/Makefile
+@@ -85,6 +85,7 @@ define Host/Compile
+ 	$(call cc,mkdhpimg buffalo-lib, -Wall)
+ 	$(call cc,mkdlinkfw mkdlinkfw-lib, -lz -Wall --std=gnu99)
+ 	$(call cc,dns313-header, -Wall)
++	$(call cc,mksercommfw, -Wall)
+ endef
+ 
+ define Host/Install
+diff --git a/tools/firmware-utils/src/mksercommfw.c b/tools/firmware-utils/src/mksercommfw.c
+new file mode 100644
+index 0000000000000000000000000000000000000000..f6f1d93f37970be0cdf94e71a5e1093b3e92c040
+--- /dev/null
++++ b/tools/firmware-utils/src/mksercommfw.c
+@@ -0,0 +1,261 @@
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <byteswap.h>
++#include <endian.h>
++#include <getopt.h>
++
++#if !defined(__BYTE_ORDER)
++#error "Unknown byte order"
++#endif
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++#define cpu_to_be32(x)  (x)
++#elif __BYTE_ORDER == __LITTLE_ENDIAN
++#define cpu_to_be32(x)  bswap_32(x)
++#else
++#error "Unsupported endianness"
++#endif
++
++/* #define DEBUG 1 */
++
++#ifdef DEBUG
++#define DBG(...) {printf(__VA_ARGS__); }
++#else
++#define DBG(...) {}
++#endif
++
++#define ERR(...) {printf(__VA_ARGS__); }
++
++/*
++ * Fw Header Layout for Netgear / Sercomm devices (bytes)
++ *
++ * Size : 512 bytes + zipped image size
++ *
++ * Locations:
++ * magic  : 0-6    ASCII
++ * version: 7-11   fixed
++ * hwID   : 11-44  ASCII
++ * hwVer  : 45-54  ASCII
++ * swVer  : 55-62  uint32_t in BE
++ * magic  : 63-69  ASCII
++ * ChkSum : 511    Inverse value of the full image checksum while this location is 0x00
++ */
++static const char* magic = "sErCoMm"; /* 7 */
++static const unsigned char version[4] = { 0x00, 0x01, 0x00, 0x00 };
++static const int header_sz = 512;
++static const int footer_sz = 71;
++
++static int is_header = 1;
++
++struct file_info {
++	char* file_name; /* name of the file */
++	char* file_data; /* data of the file in memory */
++	u_int32_t file_size; /* length of the file */
++};
++
++static u_int8_t getCheckSum(char* data, int len) {
++	u_int8_t new = 0;
++	int i;
++
++	if (!data) {
++		ERR("Invalid pointer provided!\n");
++		return 0;
++	}
++
++	for (i = 0; i < len; i++) {
++		new += data[i];
++	}
++
++	return new;
++}
++
++/*
++ * read file into buffer
++ * add space for header/footer
++ */
++static int copyToOutputBuf(struct file_info* finfo) {
++	FILE* fp = NULL;
++
++	int file_sz = 0;
++	int extra_sz;
++	int hdr_pos;
++	int img_pos;
++
++	if (!finfo || !finfo->file_name) {
++		ERR("Invalid pointer provided!\n");
++		return -1;
++	}
++
++	DBG("Opening file: %s\n", finfo->file_name);
++
++	if (!(fp = fopen(finfo->file_name, "rb"))) {
++		ERR("Error opening file: %s\n", finfo->file_name);
++		return -1;
++	}
++
++	/* Get filesize */
++	rewind(fp);
++	fseek(fp, 0L, SEEK_END);
++	file_sz = ftell(fp);
++	rewind(fp);
++
++	if (file_sz < 1) {
++		ERR("Error getting filesize: %s\n", finfo->file_name);
++		fclose(fp);
++		return -1;
++	}
++
++	if (is_header) {
++		extra_sz = header_sz;
++		hdr_pos = 0;
++		img_pos = header_sz;
++	} else {
++		extra_sz = footer_sz;
++		hdr_pos = file_sz;
++		img_pos = 0;
++	}
++
++	DBG("Filesize: %i\n", file_sz);
++	finfo->file_size = file_sz + extra_sz;
++
++	if (!(finfo->file_data = malloc(finfo->file_size))) {
++		ERR("Out of memory!\n");
++		fclose(fp);
++		return -1;
++	}
++
++	/* init header/footer bytes */
++	memset(finfo->file_data + hdr_pos, 0, extra_sz);
++
++	/* read file and take care of leading header if exists */
++	if (fread(finfo->file_data + img_pos, 1, file_sz, fp) != file_sz) {
++		ERR("Error reading file %s\n", finfo->file_name);
++		fclose(fp);
++		return -1;
++	}
++
++	DBG("File: read successful\n");
++	fclose(fp);
++
++	return hdr_pos;
++}
++
++static int writeFile(struct file_info* finfo) {
++	FILE* fp;
++
++	if (!finfo || !finfo->file_name) {
++		ERR("Invalid pointer provided!\n");
++		return -1;
++	}
++
++	DBG("Opening file: %s\n", finfo->file_name);
++
++	if (!(fp = fopen(finfo->file_name, "w"))) {
++		ERR("Error opening file: %s\n", finfo->file_name);
++		return -1;
++	}
++
++	DBG("Writing file: %s\n", finfo->file_name);
++
++	if (fwrite(finfo->file_data, 1, finfo->file_size, fp) != finfo->file_size) {
++		ERR("Wanted to write, but something went wrong!\n");
++		fclose(fp);
++		return -1;
++	}
++
++	fclose(fp);
++	return 0;
++}
++
++static void usage(char* argv[]) {
++	printf("Usage: %s [OPTIONS...]\n"
++	       "\n"
++	       "Options:\n"
++	       "  -f            add sercom footer (if absent, header)\n"
++	       "  -b <hwid>     use hardware id specified with <hwid> (ASCII)\n"
++	       "  -r <hwrev>    use hardware revision specified with <hwrev> (ASCII)\n"
++	       "  -v <version>  set image version to <version> (decimal, hex or octal notation)\n"
++	       "  -i <file>     input file\n"
++	       , argv[0]);
++}
++
++int main(int argc, char* argv[]) {
++	struct file_info image = { 0 };
++
++	char* hwID = NULL;
++	char* hwVer = NULL;
++	u_int32_t swVer = 0;
++	u_int8_t chkSum;
++	int hdr_offset;
++
++	while ( 1 ) {
++		int c;
++
++		c = getopt(argc, argv, "b:i:r:v:f");
++		if (c == -1)
++			break;
++
++		switch (c) {
++		case 'b':
++			hwID = optarg;
++			break;
++		case 'f':
++			is_header = 0;
++			break;
++		case 'i':
++			image.file_name = optarg;
++			break;
++		case 'r':
++			hwVer = optarg;
++			break;
++		case 'v':
++			swVer = (u_int32_t) strtol(optarg, NULL, 0);
++			swVer = cpu_to_be32(swVer);
++			break;
++		default:
++			usage(argv);
++			return EXIT_FAILURE;
++		}
++	}
++
++	if (!hwID || !hwVer || !image.file_name) {
++			usage(argv);
++			return EXIT_FAILURE;
++	}
++
++	/*
++	 * copy input to buffer, add extra space for header/footer and return
++	 * header position
++	 */
++	hdr_offset = copyToOutputBuf(&image);
++	if (hdr_offset < 0)
++		return EXIT_FAILURE;
++
++	DBG("Filling header: %s %s %2X %s\n", hwID, hwVer, swVer, magic);
++
++	strncpy(image.file_data + hdr_offset + 0, magic, 7);
++	memcpy(image.file_data + hdr_offset + 7, version, sizeof(version));
++	strncpy(image.file_data + hdr_offset + 11, hwID, 34);
++	strncpy(image.file_data + hdr_offset + 45, hwVer, 10);
++	memcpy(image.file_data + hdr_offset + 55, &swVer, sizeof(swVer));
++	strncpy(image.file_data + hdr_offset + 63, magic, 7);
++
++	/* calculate checksum and invert checksum */
++	if (is_header) {
++		chkSum = getCheckSum(image.file_data, image.file_size);
++		chkSum = (chkSum ^ 0xFF) + 1;
++		DBG("Checksum for Image: %hhX\n", chkSum);
++
++		/* write checksum to header */
++		image.file_data[511] = (char) chkSum;
++	}
++
++	/* overwrite input file */
++	if (writeFile(&image))
++		return EXIT_FAILURE;
++
++	return EXIT_SUCCESS;
++}

patches/openwrt/0019-ath10k-ct-fix-incorrect-multicast-broadcast-rate-setting.patch

@@ -0,0 +1,113 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Mon, 25 Feb 2019 20:42:28 +0100
+Subject: ath10k-ct: fix incorrect multicast/broadcast rate setting
+
+If no mcast_rate is set for the wifi-iface then there is no rate_idx (0)
+set for the bss. This can break for example 5GHz meshpoint interfaces
+because 0 maps to a CCK rate (11Mbit/s).
+
+It must also be avoided that the internal state for the rates is not synced
+with the mac80211 rates state. Otherwise, the a rate (e.g. a wifi-iface
+mcast_rate for a meshpoint interface) will be set on startup. And a short
+while after that, ath10k-ct specific code in
+ath10k_check_apply_special_rates is missing a valid rate in its own
+structures and is then recalculating a new default rate. This default rate
+is in most situations not the requested rate.
+
+Fixes: 4df3c71cd4c5 ("ath10k-ct: Update to 2018-12-11 and use version based on 4.19")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+Forwarded: https://github.com/openwrt/openwrt/pull/1862
+
+diff --git a/package/kernel/ath10k-ct/patches/979-ath10k-fix-incorrect-multicast-broadcast-rate-settin.patch b/package/kernel/ath10k-ct/patches/979-ath10k-fix-incorrect-multicast-broadcast-rate-settin.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..0e4f0565d6191a4e91eb2cfdffb25a850dd69a28
+--- /dev/null
++++ b/package/kernel/ath10k-ct/patches/979-ath10k-fix-incorrect-multicast-broadcast-rate-settin.patch
+@@ -0,0 +1,43 @@
++From: Pradeep kumar Chitrapu <pradeepc@codeaurora.org>
++Date: Mon, 10 Dec 2018 20:56:11 -0800
++Subject: ath10k: fix incorrect multicast/broadcast rate setting
++
++Invalid rate code is sent to firmware when multicast rate value of 0 is
++sent to driver indicating disabled case, causing broken mesh path.
++so fix that.
++
++Tested on QCA9984 with firmware 10.4-3.6.1-00827
++
++Fixes: cd93b83ad92 ("ath10k: support for multicast rate control")
++Co-developed-by: Zhi Chen <zhichen@codeaurora.org>
++Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
++Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++
++Origin: other, https://patchwork.kernel.org/patch/10723033/
++
++--- a/ath10k-4.13/mac.c
+++++ b/ath10k-4.13/mac.c
++@@ -6264,8 +6264,8 @@ static void ath10k_bss_info_changed(stru
++ 	struct cfg80211_chan_def def;
++ 	u32 vdev_param, pdev_param, slottime, preamble;
++ 	u16 bitrate, hw_value;
++-	u8 rate, basic_rate_idx;
++-	int rateidx, ret = 0, hw_rate_code;
+++	u8 rate, basic_rate_idx, rateidx;
+++	int ret = 0, hw_rate_code, mcast_rate;
++ 	enum nl80211_band band;
++ 	const struct ieee80211_supported_band *sband;
++ 
++@@ -6438,7 +6438,11 @@ static void ath10k_bss_info_changed(stru
++ 	if (changed & BSS_CHANGED_MCAST_RATE &&
++ 	    !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
++ 		band = def.chan->band;
++-		rateidx = vif->bss_conf.mcast_rate[band] - 1;
+++		mcast_rate = vif->bss_conf.mcast_rate[band];
+++		if (mcast_rate > 0)
+++			rateidx = mcast_rate - 1;
+++		else
+++			rateidx = ffs(vif->bss_conf.basic_rates) - 1;
++ 
++ 		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
++ 			rateidx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;
+diff --git a/package/kernel/ath10k-ct/patches/980-ath10k-commit-rates-from-mac80211.patch b/package/kernel/ath10k-ct/patches/980-ath10k-commit-rates-from-mac80211.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..6b12ba0995cdbd56f1e5dce8c5aba14e7af95c3c
+--- /dev/null
++++ b/package/kernel/ath10k-ct/patches/980-ath10k-commit-rates-from-mac80211.patch
+@@ -0,0 +1,37 @@
++From: Sven Eckelmann <sven@narfation.org>
++Date: Mon, 10 Dec 2018 20:56:11 -0800
++Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
++
++The rates from mac80211 have to be copied to the state of ath10k-ct or
++otherwise the ath10k_check_apply_special_rates function overwrites
++them again with some default values. This breaks for example the
++mcast_rate set for a wifi-iface.
++
++Signed-off-by: Sven Eckelmann <sven@narfation.org>
++
++--- a/ath10k-4.13/mac.c
+++++ b/ath10k-4.13/mac.c
++@@ -6460,6 +6460,7 @@ static void ath10k_bss_info_changed(stru
++ 			   "mac vdev %d mcast_rate %x\n",
++ 			   arvif->vdev_id, rate);
++ 
+++		arvif->mcast_rate[band] = rate;
++ 		vdev_param = ar->wmi.vdev_param->mcast_data_rate;
++ 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
++ 						vdev_param, rate);
++@@ -6468,6 +6469,7 @@ static void ath10k_bss_info_changed(stru
++ 				    "failed to set mcast rate on vdev %i: %d\n",
++ 				    arvif->vdev_id,  ret);
++ 
+++		arvif->bcast_rate[band] = rate;
++ 		vdev_param = ar->wmi.vdev_param->bcast_data_rate;
++ 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
++ 						vdev_param, rate);
++@@ -6494,6 +6496,7 @@ static void ath10k_bss_info_changed(stru
++ 			return;
++ 		}
++ 
+++		arvif->mgt_rate[def.chan->band] = hw_rate_code;
++ 		vdev_param = ar->wmi.vdev_param->mgmt_rate;
++ 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
++ 						hw_rate_code);

patches/openwrt/0020-mac80211-ath10k-fix-incorrect-multicast-broadcast-rate-setting.patch

@@ -0,0 +1,60 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Mon, 25 Feb 2019 20:42:28 +0100
+Subject: mac80211: ath10k: fix incorrect multicast/broadcast rate setting
+
+If no mcast_rate is set for the wifi-iface then there is no rate_idx (0)
+set for the bss. This breaks for example 5GHz meshpoint interfaces because
+0 maps to a CCK rate (11Mbit/s).
+
+Fixes: db90c243a0b9 ("mac80211: update to version based on 4.19-rc4")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+diff --git a/package/kernel/mac80211/patches/979-ath10k-fix-incorrect-multicast-broadcast-rate-settin.patch b/package/kernel/mac80211/patches/979-ath10k-fix-incorrect-multicast-broadcast-rate-settin.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..8695b7e094885bb479e14386a0461a25cf57603d
+--- /dev/null
++++ b/package/kernel/mac80211/patches/979-ath10k-fix-incorrect-multicast-broadcast-rate-settin.patch
+@@ -0,0 +1,43 @@
++From: Pradeep kumar Chitrapu <pradeepc@codeaurora.org>
++Date: Mon, 10 Dec 2018 20:56:11 -0800
++Subject: ath10k: fix incorrect multicast/broadcast rate setting
++
++Invalid rate code is sent to firmware when multicast rate value of 0 is
++sent to driver indicating disabled case, causing broken mesh path.
++so fix that.
++
++Tested on QCA9984 with firmware 10.4-3.6.1-00827
++
++Fixes: cd93b83ad92 ("ath10k: support for multicast rate control")
++Co-developed-by: Zhi Chen <zhichen@codeaurora.org>
++Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
++Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
++
++Origin: other, https://patchwork.kernel.org/patch/10723033/
++
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -5484,8 +5484,8 @@ static void ath10k_bss_info_changed(stru
++ 	struct cfg80211_chan_def def;
++ 	u32 vdev_param, pdev_param, slottime, preamble;
++ 	u16 bitrate, hw_value;
++-	u8 rate, basic_rate_idx;
++-	int rateidx, ret = 0, hw_rate_code;
+++	u8 rate, basic_rate_idx, rateidx;
+++	int ret = 0, hw_rate_code, mcast_rate;
++ 	enum nl80211_band band;
++ 	const struct ieee80211_supported_band *sband;
++ 
++@@ -5658,7 +5658,11 @@ static void ath10k_bss_info_changed(stru
++ 	if (changed & BSS_CHANGED_MCAST_RATE &&
++ 	    !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
++ 		band = def.chan->band;
++-		rateidx = vif->bss_conf.mcast_rate[band] - 1;
+++		mcast_rate = vif->bss_conf.mcast_rate[band];
+++		if (mcast_rate > 0)
+++			rateidx = mcast_rate - 1;
+++		else
+++			rateidx = ffs(vif->bss_conf.basic_rates) - 1;
++ 
++ 		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
++ 			rateidx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;

scripts/check_site.lua

@@ -305,6 +305,15 @@ function need_array_of(path, array, required)
 	return need_array(path, function(e) need_one_of(e, array) end, required)
 end
 
+function need_domain_name(path)
+	need_string(path)
+	need(path, function(domain_name)
+		local f = io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/domains/' .. domain_name .. '.json')
+		if not f then return false end
+		f:close()
+		return true
+	end, nil, 'be a valid domain name')
+end
 
 local check = assert(loadfile())
 

targets/ar71xx-generic

@@ -39,6 +39,9 @@ factory
 device avm-fritz-box-4020 fritz4020 fritz4020
 factory
 
+device avm-fritz-wlan-repeater-300e fritz300e
+factory
+
 device avm-fritz-wlan-repeater-450e fritz450e
 factory
 
@@ -69,14 +72,19 @@ factory
 # GL Innovations
 
 device gl-inet-6408a-v1 gl-inet-6408A-v1
+
 device gl-inet-6416a-v1 gl-inet-6416A-v1
 
-device gl-ar150 gl-ar150
+device gl.inet-gl-ar150 gl-ar150
-factory
+manifest_alias gl-ar150
-device gl-ar300m gl-ar300m
 factory
 
-device gl-ar750 gl-ar750
+device gl.inet-gl-ar300m gl-ar300m
+manifest_alias gl-ar300m
+factory
+
+device gl.inet-gl-ar750 gl-ar750
+manifest_alias gl-ar750
 packages $ATH10K_PACKAGES
 factory
 

targets/brcm2708-bcm2708

@@ -2,3 +2,4 @@
 
 device raspberry-pi rpi
 manifest_alias raspberry-pi-model-b-rev-2
+manifest_alias raspberry-pi-model-b-plus-rev-1.2

targets/ramips-mt7620

@@ -1,4 +1,5 @@
 # GL Innovations
+
 device gl-mt300a gl-mt300a
 factory
 
@@ -7,3 +8,10 @@ factory
 
 device gl-mt750 gl-mt750
 factory
+
+# Nexx
+
+device nexx-wt3020-8m wt3020-8M
+alias nexx-wt3020ad
+alias nexx-wt3020f
+alias nexx-wt3020h

targets/ramips-mt76x8

@@ -1,22 +1,28 @@
-if [ "$BROKEN" ]; then
-
 # GL.iNet
 
 device gl-mt300n-v2 gl-mt300n-v2
 factory
 
+
+# Netgear
+
+device netgear-r6120 netgear_r6120
+factory .img
+
+
 # TP-Link
 
 device tp-link-archer-c50-v3 tplink_c50-v3
 factory
 extra_image -squashfs-tftp-recovery -bootloader .bin
 
-device tp-link-tl-wr-841n-v13 tl-wr841n-v13
+device tp-link-archer-c50-v4 tplink_c50-v4
+factory
+
+device tp-link-tl-wr841n-v13 tl-wr841n-v13
 factory
 extra_image -squashfs-tftp-recovery -bootloader .bin
 
-fi
-
 
 # VoCore 2