diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index d848f777a..cc2cc2495 100755
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
+        target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be' ]
     steps:
     - uses: actions/checkout@v3
 
diff --git a/feeds/mediatek-sdk/mac80211/files/lib/wifi/mac80211.sh b/feeds/mediatek-sdk/mac80211/files/lib/wifi/mac80211.sh
index e24a2a634..36958d86c 100644
--- a/feeds/mediatek-sdk/mac80211/files/lib/wifi/mac80211.sh
+++ b/feeds/mediatek-sdk/mac80211/files/lib/wifi/mac80211.sh
@@ -146,6 +146,40 @@ check_board_phy() {
 	fi
 }
 
+is_morse_phy() {
+	local dev="$1"
+	local morse_path="/sys/class/ieee80211/${dev}/device/morse/"
+
+	if [ -d "$morse_path" ]; then
+		return 0  # This is a Morse PHY
+	else
+		return 1  # Not a Morse PHY
+	fi
+}
+
+# Set up Morse-specific wireless configuration
+setup_morse_wireless() {
+	local dev="$1"
+	local name="$2"
+
+	# Create Morse-specific wireless configuration with exact settings
+	uci -q batch <<-EOF
+		set wireless.${name}=wifi-device
+		set wireless.${name}.disabled='0'
+		set wireless.${name}.mode='ap'
+		set wireless.${name}.type='morse'
+		set wireless.${name}.path='platform/11009000.spi/spi_master/spi1/spi1.0'
+		set wireless.${name}.channel='12'
+		set wireless.${name}.hwmode='a'
+		set wireless.${name}.band='s1g'
+		set wireless.${name}.htmode='8'
+		set wireless.${name}.country='US'
+		set wireless.${name}.channels=''
+EOF
+
+	uci -q commit wireless
+}
+
 detect_mac80211() {
 	devidx=0
 	config_load wireless
@@ -158,13 +192,6 @@ detect_mac80211() {
 
 		dev="${_dev##*/}"
 
-		mode_band=""
-		channel=""
-		htmode=""
-		ht_capab=""
-
-		get_band_defaults "$dev"
-
 		path="$(iwinfo nl80211 path "$dev")"
 		macaddr="$(cat /sys/class/ieee80211/${dev}/macaddress)"
 
@@ -183,35 +210,51 @@ detect_mac80211() {
 
 		name="radio${devidx}"
 		devidx=$(($devidx + 1))
-		case "$dev" in
-			phy*)
-				if [ -n "$path" ]; then
-					dev_id="set wireless.${name}.path='$path'"
-				else
-					dev_id="set wireless.${name}.macaddr='$macaddr'"
-				fi
-				;;
-			*)
-				dev_id="set wireless.${name}.phy='$dev'"
-				;;
-		esac
 
-		uci -q batch <<-EOF
-			set wireless.${name}=wifi-device
-			set wireless.${name}.type=mac80211
-			${dev_id}
-			set wireless.${name}.channel=${channel}
-			set wireless.${name}.band=${mode_band}
-			set wireless.${name}.htmode=$htmode
-			set wireless.${name}.disabled=1
+		# Check if this is a Morse PHY
+		if is_morse_phy "$dev"; then
+			# Use dedicated Morse configuration
+			setup_morse_wireless "$dev" "$name"
+		else
+			# Standard wireless configuration for non-Morse devices
+			mode_band=""
+			channel=""
+			htmode=""
+			ht_capab=""
 
-			set wireless.default_${name}=wifi-iface
-			set wireless.default_${name}.device=${name}
-			set wireless.default_${name}.network=lan
-			set wireless.default_${name}.mode=ap
-			set wireless.default_${name}.ssid=OpenWrt
-			set wireless.default_${name}.encryption=none
+			# Get default settings for standard devices
+			get_band_defaults "$dev"
+
+			case "$dev" in
+				phy*)
+					if [ -n "$path" ]; then
+						dev_id="set wireless.${name}.path='$path'"
+					else
+						dev_id="set wireless.${name}.macaddr='$macaddr'"
+					fi
+					;;
+				*)
+					dev_id="set wireless.${name}.phy='$dev'"
+					;;
+			esac
+
+			uci -q batch <<-EOF
+				set wireless.${name}=wifi-device
+				set wireless.${name}.type=mac80211
+				${dev_id}
+				set wireless.${name}.channel=${channel}
+				set wireless.${name}.band=${mode_band}
+				set wireless.${name}.htmode=$htmode
+				set wireless.${name}.disabled=1
+
+				set wireless.default_${name}=wifi-iface
+				set wireless.default_${name}.device=${name}
+				set wireless.default_${name}.network=lan
+				set wireless.default_${name}.mode=ap
+				set wireless.default_${name}.ssid=OpenWrt
+				set wireless.default_${name}.encryption=none
 EOF
-		uci -q commit wireless
+			uci -q commit wireless
+		fi
 	done
 }
diff --git a/feeds/mediatek-sdk/mac80211/patches/subsys/999-9031-morse-mac80211-disable-robust-management-frame-without-sta-check.patch b/feeds/mediatek-sdk/mac80211/patches/subsys/999-9031-morse-mac80211-disable-robust-management-frame-without-sta-check.patch
new file mode 100644
index 000000000..526b0e178
--- /dev/null
+++ b/feeds/mediatek-sdk/mac80211/patches/subsys/999-9031-morse-mac80211-disable-robust-management-frame-without-sta-check.patch
@@ -0,0 +1,13 @@
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -4193,8 +4196,10 @@
+	case NL80211_IFTYPE_STATION:
+		if (!bssid && !sdata->u.mgd.use_4addr)
+			return false;
++#if 0
+		if (ieee80211_is_robust_mgmt_frame(skb) && !rx->sta)
+			return false;
++#endif
+		if (multicast)
+			return true;
+		return ether_addr_equal(sdata->vif.addr, hdr->addr1);
diff --git a/feeds/mediatek-sdk/mac80211/patches/subsys/999-9046-morse-mac80211_ndp_block_ack.patch b/feeds/mediatek-sdk/mac80211/patches/subsys/999-9046-morse-mac80211_ndp_block_ack.patch
new file mode 100644
index 000000000..261326137
--- /dev/null
+++ b/feeds/mediatek-sdk/mac80211/patches/subsys/999-9046-morse-mac80211_ndp_block_ack.patch
@@ -0,0 +1,443 @@
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h
+@@ -3434,6 +3434,9 @@
+ 	WLAN_ACTION_ADDBA_REQ = 0,
+ 	WLAN_ACTION_ADDBA_RESP = 1,
+ 	WLAN_ACTION_DELBA = 2,
++	WLAN_ACTION_NDP_ADDBA_REQ = 128,
++	WLAN_ACTION_NDP_ADDBA_RESP = 129,
++	WLAN_ACTION_NDP_DELBA = 130,    
+ };
+ 
+ /* BACK (block-ack) parties */
+
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -125,6 +125,13 @@
+  * via the usual ieee80211_tx_dequeue).
+  */
+ 
++ /** Morse Micro patches which add functionality that the driver needs to know about, can be
++  * signalled by adding a define here.
++  */
++
++ /** mac80211 has the capability to negotiate NDP block acknowledgements */
++ #define MORSE_MAC80211_S1G_FEATURE_NDP_BLOCKACK
++
+ struct device;
+ 
+ /**
+@@ -2437,7 +2444,10 @@
+  *
+  * @IEEE80211_HW_DETECTS_COLOR_COLLISION: HW/driver has support for BSS color
+  *	collision detection and doesn't need it in software.
+- *
++ * 
++ + @IEEE80211_HW_SUPPORTS_NDP_BLOCKACK: Hardware supports 11ah A-MPDU aggregation with NDP block
++ +  ACKs
++ +
+  * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
+  */
+ enum ieee80211_hw_flags {
+@@ -2494,6 +2504,7 @@
+ 	IEEE80211_HW_SUPPORTS_RX_DECAP_OFFLOAD,
+ 	IEEE80211_HW_SUPPORTS_CONC_MON_RX_DECAP,
+ 	IEEE80211_HW_DETECTS_COLOR_COLLISION,
++	IEEE80211_HW_SUPPORTS_NDP_BLOCKACK,
+ 
+ 	/* keep last, obviously */
+ 	NUM_IEEE80211_HW_FLAGS
+@@ -3315,7 +3326,8 @@
+  *	action is set to %IEEE80211_AMPDU_RX_START or
+  *	%IEEE80211_AMPDU_TX_OPERATIONAL
+  * @amsdu: indicates the peer's ability to receive A-MSDU within A-MPDU.
+- *	valid when the action is set to %IEEE80211_AMPDU_TX_OPERATIONAL
++ *	valid when the action is set to %IEEE80211_AMPDU_TX_OPERATIONAL 
++ * @ndp: indicates the driver has requested the session to use NDP block ACKs
+  * @timeout: BA session timeout. Valid only when the action is set to
+  *	%IEEE80211_AMPDU_RX_START
+  */
+@@ -3326,6 +3338,7 @@
+ 	u16 ssn;
+ 	u16 buf_size;
+ 	bool amsdu;
++       bool ndp;
+ 	u16 timeout;
+ };
+ 
+
+--- a/net/mac80211/agg-rx.c
++++ b/net/mac80211/agg-rx.c
+@@ -80,6 +80,8 @@
+ 	RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL);
+ 	__clear_bit(tid, sta->ampdu_mlme.agg_session_valid);
+ 
++       if (tid_rx) params.ndp = tid_rx->ndp;
++
+ 	ht_dbg(sta->sdata,
+ 	       "Rx BA session stop requested for %pM tid %u %s reason: %d\n",
+ 	       sta->sta.addr, tid,
+@@ -94,7 +96,7 @@
+ 	/* check if this is a self generated aggregation halt */
+ 	if (initiator == WLAN_BACK_RECIPIENT && tx)
+ 		ieee80211_send_delba(sta->sdata, sta->sta.addr,
+-				     tid, WLAN_BACK_RECIPIENT, reason);
++				     tid, params.ndp, WLAN_BACK_RECIPIENT, reason);
+ 
+ 	/*
+ 	 * return here in case tid_rx is not assigned - which will happen if
+@@ -214,7 +216,7 @@
+ 
+ static void ieee80211_send_addba_resp(struct sta_info *sta, u8 *da, u16 tid,
+ 				      u8 dialog_token, u16 status, u16 policy,
+-				      u16 buf_size, u16 timeout,
++				      u16 buf_size, u16 timeout, bool ndp,
+ 				      const struct ieee80211_addba_ext_ie *addbaext)
+ {
+ 	struct ieee80211_sub_if_data *sdata = sta->sdata;
+@@ -248,7 +250,8 @@
+ 
+ 	skb_put(skb, 1 + sizeof(mgmt->u.action.u.addba_resp));
+ 	mgmt->u.action.category = WLAN_CATEGORY_BACK;
+-	mgmt->u.action.u.addba_resp.action_code = WLAN_ACTION_ADDBA_RESP;
++	mgmt->u.action.u.addba_resp.action_code = ndp ?
++                       WLAN_ACTION_NDP_ADDBA_RESP : WLAN_ACTION_ADDBA_RESP;
+ 	mgmt->u.action.u.addba_resp.dialog_token = dialog_token;
+ 
+ 	capab = 0;
+@@ -273,7 +276,7 @@
+ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,
+ 				      u8 dialog_token, u16 timeout,
+ 				      u16 start_seq_num, u16 ba_policy, u16 tid,
+-				      u16 buf_size, bool tx, bool auto_seq,
++				      u16 buf_size, bool tx, bool auto_seq, bool ndp,
+ 				      const struct ieee80211_addba_ext_ie *addbaext)
+ {
+ 	struct ieee80211_local *local = sta->sdata->local;
+@@ -284,6 +287,7 @@
+ 		.tid = tid,
+ 		.amsdu = false,
+ 		.timeout = timeout,
++		.ndp = ndp,
+ 		.ssn = start_seq_num,
+ 	};
+ 	int i, ret = -EOPNOTSUPP;
+@@ -306,6 +310,12 @@
+ 		goto end;
+ 	}
+ 
++    
++       if (ndp && !ieee80211_hw_check(&local->hw, SUPPORTS_NDP_BLOCKACK)) {
++       	ht_dbg(sta->sdata, "Requested NDP BA but HW does not support it\n");
++       	goto end;
++       }
++
+ 	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
+ 		ht_dbg(sta->sdata,
+ 		       "Suspend in progress - Denying ADDBA request (%pM tid %d)\n",
+@@ -438,6 +448,7 @@
+ 	tid_agg_rx->started = false;
+ 	tid_agg_rx->reorder_buf_filtered = 0;
+ 	tid_agg_rx->tid = tid;
++       tid_agg_rx->ndp = params.ndp;
+ 	tid_agg_rx->sta = sta;
+ 	status = WLAN_STATUS_SUCCESS;
+ 
+@@ -459,20 +470,20 @@
+ 	if (tx)
+ 		ieee80211_send_addba_resp(sta, sta->sta.addr, tid,
+ 					  dialog_token, status, 1, buf_size,
+-					  timeout, addbaext);
++					  timeout, params.ndp, addbaext);
+ }
+ 
+ static void __ieee80211_start_rx_ba_session(struct sta_info *sta,
+ 					    u8 dialog_token, u16 timeout,
+ 					    u16 start_seq_num, u16 ba_policy,
+ 					    u16 tid, u16 buf_size, bool tx,
+-					    bool auto_seq,
++					    bool auto_seq, bool ndp,
+ 					    const struct ieee80211_addba_ext_ie *addbaext)
+ {
+ 	mutex_lock(&sta->ampdu_mlme.mtx);
+ 	___ieee80211_start_rx_ba_session(sta, dialog_token, timeout,
+ 					 start_seq_num, ba_policy, tid,
+-					 buf_size, tx, auto_seq, addbaext);
++					 buf_size, tx, auto_seq, ndp, addbaext);
+ 	mutex_unlock(&sta->ampdu_mlme.mtx);
+ }
+ 
+@@ -485,6 +496,7 @@
+ 	struct ieee802_11_elems *elems = NULL;
+ 	u8 dialog_token;
+ 	int ies_len;
++       bool ndp_ba;
+ 
+ 	/* extract session parameters from addba request frame */
+ 	dialog_token = mgmt->u.action.u.addba_req.dialog_token;
+@@ -496,6 +508,7 @@
+ 	ba_policy = (capab & IEEE80211_ADDBA_PARAM_POLICY_MASK) >> 1;
+ 	tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
+ 	buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;
++       ndp_ba = (mgmt->u.action.u.addba_req.action_code == WLAN_ACTION_NDP_ADDBA_REQ);
+ 
+ 	ies_len = len - offsetof(struct ieee80211_mgmt,
+ 				 u.action.u.addba_req.variable);
+@@ -508,7 +521,7 @@
+ 
+ 	__ieee80211_start_rx_ba_session(sta, dialog_token, timeout,
+ 					start_seq_num, ba_policy, tid,
+-					buf_size, true, false,
++					buf_size, true, false, ndp_ba,
+ 					elems ? elems->addba_ext_ie : NULL);
+ free:
+ 	kfree(elems);
+	
+--- a/net/mac80211/agg-tx.c
++++ b/net/mac80211/agg-tx.c
+@@ -65,7 +65,7 @@
+  */
+ 
+ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
+-					 const u8 *da, u16 tid,
++					 const u8 *da, u16 tid, bool ndp,
+ 					 u8 dialog_token, u16 start_seq_num,
+ 					 u16 agg_size, u16 timeout)
+ {
+@@ -99,7 +99,8 @@
+ 	skb_put(skb, 1 + sizeof(mgmt->u.action.u.addba_req));
+ 
+ 	mgmt->u.action.category = WLAN_CATEGORY_BACK;
+-	mgmt->u.action.u.addba_req.action_code = WLAN_ACTION_ADDBA_REQ;
++	mgmt->u.action.u.addba_req.action_code = ndp ? WLAN_ACTION_NDP_ADDBA_REQ :
++                       WLAN_ACTION_ADDBA_REQ;
+ 
+ 	mgmt->u.action.u.addba_req.dialog_token = dialog_token;
+ 	if (amsdu)
+@@ -488,7 +489,7 @@
+ 	}
+ 
+ 	/* send AddBA request */
+-	ieee80211_send_addba_request(sdata, sta->sta.addr, tid,
++	ieee80211_send_addba_request(sdata, sta->sta.addr, tid, tid_tx->ndp,
+ 				     tid_tx->dialog_token, tid_tx->ssn,
+ 				     buf_size, tid_tx->timeout);
+ 
+@@ -506,10 +507,18 @@
+ 		.tid = tid,
+ 		.buf_size = 0,
+ 		.amsdu = false,
++		.ndp = false,
+ 		.timeout = 0,
+ 	};
+ 	int ret;
+ 
++      /* If the HW supports NDP blockacks, try to negotiate. It's the drivers responsibility to
++       * clear .ndp if the conditions for NDP block acks are not met for this TID.
++       * TODO: remove driver responsibility when S1G STA caps exist in mac80211
++       */
++       if (ieee80211_hw_check(&local->hw, SUPPORTS_NDP_BLOCKACK))
++       	params.ndp = true;
++
+ 	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
+ 
+ 	/*
+@@ -532,6 +541,11 @@
+ 	params.ssn = sta->tid_seq[tid] >> 4;
+ 	ret = drv_ampdu_action(local, sdata, &params);
+ 	tid_tx->ssn = params.ssn;
++
++    
++       /* driver may clear this flag if it does not want NDP for this session */
++       tid_tx->ndp = params.ndp;
++      
+ 	if (ret == IEEE80211_AMPDU_TX_START_DELAY_ADDBA) {
+ 		return;
+ 	} else if (ret == IEEE80211_AMPDU_TX_START_IMMEDIATE) {
+@@ -769,6 +783,7 @@
+ 	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
+ 	params.buf_size = tid_tx->buf_size;
+ 	params.amsdu = tid_tx->amsdu;
++	params.ndp = tid_tx->ndp;
+ 
+ 	ht_dbg(sta->sdata, "Aggregation is on for %pM tid %d\n",
+ 	       sta->sta.addr, tid);
+@@ -950,7 +965,7 @@
+ 		ieee80211_agg_start_txq(sta, tid, false);
+ 
+ 	if (send_delba)
+-		ieee80211_send_delba(sdata, sta->sta.addr, tid,
++		ieee80211_send_delba(sdata, sta->sta.addr, tid, tid_tx->ndp,
+ 			WLAN_BACK_INITIATOR, WLAN_REASON_QSTA_NOT_USE);
+ }
+ 
+@@ -1009,6 +1024,13 @@
+ 		goto out;
+ 	}
+ 
++       if ((tid_tx->ndp && mgmt->u.action.u.addba_resp.action_code != WLAN_ACTION_NDP_ADDBA_RESP) ||
++           (!tid_tx->ndp && mgmt->u.action.u.addba_resp.action_code != WLAN_ACTION_ADDBA_RESP)) {
++            ht_dbg(sta->sdata, "wrong addBA response action code, %d ndp %d\n",
++                               mgmt->u.action.u.addba_resp.action_code, tid_tx->ndp);
++           goto out;
++       }
++
+ 	del_timer_sync(&tid_tx->addba_resp_timer);
+ 
+ 	ht_dbg(sta->sdata, "switched off addBA timer for %pM tid %d\n",
+--- a/net/mac80211/debugfs.c
++++ b/net/mac80211/debugfs.c
+@@ -543,6 +543,7 @@
+ 	FLAG(SUPPORTS_RX_DECAP_OFFLOAD),
+ 	FLAG(SUPPORTS_CONC_MON_RX_DECAP),
+ 	FLAG(DETECTS_COLOR_COLLISION),
++	FLAG(SUPPORTS_NDP_BLOCKACK),
+ #undef FLAG
+ };
+ 
+--- a/net/mac80211/ht.c
++++ b/net/mac80211/ht.c
+@@ -365,7 +365,7 @@
+ 				       sta->ampdu_mlme.tid_rx_manage_offl))
+ 			___ieee80211_start_rx_ba_session(sta, 0, 0, 0, 1, tid,
+ 							 IEEE80211_MAX_AMPDU_BUF_HT,
+-							 false, true, NULL);
++							 false, true, false, NULL);
+ 
+ 		if (test_and_clear_bit(tid + IEEE80211_NUM_TIDS,
+ 				       sta->ampdu_mlme.tid_rx_manage_offl))
+@@ -412,7 +412,7 @@
+ }
+ 
+ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
+-			  const u8 *da, u16 tid,
++			  const u8 *da, u16 tid, bool ndp,
+ 			  u16 initiator, u16 reason_code)
+ {
+ 	struct ieee80211_local *local = sdata->local;
+@@ -443,7 +443,7 @@
+ 	skb_put(skb, 1 + sizeof(mgmt->u.action.u.delba));
+ 
+ 	mgmt->u.action.category = WLAN_CATEGORY_BACK;
+-	mgmt->u.action.u.delba.action_code = WLAN_ACTION_DELBA;
++	mgmt->u.action.u.delba.action_code = ndp ? WLAN_ACTION_NDP_DELBA : WLAN_ACTION_DELBA;
+ 	params = (u16)(initiator << 11); 	/* bit 11 initiator */
+ 	params |= (u16)(tid << 12); 		/* bit 15:12 TID number */
+ 
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1902,7 +1902,7 @@
+ 				       const struct ieee80211_ht_cap *ht_cap_ie,
+ 				       struct sta_info *sta);
+ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
+-			  const u8 *da, u16 tid,
++			  const u8 *da, u16 tid, bool ndp,
+ 			  u16 initiator, u16 reason_code);
+ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
+ 			       enum ieee80211_smps_mode smps, const u8 *da,
+@@ -1919,7 +1919,7 @@
+ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,
+ 				      u8 dialog_token, u16 timeout,
+ 				      u16 start_seq_num, u16 ba_policy, u16 tid,
+-				      u16 buf_size, bool tx, bool auto_seq,
++				      u16 buf_size, bool tx, bool auto_seq, bool ndp,
+ 				      const struct ieee80211_addba_ext_ie *addbaext);
+ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta,
+ 					 enum ieee80211_agg_stop_reason reason);
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -1551,14 +1551,17 @@
+ 		if (sta) {
+ 			switch (mgmt->u.action.u.addba_req.action_code) {
+ 			case WLAN_ACTION_ADDBA_REQ:
++			case WLAN_ACTION_NDP_ADDBA_REQ:
+ 				ieee80211_process_addba_request(local, sta,
+ 								mgmt, len);
+ 				break;
+ 			case WLAN_ACTION_ADDBA_RESP:
++			case WLAN_ACTION_NDP_ADDBA_RESP:
+ 				ieee80211_process_addba_resp(local, sta,
+ 							     mgmt, len);
+ 				break;
+ 			case WLAN_ACTION_DELBA:
++			case WLAN_ACTION_NDP_DELBA:
+ 				ieee80211_process_delba(sdata, sta,
+ 							mgmt, len);
+ 				break;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -1389,7 +1389,7 @@
+ 		if (ack_policy == IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
+ 		    !test_bit(tid, rx->sta->ampdu_mlme.agg_session_valid) &&
+ 		    !test_and_set_bit(tid, rx->sta->ampdu_mlme.unexpected_agg))
+-			ieee80211_send_delba(rx->sdata, rx->sta->sta.addr, tid,
++			ieee80211_send_delba(rx->sdata, rx->sta->sta.addr, tid, false,
+ 					     WLAN_BACK_RECIPIENT,
+ 					     WLAN_REASON_QSTA_REQUIRE_SETUP);
+ 		goto dont_reorder;
+@@ -3101,7 +3101,7 @@
+ 
+ 		if (!test_bit(tid, rx->sta->ampdu_mlme.agg_session_valid) &&
+ 		    !test_and_set_bit(tid, rx->sta->ampdu_mlme.unexpected_agg))
+-			ieee80211_send_delba(rx->sdata, rx->sta->sta.addr, tid,
++			ieee80211_send_delba(rx->sdata, rx->sta->sta.addr, tid, false,
+ 					     WLAN_BACK_RECIPIENT,
+ 					     WLAN_REASON_QSTA_REQUIRE_SETUP);
+ 
+@@ -3526,16 +3526,19 @@
+ 
+ 		switch (mgmt->u.action.u.addba_req.action_code) {
+ 		case WLAN_ACTION_ADDBA_REQ:
++		case WLAN_ACTION_NDP_ADDBA_REQ:
+ 			if (len < (IEEE80211_MIN_ACTION_SIZE +
+ 				   sizeof(mgmt->u.action.u.addba_req)))
+ 				goto invalid;
+ 			break;
+ 		case WLAN_ACTION_ADDBA_RESP:
++		case WLAN_ACTION_NDP_ADDBA_RESP:
+ 			if (len < (IEEE80211_MIN_ACTION_SIZE +
+ 				   sizeof(mgmt->u.action.u.addba_resp)))
+ 				goto invalid;
+ 			break;
+ 		case WLAN_ACTION_DELBA:
++		case WLAN_ACTION_NDP_DELBA:
+ 			if (len < (IEEE80211_MIN_ACTION_SIZE +
+ 				   sizeof(mgmt->u.action.u.delba)))
+ 				goto invalid;
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -170,6 +170,7 @@
+  * @failed_bar_ssn: ssn of the last failed BAR tx attempt
+  * @bar_pending: BAR needs to be re-sent
+  * @amsdu: support A-MSDU withing A-MDPU
++ * @ndp: this session is using NDP block ACKs
+  *
+  * This structure's lifetime is managed by RCU, assignments to
+  * the array holding it must hold the aggregation mutex.
+@@ -198,6 +199,7 @@
+ 	u16 failed_bar_ssn;
+ 	bool bar_pending;
+ 	bool amsdu;
++	bool ndp;
+ 	u8 tid;
+ };
+ 
+@@ -225,6 +227,7 @@
+  *	and ssn.
+  * @removed: this session is removed (but might have been found due to RCU)
+  * @started: this session has started (head ssn or higher was received)
++ * @ndp: this session is using NDP block ACKs
+  *
+  * This structure's lifetime is managed by RCU, assignments to
+  * the array holding it must hold the aggregation mutex.
+@@ -252,7 +255,8 @@
+ 	u8 tid;
+ 	u8 auto_seq:1,
+ 	   removed:1,
+-	   started:1;
++	   started:1,
++	   ndp:1;
+ };
+ 
+ /**
diff --git a/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts
index 60cf5ec58..45305d119 100755
--- a/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts
@@ -169,7 +169,8 @@
 		compatible = "mediatek,eth-mac";
 		reg = <0>;
 		phy-mode = "sgmii";
-		phy-handle = <&phy1>;      // add phy handler
+		phy-handle = <&phy30>;
+		phy-handle2 = <&phy1>;
 		mtd-mac-address = <&factory 0x24>;
 	};
 
@@ -181,9 +182,9 @@
 		mtd-mac-address = <&factory 0x2a>;
 	};
 
-        mdio: mdio-bus {
-                #address-cells = <1>;
-                #size-cells = <0>;
+	mdio: mdio-bus {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
 		phy0: ethernet-phy@0 {
 			compatible = "ethernet-phy-id03a2.9461";
@@ -193,6 +194,16 @@
 			nvmem-cell-names = "phy-cal-data";
 		};
 
+		phy30: ethernet-phy@30 { // AN8801SB
+			compatible = "ethernet-phy-idc0ff.0421";
+			reg = <30>; //0x1e
+			phy-mode = "sgmii";
+			full-duplex;
+			pause;
+			airoha,surge = <1>;
+			airoha,polarity = <2>;
+		};
+
 		phy1: ethernet-phy@1 {
 			compatible = "ethernet-phy-id03a2.9471";
 			reg = <24>;            // set phy address to 0x18
@@ -200,9 +211,8 @@
 			reset-assert-us = <600>;
 			reset-deassert-us = <20000>;
 			phy-mode = "sgmii";
-    };
-
-        };
+		};
+	};
 };
 
 &hnat {
diff --git a/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap112.dts b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap112.dts
index e7a15ca82..d728eab55 100755
--- a/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap112.dts
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap112.dts
@@ -255,18 +255,21 @@
 &spi2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi2_pins>;
+        address-cells = <1>;
+        size-cells = <0>;
 	status = "okay";
 
-	slb9670: slb9670@0 {
-		compatible = "infineon,slb9670";
-		reg = <0>; /* CE0 */
-		#address-cells = <1>;
-		#size-cells = <0>;
-		spi-cal-enable;
-		spi-cal-mode = "read-data";
-		spi-cal-datalen = <2>;
-		spi-cal-data = /bits/ 8 <0x00 0x1b>;
-		spi-max-frequency = <40000000>;
+
+        mm6108: mm6108@0 {
+                compatible = "morse,mm610x-spi";
+                reg = <0>;
+                reset-gpios = <&pio 31 0>;
+                power-gpios = <&pio 5 0>,<&pio 0 0>;
+                spi-irq-gpios = <&pio 30 0>;
+                status = "okay";
+                spi-max-frequency = <52000000>;
+                spi-tx-bus-width = <1>;
+                spi-rx-bus-width = <1>;
 	};
 };
 
@@ -338,6 +341,18 @@
 			function = "spi";
 			groups = "spi2";
 		};
+
+                conf-pu {
+                        pins = "SPI2_CS";
+                        drive-strength = <8>;
+                        mediatek,pull-up-adv = <3>;
+                };
+
+                conf-pd {
+                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
+                        drive-strength = <8>;
+                        mediatek,pull-down-adv = <3>;
+                };
 	};
 
 	uart1_pins: uart1-pins-g1 {
diff --git a/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-emplus-wap588m.dts b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-emplus-wap588m.dts
new file mode 100644
index 000000000..407ec5b12
--- /dev/null
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-emplus-wap588m.dts
@@ -0,0 +1,349 @@
+/dts-v1/;
+#include "mt7981.dtsi"
+/ {
+	model = "Emplus WAP588M";
+	compatible = "emplus,wap588m";
+	chosen {
+		bootargs = "console=ttyS0,115200n1 loglevel=8  \
+				earlycon=uart8250,mmio32,0x11002000";
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x10000000>;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
+				};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		power {
+			label = "power";
+			gpios = <&pio 11 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "timer";
+			default-state = "on";
+
+		};
+		wifi2g {
+			label = "wifi2g";
+			gpios = <&pio 9 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "ra0";
+		};
+		wifi5g {
+			label = "wifi5g";
+			gpios = <&pio 12 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "rax0";
+		};
+		lan {
+			label = "lan";
+			gpios = <&pio 10 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "eth0";
+		};
+		wan {
+			label = "wan";
+			gpios = <&pio 13 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "eth1";
+		};
+	};
+
+	nmbm_spim_nand {
+		compatible = "generic,nmbm";
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		lower-mtd-device = <&spi_nand>;
+		forced-create;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "BL2";
+				reg = <0x00000 0x0100000>;
+				read-only;
+			};
+
+			partition@100000 {
+				label = "u-boot-env";
+				reg = <0x0100000 0x0080000>;
+			};
+
+			factory: partition@180000 {
+				label = "Factory";
+				reg = <0x180000 0x0200000>;
+			};
+
+			partition@380000 {
+				label = "FIP";
+				reg = <0x380000 0x0200000>;
+			};
+
+			partition@580000 {
+				label = "ubi"; //110MB
+				reg = <0x580000 0x3700000>;
+			};
+
+			partition@3C80000 {
+				label = "ubi_1"; //110MB
+				reg = <0x3C80000 0x3700000>;
+			};
+
+			partition@7380000 {
+				label = "cert"; //384KB
+				reg = <0x7380000 0x0060000>;
+			};
+
+			partition@73E0000 {
+				label = "userconfig"; //640KB
+				reg = <0x73E0000 0x00a0000>;
+			};
+
+			partition@7480000 {
+				label = "crashdump"; //384KB
+				reg = <0x7480000 0x0060000>;
+			};
+		};
+	};
+
+	sound_wm8960 {
+		compatible = "mediatek,mt79xx-wm8960-machine";
+		mediatek,platform = <&afe>;
+		audio-routing = "Headphone", "HP_L",
+				"Headphone", "HP_R",
+				"LINPUT1", "AMIC",
+				"RINPUT1", "AMIC";
+		mediatek,audio-codec = <&wm8960>;
+		status = "disabled";
+	};
+
+	sound_si3218x {
+		compatible = "mediatek,mt79xx-si3218x-machine";
+		mediatek,platform = <&afe>;
+		mediatek,ext-codec = <&proslic_spi>;
+		status = "disabled";
+	};
+};
+
+&afe {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcm_pins>;
+	status = "okay";
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c_pins>;
+	status = "disabled";
+
+	wm8960: wm8960@1a {
+		compatible = "wlf,wm8960";
+		reg = <0x1a>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&watchdog {
+	status = "okay";
+};
+
+&eth {
+        status = "okay";
+
+        gmac0: mac@0 {
+                compatible = "mediatek,eth-mac";
+                reg = <0>;
+                phy-mode = "sgmii";
+                phy-handle = <&phy1>;
+        };
+
+	gmac1: mac@1 {
+		compatible = "mediatek,eth-mac";
+		reg = <1>;
+		phy-mode = "gmii";
+		phy-handle = <&phy0>;
+	};
+
+        mdio: mdio-bus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+		// MT7981 internal PHY
+		phy0: ethernet-phy@0 {
+			compatible = "ethernet-phy-id03a2.9461";
+			reg = <0>;
+			phy-mode = "gmii";
+			nvmem-cells = <&phy_calibration>;
+			nvmem-cell-names = "phy-cal-data";
+		};
+
+
+		// RTL8211FS PHY
+		phy1: ethernet-phy@1 {
+			compatible = "ethernet-phy-id001c.c916";
+			reg = <1>;
+			reset-gpios = <&pio 39 GPIO_ACTIVE_LOW>;
+			reset-assert-us = <120000>;
+			reset-deassert-us = <120000>;
+			phy-mode = "sgmii";
+		};
+    };
+};
+
+&hnat {
+	mtketh-wan = "eth1";
+	mtketh-lan = "eth0";
+	mtketh-max-gmac = <2>;
+	status = "okay";
+};
+
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi0_flash_pins>;
+	status = "okay";
+	spi_nand: spi_nand@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spi-nand";
+		reg = <0>;
+		spi-max-frequency = <52000000>;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+	};
+};
+
+&spi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spic_pins>;
+	status = "okay";
+
+	proslic_spi: proslic_spi@0 {
+		compatible = "silabs,proslic_spi";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		spi-cpha = <1>;
+		spi-cpol = <1>;
+		channel_count = <1>;
+		debug_level = <4>;       /* 1 = TRC, 2 = DBG, 4 = ERR */
+		reset_gpio = <&pio 15 0>;
+		ig,enable-spi = <1>;     /* 1: Enable, 0: Disable */
+	};
+};
+
+&wbsys {
+	mediatek,mtd-eeprom = <&factory 0x0000>;
+	status = "okay";
+	pinctrl-names = "dbdc";
+	pinctrl-0 = <&wf_dbdc_pins>;
+};
+
+&pio {
+
+	i2c_pins: i2c-pins-g0 {
+                mux {
+                        function = "i2c";
+                        groups = "i2c0_0";
+                };
+        };
+
+        pcm_pins: pcm-pins-g0 {
+                mux {
+                        function = "pcm";
+                        groups = "pcm";
+                };
+        };
+
+        pwm0_pin: pwm0-pin-g0 {
+                mux {
+                        function = "pwm";
+                        groups = "pwm0_0";
+                };
+        };
+
+        pwm1_pin: pwm1-pin-g0 {
+                mux {
+                        function = "pwm";
+                        groups = "pwm1_0";
+                };
+        };
+
+        pwm2_pin: pwm2-pin {
+                mux {
+                        function = "pwm";
+                        groups = "pwm2";
+                };
+        };
+
+	spi0_flash_pins: spi0-pins {
+		mux {
+			function = "spi";
+			groups = "spi0", "spi0_wp_hold";
+		};
+
+		conf-pu {
+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
+			drive-strength = <MTK_DRIVE_8mA>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
+		};
+
+		conf-pd {
+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
+			drive-strength = <MTK_DRIVE_8mA>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
+		};
+	};
+
+	spic_pins: spi1-pins {
+		mux {
+			function = "spi";
+			groups = "spi1_1";
+		};
+	};
+
+	uart1_pins: uart1-pins-g1 {
+                mux {
+                        function = "uart";
+                        groups = "uart1_1";
+                };
+        };
+
+	uart2_pins: uart2-pins-g1 {
+		mux {
+                        function = "uart";
+                        groups = "uart2_1";
+                };
+        };
+	wf_dbdc_pins: wf_dbdc-pins {
+		mux {
+			function = "eth";
+			groups = "wf0_mode1";
+		};
+		conf {
+			pins = "WF_HB1", "WF_HB2", "WF_HB3", "WF_HB4",
+			       "WF_HB0", "WF_HB0_B", "WF_HB5", "WF_HB6",
+			       "WF_HB7", "WF_HB8", "WF_HB9", "WF_HB10",
+			       "WF_TOP_CLK", "WF_TOP_DATA", "WF_XO_REQ",
+			       "WF_CBA_RESETB", "WF_DIG_RESETB";
+			drive-strength = <MTK_DRIVE_4mA>;
+		};
+	};
+};
+
+&xhci {
+	mediatek,u3p-dis-msk = <0x0>;
+	phys = <&u2port0 PHY_TYPE_USB2>,
+	       <&u3port0 PHY_TYPE_USB3>;
+	status = "disabled";
+};
diff --git a/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.c b/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.c
index a366d23bf..3089a1012 100644
--- a/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.c
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.c
@@ -113,7 +113,6 @@ static const struct AIR_LED_CFG_T led_cfg_dlt[MAX_LED_SIZE] = {
 	/* LED2 */
 	{LED_ENABLE, AIR_LED_GPIO9, AIR_ACTIVE_LOW,  AIR_LED2_ON, AIR_LED2_BLK},
 };
-
 static const u16 led_blink_cfg_dlt = AIR_LED_BLK_DUR_64M;
 /* RGMII delay */
 static const u8 rxdelay_force = FALSE;
@@ -140,7 +139,6 @@ static int __air_buckpbus_reg_write(struct phy_device *phydev, u32 addr,
 	err |= mbus->write(mbus, phy_addr, 0x13, (u16)(data >> 16));
 	err |= mbus->write(mbus, phy_addr, 0x14, (u16)(data & 0xffff));
 	err |= mbus->write(mbus, phy_addr, 0x1F, 0);
-
 	return err;
 }
 
@@ -167,6 +165,41 @@ static u32 __air_buckpbus_reg_read(struct phy_device *phydev, u32 addr)
 	return data;
 }
 
+static u32 __air_buckpbus_reg_modify(struct phy_device *phydev, u32 addr,
+					u32 mask, u32 set)
+{
+	int err = 0;
+	u32 data_h, data_l, data_old, data_new;
+	int phy_addr = phydev_phy_addr(phydev);
+	struct mii_bus *mbus = phydev_mdiobus(phydev);
+
+	err = mbus->write(mbus, phy_addr, 0x1F, 4);
+	err |= mbus->write(mbus, phy_addr, 0x10, 0);
+	err |= mbus->write(mbus, phy_addr, 0x15, (u16)(addr >> 16));
+	err |= mbus->write(mbus, phy_addr, 0x16, (u16)(addr & 0xffff));
+	data_h = mbus->read(mbus, phy_addr, 0x17);
+	data_l = mbus->read(mbus, phy_addr, 0x18);
+	if (err < 0) {
+		mbus->write(mbus, phy_addr, 0x1F, 0);
+		return INVALID_DATA;
+	}
+
+	data_old = ((data_h & 0xffff) << 16) | (data_l & 0xffff);
+	data_new = (data_old & ~mask) | set;
+	if (data_new == data_old) {
+		mbus->write(mbus, phy_addr, 0x1F, 0);
+		return 0;
+	}
+
+	err |= mbus->write(mbus, phy_addr, 0x11, (u16)(addr >> 16));
+	err |= mbus->write(mbus, phy_addr, 0x12, (u16)(addr & 0xffff));
+	err |= mbus->write(mbus, phy_addr, 0x13, (u16)(data_new >> 16));
+	err |= mbus->write(mbus, phy_addr, 0x14, (u16)(data_new & 0xffff));
+	err |= mbus->write(mbus, phy_addr, 0x1F, 0);
+
+	return err;
+}
+
 static int air_buckpbus_reg_write(struct phy_device *phydev, u32 addr, u32 data)
 {
 	int err = 0;
@@ -189,82 +222,18 @@ static u32 air_buckpbus_reg_read(struct phy_device *phydev, u32 addr)
 	return data;
 }
 
-static int __an8801_cl45_write(struct phy_device *phydev, int devad, u16 reg,
-				u16 val)
-{
-	u32 addr = (AN8801_EPHY_ADDR | AN8801_CL22 | (devad << 18) |
-				(reg << 2));
-
-	return __air_buckpbus_reg_write(phydev, addr, val);
-}
-
-static int __an8801_cl45_read(struct phy_device *phydev, int devad, u16 reg)
-{
-	u32 addr = (AN8801_EPHY_ADDR | AN8801_CL22 | (devad << 18) |
-				(reg << 2));
-
-	return __air_buckpbus_reg_read(phydev, addr);
-}
-
-int __an8801_modify_cl45_changed(struct phy_device *phydev, int devad, u32 regnum,
-				u16 mask, u16 set)
-{
-	int new, ret;
-
-	ret = __an8801_cl45_read(phydev, devad, regnum);
-	if (ret < 0)
-		return ret;
-
-	new = (ret & ~mask) | set;
-	if (new == ret)
-		return 0;
-
-	ret = __an8801_cl45_write(phydev, devad, regnum, new);
-
-	return ret < 0 ? ret : 1;
-}
-
-static int an8801_modify_cl45_changed(struct phy_device *phydev, int devad,
-				u32 regnum, u16 mask, u16 set)
+static int air_buckpbus_reg_modify(struct phy_device *phydev, u32 addr,
+					u32 mask, u32 set)
 {
 	int err = 0;
 
 	mdiobus_lock(phydev);
-	err = __an8801_modify_cl45_changed(phydev, devad, regnum, mask, set);
+	err = __air_buckpbus_reg_modify(phydev, addr, mask, set);
 	mdiobus_unlock(phydev);
 
 	return err;
 }
 
-static int an8801_cl45_write(struct phy_device *phydev, int devad, u16 reg,
-			      u16 val)
-{
-	int err = 0;
-
-	mdiobus_lock(phydev);
-	err = __an8801_cl45_write(phydev, devad, reg, val);
-	mdiobus_unlock(phydev);
-
-	return err;
-}
-
-static int an8801_cl45_read(struct phy_device *phydev, int devad, u16 reg,
-			     u16 *read_data)
-{
-	int data = 0;
-
-	mdiobus_lock(phydev);
-	data = __an8801_cl45_read(phydev, devad, reg);
-	mdiobus_unlock(phydev);
-
-	if (data == INVALID_DATA)
-		return -EINVAL;
-
-	*read_data = data;
-
-	return 0;
-}
-
 static int air_sw_reset(struct phy_device *phydev)
 {
 	u32 reg_value;
@@ -298,50 +267,36 @@ static int an8801_led_set_usr_def(struct phy_device *phydev, u8 entity,
 
 	on_evt |= LED_ON_EN;
 
-	err = an8801_cl45_write(phydev, 0x1f, LED_ON_CTRL(entity), on_evt);
+	err = phy_write_mmd(phydev, 0x1f, LED_ON_CTRL(entity), on_evt);
 	if (err)
 		return -1;
 
-	return an8801_cl45_write(phydev, 0x1f, LED_BLK_CTRL(entity), blk_evt);
+	return phy_write_mmd(phydev, 0x1f, LED_BLK_CTRL(entity), blk_evt);
 }
 
 static int an8801_led_set_mode(struct phy_device *phydev, u8 mode)
 {
-	int err;
-	u16 data;
-
-	err = an8801_cl45_read(phydev, 0x1f, LED_BCR, &data);
-	if (err)
-		return -1;
-
 	switch (mode) {
 	case AIR_LED_MODE_DISABLE:
-		data &= ~LED_BCR_EXT_CTRL;
-		data &= ~LED_BCR_MODE_MASK;
-		data |= LED_BCR_MODE_DISABLE;
-		break;
+		return phy_modify_mmd(phydev, 0x1f, LED_BCR,
+						(LED_BCR_EXT_CTRL | LED_BCR_CLK_EN),
+						0x0);
 	case AIR_LED_MODE_USER_DEFINE:
-		data |= (LED_BCR_EXT_CTRL | LED_BCR_CLK_EN);
+		return phy_modify_mmd(phydev, 0x1f, LED_BCR,
+						(LED_BCR_EXT_CTRL | LED_BCR_CLK_EN),
+						(LED_BCR_EXT_CTRL | LED_BCR_CLK_EN));
+	default:
 		break;
 	}
-	return an8801_cl45_write(phydev, 0x1f, LED_BCR, data);
+	dev_err(phydev_dev(phydev),
+				"LED mode %d is not supported\n", mode);
+	return -EINVAL;
 }
 
 static int an8801_led_set_state(struct phy_device *phydev, u8 entity, u8 state)
 {
-	u16 data;
-	int err;
-
-	err = an8801_cl45_read(phydev, 0x1f, LED_ON_CTRL(entity), &data);
-	if (err)
-		return err;
-
-	if (state)
-		data |= LED_ON_EN;
-	else
-		data &= ~LED_ON_EN;
-
-	return an8801_cl45_write(phydev, 0x1f, LED_ON_CTRL(entity), data);
+	return phy_modify_mmd(phydev, 0x1f, LED_ON_CTRL(entity), LED_ON_EN,
+					(state) ? LED_ON_EN : 0x0);
 }
 
 static int an8801_led_init(struct phy_device *phydev)
@@ -352,12 +307,12 @@ static int an8801_led_init(struct phy_device *phydev)
 	u32 data;
 	u16 led_blink_cfg = priv->led_blink_cfg;
 
-	ret = an8801_cl45_write(phydev, 0x1f, LED_BLK_DUR,
+	ret = phy_write_mmd(phydev, 0x1f, LED_BLK_DUR,
 				 LED_BLINK_DURATION(led_blink_cfg));
 	if (ret < 0)
 		return ret;
 
-	ret = an8801_cl45_write(phydev, 0x1f, LED_ON_DUR,
+	ret = phy_write_mmd(phydev, 0x1f, LED_ON_DUR,
 				 (LED_BLINK_DURATION(led_blink_cfg) >> 1));
 	if (ret < 0)
 		return ret;
@@ -406,6 +361,56 @@ static int an8801_led_init(struct phy_device *phydev)
 	return 0;
 }
 
+static int an8801_ack_interrupt(struct phy_device *phydev)
+{
+	u32 reg_val = 0;
+
+	air_buckpbus_reg_write(phydev, 0x10285404, 0x102);
+	reg_val = air_buckpbus_reg_read(phydev, 0x10285400);
+	air_buckpbus_reg_write(phydev, 0x10285400, 0x0);
+	air_buckpbus_reg_write(phydev, 0x10285400, reg_val | 0x10);
+	air_buckpbus_reg_write(phydev, 0x10285404, 0x12);
+	air_buckpbus_reg_write(phydev, 0x10285704, 0x1f);
+	return 0;
+}
+
+static int an8801_config_intr(struct phy_device *phydev)
+{
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+		air_buckpbus_reg_write(phydev, 0x1000007c, BIT(AIR_INTERRUPT_GPIO) << 16);
+		air_buckpbus_reg_modify(phydev, 0x10285700, 0x1, 0x1);
+	} else {
+		air_buckpbus_reg_write(phydev, 0x1000007c, 0x0);
+		air_buckpbus_reg_modify(phydev, 0x10285700, 0x1, 0x0);
+	}
+	an8801_ack_interrupt(phydev);
+	return 0;
+}
+
+static int an8801_did_interrupt(struct phy_device *phydev)
+{
+	u32 reg_val = 0;
+
+	reg_val = air_buckpbus_reg_read(phydev, 0x10285704);
+
+	if (reg_val & 0x11)
+		return 1;
+
+	return 0;
+}
+
+#if (KERNEL_VERSION(5, 11, 0) < LINUX_VERSION_CODE)
+static irqreturn_t an8801_handle_interrupt(struct phy_device *phydev)
+{
+	if (!an8801_did_interrupt(phydev))
+		return IRQ_NONE;
+
+	an8801_ack_interrupt(phydev);
+	phy_trigger_machine(phydev);
+	return IRQ_HANDLED;
+}
+#endif
+
 static int findClosestNumber(const u16 *arr, u16 size, u16 target)
 {
 	int left = 0, right = size - 1;
@@ -431,77 +436,77 @@ static int findClosestNumber(const u16 *arr, u16 size, u16 target)
 static int an8801sb_i2mpb_config(struct phy_device *phydev)
 {
 	int ret = 0;
-	u16 cl45_value = 0, temp_cl45 = 0, set = 0;
+	u16 cl45_value = 0, temp_cl45 = 0;
 	u16 mask = 0;
 
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x12, &cl45_value);
+	cl45_value = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x12);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, cl45_value);
 	cl45_value = (cl45_value & GENMASK(15, 10)) + (6 << 10);
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x12, GENMASK(15, 10), cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x12, GENMASK(15, 10), cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x16, &temp_cl45);
+	temp_cl45 = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x16);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, temp_cl45);
 	mask = GENMASK(15, 10) | GENMASK(5, 0);
 	cl45_value = (temp_cl45 & GENMASK(15, 10)) + (9 << 10);
 	cl45_value = ((temp_cl45 & GENMASK(5, 0)) + 6) | cl45_value;
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x16, mask, cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x16, mask, cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x17, &cl45_value);
+	cl45_value = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x17);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, cl45_value);
 	cl45_value = (cl45_value & GENMASK(13, 8)) + (6 << 8);
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x17, GENMASK(13, 8), cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x17, GENMASK(13, 8), cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x18, &temp_cl45);
+	temp_cl45 = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x18);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, temp_cl45);
 	mask = GENMASK(13, 8) | GENMASK(5, 0);
 	cl45_value = (temp_cl45 & GENMASK(13, 8)) + (9 << 8);
 	cl45_value = ((temp_cl45 & GENMASK(5, 0)) + 6) | cl45_value;
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x18, mask, cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x18, mask, cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x19, &cl45_value);
+	cl45_value = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x19);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, cl45_value);
 	cl45_value = (cl45_value & GENMASK(13, 8)) + (6 << 8);
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x19, GENMASK(13, 8), cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x19, GENMASK(13, 8), cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x20, &cl45_value);
+	cl45_value = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x20);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, cl45_value);
 	cl45_value = (cl45_value & GENMASK(5, 0)) + 6;
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x20, GENMASK(5, 0), cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x20, GENMASK(5, 0), cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x21, &cl45_value);
+	cl45_value = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x21);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, cl45_value);
 	cl45_value = (cl45_value & GENMASK(13, 8)) + (6 << 8);
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x21, GENMASK(13, 8), cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x21, GENMASK(13, 8), cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_read(phydev, MMD_DEV_VSPEC1, 0x22, &cl45_value);
+	cl45_value = phy_read_mmd(phydev, MMD_DEV_VSPEC1, 0x22);
 	dev_dbg(phydev_dev(phydev), "%s:%d cl45_value 0x%x!\n", __func__, __LINE__, cl45_value);
 	cl45_value = (cl45_value & GENMASK(5, 0)) + 6;
-	ret = an8801_modify_cl45_changed(phydev, MMD_DEV_VSPEC1, 0x22, GENMASK(5, 0), cl45_value);
+	ret = phy_modify_mmd(phydev, MMD_DEV_VSPEC1, 0x22, GENMASK(5, 0), cl45_value);
 	if (ret < 0)
 		return ret;
-	ret = an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x23, 0x883);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x24, 0x883);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x25, 0x883);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x26, 0x883);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x0, 0x100);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x1, 0x1bc);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x2, 0x1d0);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x3, 0x186);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x4, 0x202);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x5, 0x20e);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x6, 0x300);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x7, 0x3c0);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x8, 0x3d0);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0x9, 0x317);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0xa, 0x206);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC1, 0xb, 0xe);
+	ret = phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x23, 0x883);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x24, 0x883);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x25, 0x883);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x26, 0x883);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x0, 0x100);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x1, 0x1bc);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x2, 0x1d0);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x3, 0x186);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x4, 0x202);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x5, 0x20e);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x6, 0x300);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x7, 0x3c0);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x8, 0x3d0);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0x9, 0x317);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0xa, 0x206);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC1, 0xb, 0xe);
 	if (ret < 0)
 		return ret;
 
@@ -510,14 +515,14 @@ static int an8801sb_i2mpb_config(struct phy_device *phydev)
 }
 
 void update_r50_value(struct phy_device *phydev,
-			u16 *cl45_value, int pos1, int pos2)
+	u16 *cl45_value, int pos1, int pos2)
 {
 	*cl45_value &= ~(0x007f << 8);
 	*cl45_value |= ((r50ohm_table[pos1]) & 0x007f) << 8;
 	*cl45_value &= ~(0x007f);
 	*cl45_value |= (r50ohm_table[pos2]) & 0x007f;
 	dev_dbg(phydev_dev(phydev), "Read: r50ohm_tx_1=%d r50ohm_tx_2=%d\n",
-			r50ohm_table[pos1], r50ohm_table[pos2]);
+		r50ohm_table[pos1], r50ohm_table[pos2]);
 }
 
 int calculate_position(int pos, int shift, int table_size)
@@ -529,7 +534,7 @@ int calculate_position(int pos, int shift, int table_size)
 }
 
 int process_r50(struct phy_device *phydev, int reg,
-			u16 *cl45_value, u16 *r50ohm_tx_a, u16 *r50ohm_tx_b)
+	u16 *cl45_value, u16 *r50ohm_tx_a, u16 *r50ohm_tx_b)
 {
 	int pos1 = findClosestNumber(r50ohm_table, r50ohm_table_size, *r50ohm_tx_a);
 	int pos2 = findClosestNumber(r50ohm_table, r50ohm_table_size, *r50ohm_tx_b);
@@ -539,7 +544,7 @@ int process_r50(struct phy_device *phydev, int reg,
 		pos2 = calculate_position(pos2, R50_SHIFT, r50ohm_table_size);
 
 		update_r50_value(phydev, cl45_value, pos1, pos2);
-		return an8801_cl45_write(phydev, 0x1e, reg, *cl45_value);
+		return phy_write_mmd(phydev, 0x1e, reg, *cl45_value);
 	}
 	return 0;
 }
@@ -558,10 +563,10 @@ static int an8801r_of_init(struct phy_device *phydev)
 			return -1;
 		}
 		if (val < AIR_RGMII_DELAY_NOSTEP ||
-		    val > AIR_RGMII_DELAY_STEP_7) {
+			val > AIR_RGMII_DELAY_STEP_7) {
 			dev_err(phydev_dev(phydev),
-				   "airoha,rxclk-delay value %u out of range.",
-				   val);
+					"airoha,rxclk-delay value %u out of range.",
+					val);
 			return -1;
 		}
 		priv->rxdelay_force = TRUE;
@@ -574,14 +579,14 @@ static int an8801r_of_init(struct phy_device *phydev)
 		if (of_property_read_u32(of_node, "airoha,txclk-delay",
 					 &val) != 0) {
 			dev_err(phydev_dev(phydev),
-				   "airoha,txclk-delay value is invalid.");
+					"airoha,txclk-delay value is invalid.");
 			return -1;
 		}
 		if (val < AIR_RGMII_DELAY_NOSTEP ||
-		    val > AIR_RGMII_DELAY_STEP_7) {
+			val > AIR_RGMII_DELAY_STEP_7) {
 			dev_err(phydev_dev(phydev),
-				   "airoha,txclk-delay value %u out of range.",
-				   val);
+					"airoha,txclk-delay value %u out of range.",
+					val);
 			return -1;
 		}
 		priv->txdelay_force = TRUE;
@@ -603,10 +608,10 @@ static int an8801sb_of_init(struct phy_device *phydev)
 			return -1;
 		}
 		if (val < AIR_POL_TX_NOR_RX_REV ||
-		    val > AIR_POL_TX_REV_RX_NOR) {
+			val > AIR_POL_TX_REV_RX_NOR) {
 			dev_err(phydev_dev(phydev),
-				   "airoha,polarity value %u out of range.",
-				   val);
+					"airoha,polarity value %u out of range.",
+					val);
 			return -1;
 		}
 		priv->pol = val;
@@ -615,15 +620,15 @@ static int an8801sb_of_init(struct phy_device *phydev)
 
 	if (of_find_property(of_node, "airoha,surge", NULL)) {
 		if (of_property_read_u32(of_node, "airoha,surge",
-					&val) != 0) {
+					 &val) != 0) {
 			dev_err(phydev_dev(phydev), "airoha,surge value is invalid.");
 			return -1;
 		}
 		if (val < AIR_SURGE_0R ||
 			val > AIR_SURGE_5R) {
 			dev_err(phydev_dev(phydev),
-				"airoha,surge value %u out of range.",
-				val);
+					"airoha,surge value %u out of range.",
+					val);
 			return -1;
 		}
 		priv->surge = val;
@@ -693,23 +698,19 @@ int an8801sb_surge_protect_cfg(struct phy_device *phydev)
 	u16 cl45_value = 0;
 
 	if (priv->surge) {
-		ret = an8801_cl45_read(phydev, 0x1e, 0x174, &cl45_value);
-		if (ret < 0)
-			return ret;
+		cl45_value = phy_read_mmd(phydev, 0x1e, 0x174);
 		r50ohm_tx_a = (cl45_value >> 8) & 0x007f;
 		r50ohm_tx_b = cl45_value & 0x007f;
 		dev_dbg(phydev_dev(phydev), "Read: (0x174) value=0x%04x r50ohm_tx_a=%d r50ohm_tx_b=%d\n",
-		cl45_value, r50ohm_tx_a, r50ohm_tx_b);
+			cl45_value, r50ohm_tx_a, r50ohm_tx_b);
 		ret = process_r50(phydev, 0x174, &cl45_value, &r50ohm_tx_a, &r50ohm_tx_b);
 		if (ret < 0)
 			return ret;
-		ret = an8801_cl45_read(phydev, 0x1e, 0x175, &cl45_value);
-		if (ret < 0)
-			return ret;
+		cl45_value = phy_read_mmd(phydev, 0x1e, 0x175);
 		r50ohm_tx_c = (cl45_value >> 8) & 0x007f;
 		r50ohm_tx_d = cl45_value & 0x007f;
 		dev_dbg(phydev_dev(phydev), "Read: (0x175) value=0x%04x r50ohm_tx_c=%d r50ohm_tx_d=%d\n",
-		cl45_value, r50ohm_tx_c, r50ohm_tx_d);
+			cl45_value, r50ohm_tx_c, r50ohm_tx_d);
 		ret = process_r50(phydev, 0x175, &cl45_value, &r50ohm_tx_c, &r50ohm_tx_d);
 		if (ret < 0)
 			return ret;
@@ -764,10 +765,10 @@ static int an8801sb_config_init(struct phy_device *phydev)
 	dev_info(phydev_dev(phydev),
 		"Tx, Rx Polarity : %08x\n", pbus_value);
 
-	ret = an8801_cl45_write(phydev, MMD_DEV_VSPEC2, 0x600, 0x1e);
-	ret |= an8801_cl45_write(phydev, MMD_DEV_VSPEC2, 0x601, 0x02);
+	ret = phy_write_mmd(phydev, MMD_DEV_VSPEC2, 0x600, 0x1e);
+	ret |= phy_write_mmd(phydev, MMD_DEV_VSPEC2, 0x601, 0x02);
 
-	ret |= an8801_cl45_write(phydev, 7, 60, 0x0);
+	ret |= phy_write_mmd(phydev, 7, 60, 0x0);
 	if (ret != 0) {
 		dev_err(phydev_dev(phydev),
 			"AN8801SB initialize fail, ret %d !\n", ret);
@@ -940,7 +941,7 @@ static ssize_t an8801_polarity_write(struct file *file, const char __user *ptr,
 }
 
 static ssize_t an8801_mdio_write(struct file *file, const char __user *ptr,
-				size_t len, loff_t *off)
+					size_t len, loff_t *off)
 {
 	struct phy_device *phydev = file->private_data;
 	char buf[64], param1[32], param2[32];
@@ -955,7 +956,7 @@ static ssize_t an8801_mdio_write(struct file *file, const char __user *ptr,
 	if (count > sizeof(buf) - 1)
 		return -EINVAL;
 	if (copy_from_user(buf, ptr, len))
-	return -EFAULT;
+		return -EFAULT;
 
 	ret = sscanf(buf, "%s %s", param1, param2);
 	if (ret < 0)
@@ -991,16 +992,16 @@ static ssize_t an8801_mdio_write(struct file *file, const char __user *ptr,
 			pr_notice("\nphy=0x%x, devad=0x%x, reg=0x%x, val=0x%x\n",
 				phydev_phy_addr(phydev), devad, reg, val);
 
-			ret = an8801_cl45_write(phydev, devad, reg, val);
+			ret = phy_write_mmd(phydev, devad, reg, val);
 			if (ret < 0)
 				return ret;
-			an8801_cl45_read(phydev, devad, reg, &reg_val);
+			reg_val = phy_read_mmd(phydev, devad, reg);
 			pr_notice("\nphy=0x%x, devad=0x%x, reg=0x%x, val=0x%x confirm..\n",
 				phydev_phy_addr(phydev), devad, reg, reg_val);
 		} else if (!strncmp("r", param2, strlen("r"))) {
 			if (sscanf(buf, "cl45 r %x %x", &devad, &reg) == -1)
 				return -EFAULT;
-			an8801_cl45_read(phydev, devad, reg, &reg_val);
+			reg_val = phy_read_mmd(phydev, devad, reg);
 			pr_notice("\nphy=0x%x, devad=0x%x, reg=0x%x, val=0x%x\n",
 				phydev_phy_addr(phydev), devad, reg, reg_val);
 		} else {
@@ -1020,7 +1021,6 @@ static int an8801_counter_show(struct seq_file *seq, void *v)
 	struct phy_device *phydev = seq->private;
 	int ret = 0;
 	u32 pkt_cnt = 0;
-	struct mii_bus *mbus = phydev_mdiobus(phydev);
 
 	seq_puts(seq, "==========AIR PHY COUNTER==========\n");
 	seq_puts(seq, "|\t<<SERDES COUNTER>>\n");
@@ -1143,8 +1143,9 @@ static ssize_t an8801_debugfs_pbus(struct file *file,
 	if (buf[0] == 'w') {
 		if (sscanf(buf, "w %x %x", &reg, &val) == -1)
 			return -EFAULT;
+
 		pr_notice("\nphy=0x%x, reg=0x%x, val=0x%x\n",
-			phydev_phy_addr(phydev), reg, val);
+				phydev_phy_addr(phydev), reg, val);
 
 		ret = air_buckpbus_reg_write(phydev, reg, val);
 		if (ret < 0)
@@ -1188,10 +1189,9 @@ int an8801_info_show(struct seq_file *seq, void *v)
 	for (reg = MII_BMCR; reg <= MII_STAT1000; reg++) {
 		if ((reg <= MII_LPA) || (reg >= MII_CTRL1000))
 			seq_printf(seq, "| RG_MII 0x%02x     : 0x%08x\n",
-			reg, phy_read(phydev, reg));
+				reg, phy_read(phydev, reg));
 	}
 	seq_puts(seq, "\n");
-
 	return 0;
 }
 
@@ -1231,10 +1231,10 @@ static const struct file_operations an8801_polarity_fops = {
 };
 
 static const struct file_operations an8801_mdio_fops = {
-   .owner = THIS_MODULE,
-   .open = simple_open,
-   .write = an8801_mdio_write,
-   .llseek = noop_llseek,
+	.owner = THIS_MODULE,
+	.open = simple_open,
+	.write = an8801_mdio_write,
+	.llseek = noop_llseek,
 };
 
 int an8801_debugfs_init(struct phy_device *phydev)
@@ -1354,13 +1354,22 @@ static int an8801sb_read_status(struct phy_device *phydev)
 	if (phydev->link == LINK_DOWN) {
 		prespeed = 0;
 		phydev->speed = 0;
-		ret |= an8801_cl45_write(
+		ret |= phy_write_mmd(
 			phydev, MMD_DEV_VSPEC2, PHY_PRE_SPEED_REG, prespeed);
+
+		mdelay(10);        /* delay 10 ms */
+		reg_value = air_buckpbus_reg_read(phydev, 0x10220010);
+		reg_value &= 0x7fff;
+		air_buckpbus_reg_write(phydev, 0x10220010, reg_value);
+
+		reg_value = air_buckpbus_reg_read(phydev, 0x10220000);
+		reg_value |= AN8801SB_SGMII_AN0_ANRESTART;
+		air_buckpbus_reg_write(phydev, 0x10220000, reg_value);
 	}
 
 	if (prespeed != phydev->speed && phydev->link == LINK_UP) {
 		prespeed = phydev->speed;
-		ret |= an8801_cl45_write(
+		ret |= phy_write_mmd(
 			phydev, MMD_DEV_VSPEC2, PHY_PRE_SPEED_REG, prespeed);
 		dev_info(phydev_dev(phydev), "AN8801SB SPEED %d\n", prespeed);
 		while (an_retry > 0) {
@@ -1374,28 +1383,19 @@ static int an8801sb_read_status(struct phy_device *phydev)
 		mdelay(10);        /* delay 10 ms */
 
 
-		if (phydev->autoneg == AUTONEG_DISABLE) {
-			dev_info(phydev_dev(phydev),
-				"AN8801SB force speed = %d\n", prespeed);
-			if (prespeed == SPEED_1000) {
-				air_buckpbus_reg_write(
-					phydev, 0x10220010, 0xd801);
-			} else if (prespeed == SPEED_100) {
-				air_buckpbus_reg_write(
-					phydev, 0x10220010, 0xd401);
-			} else {
-				air_buckpbus_reg_write(
-					phydev, 0x10220010, 0xd001);
-			}
-
-			reg_value = air_buckpbus_reg_read(
-				phydev, 0x10220000);
-			reg_value |= AN8801SB_SGMII_AN0_ANRESTART;
+		if (prespeed == SPEED_1000) {
 			air_buckpbus_reg_write(
-				phydev, 0x10220000, reg_value);
+				phydev, 0x10220010, 0xd801);
+		} else if (prespeed == SPEED_100) {
+			air_buckpbus_reg_write(
+				phydev, 0x10220010, 0xd401);
+		} else {
+			air_buckpbus_reg_write(
+				phydev, 0x10220010, 0xd001);
 		}
+
 		reg_value = air_buckpbus_reg_read(phydev, 0x10220000);
-		reg_value |= AN8801SB_SGMII_AN0_RESET;
+		reg_value |= (AN8801SB_SGMII_AN0_RESET | AN8801SB_SGMII_AN0_ANRESTART);
 		air_buckpbus_reg_write(phydev, 0x10220000, reg_value);
 	}
 	return ret;
@@ -1451,9 +1451,12 @@ static struct phy_driver airoha_driver[] = {
 		.probe          = an8801_phy_probe,
 		.remove         = an8801_phy_remove,
 		.read_status    = an8801_read_status,
-#if (KERNEL_VERSION(4, 5, 0) < LINUX_VERSION_CODE)
-		.read_mmd       = __an8801_cl45_read,
-		.write_mmd      = __an8801_cl45_write,
+		.config_intr	= an8801_config_intr,
+#if (KERNEL_VERSION(5, 11, 0) < LINUX_VERSION_CODE)
+		.handle_interrupt = an8801_handle_interrupt,
+#else
+		.did_interrupt	= an8801_did_interrupt,
+		.ack_interrupt	= an8801_ack_interrupt,
 #endif
 	}
 };
diff --git a/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.h b/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.h
index c98c9e098..06234a256 100644
--- a/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.h
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/an8801.h
@@ -12,10 +12,10 @@
 
 /* NAMING DECLARATIONS
  */
-#define AN8801_DRIVER_VERSION  "1.1.4"
+#define AN8801_DRIVER_VERSION  "1.1.6"
 
 #define DEBUGFS_COUNTER         "counter"
-#define DEBUGFS_INFO     "driver_info"
+#define DEBUGFS_INFO            "driver_info"
 #define DEBUGFS_PBUS_OP         "pbus_op"
 #define DEBUGFS_POLARITY        "polarity"
 #define DEBUGFS_MDIO            "mdio"
@@ -88,7 +88,7 @@
 #define LED_BLK_EVT_1000M_RX        BIT(1)
 #define LED_BLK_EVT_1000M_TX        BIT(0)
 
-#define UNIT_LED_BLINK_DURATION     1024
+#define UNIT_LED_BLINK_DURATION     780
 
 /* Serdes auto negotation restart */
 #define AN8801SB_SGMII_AN0_ANRESTART    (0x0200)
@@ -135,6 +135,9 @@ For reference only
 #define LED_BLINK_DURATION(f)       (UNIT_LED_BLINK_DURATION << (f))
 #define LED_GPIO_SEL(led, gpio)     ((led) << ((gpio) * 3))
 
+/* Interrupt GPIO number, should not conflict with LED */
+#define AIR_INTERRUPT_GPIO	3
+
 /* DATA TYPE DECLARATIONS
  */
 enum AIR_LED_GPIO_PIN_T {
diff --git a/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/en8801sc.c b/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/en8801sc.c
index 2cbea7229..12c8a0f86 100644
--- a/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/en8801sc.c
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/drivers/net/phy/en8801sc.c
@@ -587,7 +587,7 @@ static int en8801s_phase1_init(struct phy_device *phydev)
 
 	phydev->dev_flags = PHY_STATE_INIT;
 
-	dev_info(dev, "Phase1 initialize OK ! (%s)\n", EN8801S_DRIVER_VERSION);
+	dev_info(dev, "Phase1 initialize OK ! (%s) 10Te TP_IDL fixed.\n", EN8801S_DRIVER_VERSION);
 	if (priv->pro_version == 4) {
 		ret = en8801s_phase2_init(phydev);
 		if (ret != 0) {
@@ -811,14 +811,7 @@ static int en8801s_phase2_init(struct phy_device *phydev)
 		retry--;
 	}
 	pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1C38); /* RAW#2 */
-	ret = airoha_cl45_read(mbus, phy_addr, 0x1E, 0x12, &cl45_value);
-	if (ret < 0)
-		return ret;
-	GPHY_RG_1E_012.DATA = cl45_value;
-	GPHY_RG_1E_012.DataBitField.da_tx_i2mpb_a_tbt =
-				(u16)(pbus_data & 0x03f);
-	ret = airoha_cl45_write(mbus, phy_addr, 0x1E, 0x12,
-				GPHY_RG_1E_012.DATA);
+	ret = airoha_cl45_write(mbus, phy_addr, 0x1E, 0x12, 0xA018);
 	if (ret < 0)
 		return ret;
 	ret = airoha_cl45_read(mbus, phy_addr, 0x1E, 0x17, &cl45_value);
@@ -893,6 +886,17 @@ static int en8801s_phase2_init(struct phy_device *phydev)
 		}
 	}
 
+	//Fix 10Te TP_IDL
+	ret = airoha_cl45_read(mbus, phy_addr, 0x1E,
+				0x1A3, &cl45_value);
+	if (ret < 0)
+		return ret;
+	cl45_value &= ~0xf0;
+	ret = airoha_cl45_write(mbus, phy_addr, 0x1E,
+				0x1A3, cl45_value);
+	if (ret < 0)
+		return ret;
+
 	priv->first_init = false;
 	dev_info(phydev_dev(phydev), "Phase2 initialize OK !\n");
 	return 0;
diff --git a/feeds/mediatek-sdk/mediatek/image/mt7981.mk b/feeds/mediatek-sdk/mediatek/image/mt7981.mk
index bcc720db4..44cce6e5f 100755
--- a/feeds/mediatek-sdk/mediatek/image/mt7981.mk
+++ b/feeds/mediatek-sdk/mediatek/image/mt7981.mk
@@ -307,3 +307,28 @@ define Device/senao_jeap6500
 endef
 TARGET_DEVICES += senao_jeap6500
 DEFAULT_DEVICE_VARS += FIT_KEY_DIR FIT_KEY_NAME
+
+define Device/emplus_wap588m
+   DEVICE_VENDOR := EMPLUS
+   DEVICE_MODEL := WAP588M
+   DEVICE_DTS := mt7981-emplus-wap588m
+   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+   SUPPORTED_DEVICES := emplus,wap588m
+   DEVICE_PACKAGES := kmod-mt7981-firmware kmod-mt7915e uboot-envtools -procd-ujail
+   UBINIZE_OPTS := -E 5
+   BLOCKSIZE := 128k
+   PAGESIZE := 2048
+   IMAGE_SIZE := 65536k
+   KERNEL_IN_UBI := 1
+   FIT_KEY_DIR := $(DTS_DIR)/mediatek/keys/emplus_wap588m
+   FIT_KEY_NAME := fit_key
+   IMAGES += factory.bin
+   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
+   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+   KERNEL = kernel-bin | lzma | \
+     fit-sign lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
+   KERNEL_INITRAMFS = kernel-bin | lzma | \
+     fit-sign lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd
+ endef
+ TARGET_DEVICES += emplus_wap588m
+ DEFAULT_DEVICE_VARS += FIT_KEY_DIR FIT_KEY_NAME
diff --git a/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/board.d/02_network b/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/board.d/02_network
index fd19693eb..736309eda 100644
--- a/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/board.d/02_network
+++ b/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/board.d/02_network
@@ -31,7 +31,10 @@ mediatek_setup_interfaces()
 		;;
 	sonicfi,rap630w-211g)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1
-		;;		
+		;;
+    emplus,wap588m)
+        ucidef_set_interfaces_lan_wan "eth0" "eth1"
+        ;;
 	*)	
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
diff --git a/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/uci-defaults/30_uboot-envtools b/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/uci-defaults/30_uboot-envtools
index addad6664..b4b248037 100644
--- a/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/uci-defaults/30_uboot-envtools
+++ b/feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/uci-defaults/30_uboot-envtools
@@ -18,6 +18,7 @@ case "$board" in
 edgecore,eap111|\
 edgecore,eap112|\
 senao,iap2300m|\
+emplus,wap588m|\
 senao,jeap6500)
 	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x20000" "0x20000"
 	;;
diff --git a/feeds/mediatek-sdk/mediatek/mt7981/base-files/lib/upgrade/platform.sh b/feeds/mediatek-sdk/mediatek/mt7981/base-files/lib/upgrade/platform.sh
index 1059c7f55..3e5d58a41 100644
--- a/feeds/mediatek-sdk/mediatek/mt7981/base-files/lib/upgrade/platform.sh
+++ b/feeds/mediatek-sdk/mediatek/mt7981/base-files/lib/upgrade/platform.sh
@@ -2,13 +2,13 @@ REQUIRE_IMAGE_METADATA=1
 
 senao_swap_active_fw() {
 	echo "Doing swap active_fw" > /dev/console
-	tmp_active_fw=$(fw_printenv -n active_fw)
+        tmp_active_fw=$(fw_printenv | grep active_fw | awk -F= {'print $2'})
 	if [ $tmp_active_fw == "0" ]; then
 		fw_setenv active_fw 1
-		fw_setenv mtdparts nmbm0:1024k\(bl2\),512k\(u-boot-env\),2048k\(factory\),2048k\(fip\),112640k\(ubi_1\),112640k\(ubi\),384k\(cert\),640k\(userconfig\),384k\(crashdump\)
+                fw_setenv mtdparts nmbm0:1024k\(bl2\),512k\(u-boot-env\),2048k\(factory\),2048k\(fip\),56320k\(ubi_1\),56320k\(ubi\),384k\(cert\),640k\(userconfig\),384k\(crashdump\)
 	else
 		fw_setenv active_fw 0
-		fw_setenv mtdparts nmbm0:1024k\(bl2\),512k\(u-boot-env\),2048k\(factory\),2048k\(fip\),112640k\(ubi\),112640k\(ubi_1\),384k\(cert\),640k\(userconfig\),384k\(crashdump\)
+                fw_setenv mtdparts nmbm0:1024k\(bl2\),512k\(u-boot-env\),2048k\(factory\),2048k\(fip\),56320k\(ubi\),56320k\(ubi_1\),384k\(cert\),640k\(userconfig\),384k\(crashdump\)
 	fi
 }
 
@@ -47,6 +47,7 @@ platform_do_upgrade() {
 		nand_do_upgrade "$1"
 		;;
 	senao,iap2300m|\
+	emplus,wap588m|\
 	senao,jeap6500)
 		CI_UBIPART="ubi_1"
 		nand_do_upgrade "$1"
@@ -68,6 +69,7 @@ platform_check_image() {
 	edgecore,eap111|\
 	edgecore,eap112|\
 	senao,iap2300m|\
+	emplus,wap588m|\
 	senao,jeap6500)
 		nand_do_platform_check "$board" "$1"
 		return $?
diff --git a/feeds/mediatek-sdk/mediatek/mt7981/config-5.4 b/feeds/mediatek-sdk/mediatek/mt7981/config-5.4
index aa0f6ee88..2cc5dc41d 100644
--- a/feeds/mediatek-sdk/mediatek/mt7981/config-5.4
+++ b/feeds/mediatek-sdk/mediatek/mt7981/config-5.4
@@ -2,7 +2,6 @@ CONFIG_64BIT=y
 CONFIG_AHCI_MTK=y
 CONFIG_AIROHA_EN8801SC_PHY=y
 # CONFIG_AIROHA_EN8811H_PHY is not set
-# CONFIG_AIROHA_AN8801_PHY is not set
 CONFIG_AN8855_GSW=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
diff --git a/feeds/mediatek-sdk/mediatek/patches-5.4/999-2738-an8801sb-gphy-support.patch b/feeds/mediatek-sdk/mediatek/patches-5.4/999-2738-an8801sb-gphy-support.patch
index 1a7fbf15e..0419cbafb 100644
--- a/feeds/mediatek-sdk/mediatek/patches-5.4/999-2738-an8801sb-gphy-support.patch
+++ b/feeds/mediatek-sdk/mediatek/patches-5.4/999-2738-an8801sb-gphy-support.patch
@@ -1,15 +1,3 @@
-From 535fdc6dfce7def996a5188819ffc96231c36f98 Mon Sep 17 00:00:00 2001
-From: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
-Date: Tue, 2 Jan 2024 18:13:43 +0800
-Subject: [PATCH] [networking][999-2738-an8801sb-gphy-support.patch]
-
----
- drivers/net/phy/Kconfig  |   5 +
- drivers/net/phy/Makefile |   1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
-index ccd3f3f..5dbfb17 100644
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 @@ -345,6 +345,11 @@ config SFP
@@ -24,8 +12,6 @@ index ccd3f3f..5dbfb17 100644
  config AIROHA_EN8801SC_PHY
  	tristate "Drivers for Airoha EN8801S Gigabit PHYs for MediaTek SoC."
  	---help---
-diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
-index 1e8d67b..d39e54b 100644
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
 @@ -74,6 +74,7 @@ endif
@@ -36,6 +22,64 @@ index 1e8d67b..d39e54b 100644
  obj-$(CONFIG_AIROHA_EN8801SC_PHY)	+= en8801sc.o
  air_en8811h-y := air_en8811h_main.o air_en8811h_api.o
  obj-$(CONFIG_AIROHA_EN8811H_PHY)	+= air_en8811h.o
--- 
-2.18.0
-
+--- a/drivers/net/phy/phylink.c
++++ b/drivers/net/phy/phylink.c
+@@ -870,12 +870,17 @@
+ 	of_node_put(phy_node);
+ 
+ 	if (!phy_dev)
+-		return -ENODEV;
+-
++	{
++		phylink_info(pl, "[phylink] reload phy-handle2. %s %d\n",__func__, __LINE__);
++		phy_node = of_parse_phandle(dn, "phy-handle2", 0);
++		phy_dev = of_phy_attach(pl->netdev, phy_node, flags, pl->link_interface);
++		if (!phy_dev)
++			return -ENODEV;
++	}
++	
+ 	ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);
+ 	if (ret)
+ 		phy_detach(phy_dev);
+-
+ 	return ret;
+ }
+ EXPORT_SYMBOL_GPL(phylink_of_phy_connect);
+--- a/drivers/of/of_mdio.c
++++ b/drivers/of/of_mdio.c
+@@ -226,7 +226,9 @@
+ 		return rc;
+ 
+ 	/* Loop over the child nodes and register a phy_device for each phy */
++	int an8801=0;
+ 	for_each_available_child_of_node(np, child) {
++		if(an8801==1)break;
+ 		addr = of_mdio_parse_addr(&mdio->dev, child);
+ 		if (addr < 0) {
+ 			scanphys = true;
+@@ -234,7 +236,25 @@
+ 		}
+ 
+ 		if (of_mdiobus_child_is_phy(child))
++		{
++			if(addr==30)
++			{
++				int phy_id ;
++
++				phy_id = mdiobus_read(mdio, addr, MII_PHYSID1) << 16 ;
++				phy_id = phy_id + mdiobus_read(mdio, addr, MII_PHYSID2);
++				dev_info(&mdio->dev, "[of_mdio] %s %d  addr:%d phy_id:0x%x  \n",__func__, __LINE__, addr, phy_id);
++
++				if (phy_id==0 || phy_id==0x1a750000)
++				{
++					dev_info(&mdio->dev, "[of_mdio] %s %d  continue  \n",__func__, __LINE__);
++					continue;
++				}
++				else
++					an8801=1;
++			}
+ 			rc = of_mdiobus_register_phy(mdio, child, addr);
++		}
+ 		else
+ 			rc = of_mdiobus_register_device(mdio, child, addr);
+ 
diff --git a/feeds/morse/kernel/mm-board-config/LICENSE.binaries b/feeds/morse/kernel/mm-board-config/LICENSE.binaries
new file mode 100644
index 000000000..adf90750d
--- /dev/null
+++ b/feeds/morse/kernel/mm-board-config/LICENSE.binaries
@@ -0,0 +1,125 @@
+                                  MORSE MICRO
+                     BINARY DISTRIBUTION LICENSE AGREEMENT
+
+1. Parties.
+This Software License Agreement (SLA) is between Morse Micro Pty. Ltd. and the
+user of the Software set forth (“you”, “user”, “customer”), and is effective as
+of the date of first access or download of the software by you. Morse Micro is
+licensing this software to you free of charge upon the condition that you
+accept all the terms of this SLA and only use this Software in conjunction with
+Morse Micro products. ANY USE, REPRODUCTION, OR DISTRIBUTION OF THE SOFTWARE
+CONSTITUTES YOUR ACCEPTANCE OF THIS AGREEMENT.
+
+2. Definitions.
+"Software" means any binary or source code that you have received from Morse
+Micro or its authorized licensees and/or those portions of such software
+produced by Program’s code within the Software, as well as any other machine
+readable materials (including, but not limited to, libraries, source files,
+header files, and data files), any updates or error corrections provided by
+Morse Micro, and any user manuals, programming guides and other documentation
+provided to you by Morse Micro under this SLA.
+
+3. License and Restrictions.
+Morse Micro grants you a non-exclusive, non-transferable, limited license
+without license fees to:
+
+    a. use the software solely with a hardware product that includes one of the
+    Morse Micro Wi-Fi HaLow chips, including
+    wireless modules or evaluation kits;
+
+    b. to reproduce and distribute the Software complete, unmodified, and as
+    provided by Morse Micro, solely for use with a hardware product that
+    includes one of the Morse Micro Wi-Fi HaLow chips, including wireless
+    modules or evaluation kits.
+
+4. Reservation of Rights.
+You should distribute Software with a copy of this SLA. Software is
+copyrighted. Title to Software and all associated intellectual property rights
+is retained by Morse Micro. Except as expressly provided herein, no license or
+right, express or implied, is hereby conveyed or granted to you by Morse Micro.
+You must retain all copyright notices on all Software, derivative works and
+documentation. The intellectual property and proprietary rights of whatever
+nature in the Software and derivative works are and will remain the exclusive
+property of Morse Micro or its suppliers. Nothing in this Agreement should be
+construed as transferring any aspects of such rights to you or any third party.
+Morse Micro and its suppliers reserve any and all rights not expressly granted
+in this Agreement. You may not sell, assign, sublicense, lease, or otherwise
+transfer any part of this license. You must not:
+
+    a. use, license, sell or otherwise distribute the Software except as
+    provided in this SLA;
+
+    b. attempt to modify in any way, reverse engineer, decompile or disassemble
+    any portion of the Software;
+
+    c. use the Software or other material in violation of any applicable law or
+    regulation, including but not limited to any regulatory agency.
+
+5. Ownership.
+The Software is licensed and not sold.  Title to and ownership of the Software,
+including all intellectual property rights thereto, and any portion thereof
+remain with Morse Micro or its licensors. You hereby covenant that you will not
+assert any claim that the Software created by or for Morse Micro infringe any
+intellectual property right owned or controlled by you.
+
+6. Termination.
+This SLA will terminate immediately without notice from Morse Micro if you fail
+to comply with any of its provisions, including the export laws provisions and
+Section 10 that may govern the export of the Software from certain
+jurisdictions, including technical data.
+
+7. Disclaimer and Limitation of Liability.
+THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. MORSE MICRO
+FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT
+LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE OR NON-INFRINGEMENT. IN NO EVENT SHALL MORSE MICRO BE LIABLE FOR ANY
+INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES
+FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD
+PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF MORSE MICRO HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THE SOFTWARE IS NOT INTENDED FOR
+USE IN ENVIRONMENTS OR APPLICATIONS WHERE EXTRAORDINARILY HIGH LEVELS OF
+QUALITY, RELIABILITY, AND FAILURE TOLERANCE ARE DEMANDED, AND/OR WHERE A
+MALFUNCTION OR FAILURE COULD LEAD TO SIGNIFICANT HARM TO LIFE, HEALTH,
+PROPERTY, OR RESULT IN SEVERE SOCIETAL REPERCUSSIONS ("CRITICAL APPLICATIONS").
+CRITICAL APPLICATIONS ENCOMPASS, BUT ARE NOT LIMITED TO, EQUIPMENT UTILIZED IN
+NUCLEAR FACILITIES, AVIATION AND SPACE EQUIPMENT, MEDICAL DEVICES, AUTOMOTIVE,
+TRAIN, MARINE, AND OTHER TRANSPORTATION EQUIPMENT, DEVICES INVOLVED IN
+CONTROLLING COMBUSTION OR EXPLOSIONS, SAFETY DEVICES, ELEVATORS AND ESCALATORS,
+DEVICES ASSOCIATED WITH ELECTRIC POWER, AND EQUIPMENT USED IN FINANCE-RELATED
+FIELDS.
+
+8. Survival.
+Sections 4, 5, 6, 7 and 10 will survive termination or expiration of this SLA.
+
+9. Privacy.
+Some features of the Software, if activated, may transmit a limited amount of
+data to Morse Micro (or its service provider) about the status of the system
+before a crash event. Morse Micro does not associate the data with personally
+identifiable information.
+
+10. Export Laws.
+YOU UNDERSTAND AND AGREE THAT THE SOFTWARE IS SUBJECT TO ALL APPLICABLE EXPORT-
+RELATED LAWS AND REGULATIONS AND THAT YOU MAY NOT EXPORT, RE-EXPORT OR TRANSFER
+THE SOFTWARE OR ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER
+THOSE LAWS. WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT, OR TRANSFER OF
+THE SOFTWARE TO CUBA, IRAN, NORTH KOREA, SUDAN, AND SYRIA IS PROHIBITED.
+
+11. Governing Law.
+The laws of New South Wales, Australia, govern all matters arising out of or
+relating to this SLA without giving effect to any conflict of law principles.
+If any provision of this SLA is held to be unenforceable, this SLA will remain
+in effect with the provision omitted, unless omission would frustrate the
+intent of the parties, in which case this Agreement will immediately terminate.
+
+12. Entire Agreement.
+This Agreement constitutes the entire agreement between the parties and
+supersedes all prior and contemporaneous agreements, proposals or
+representations, written or oral, concerning its subject matter. No
+modification, amendment, or waiver of any provision of this Agreement will be
+effective unless in writing and either signed or accepted electronically by the
+party against whom the modification, amendment or waiver is to be asserted. A
+waiver of any breach under this Agreement does not constitute a waiver of any
+other breach or future breach.
+
+
+MORSE MICRO
diff --git a/feeds/morse/kernel/mm-board-config/Makefile b/feeds/morse/kernel/mm-board-config/Makefile
new file mode 100644
index 000000000..5698f48c8
--- /dev/null
+++ b/feeds/morse/kernel/mm-board-config/Makefile
@@ -0,0 +1,86 @@
+#
+# Copyright 2022 Morse Micro
+#
+# This is free software, licensed under the MIT License.
+#
+# This package installs Morse Micro board configuration binaries, which are
+# distributed under the Morse Micro Binary Distribution License.
+# This license is available in LICENSE.binaries.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=morse-board-config
+PKG_RELEASE=6
+
+PKG_VERSION:=rel_1_12_4_2024_Jun_11
+
+PKG_SOURCE:=morsemicro-bcf-rel_1_12_4_2024_Jun_11.tar
+PKG_SOURCE_URL:=https://github.com/MorseMicro/bcf_binaries/releases/download/v1.12.4/
+PKG_HASH:=e403764730aa149e78874135da154bab2a24574308d3f2df88c9b4c125766ae3
+
+PKG_MAINTAINER:=Morse Micro <info@morsemicro.com>
+PKG_BUILD_PARALLEL:=1
+
+RSTRIP:=:
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/morse-board-config
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  URL:=$(PKG_SOURCE_URL)
+  TITLE:=Morse Micro WIFI HaLow Board Config File
+  PROVIDES:=morse-board-config
+endef
+
+define Package/morse-board-config-hotplug-model
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  TITLE:=Hotplug scripts for module type reporting
+  DEPENDS:=+morse-board-config
+endef
+
+define Package/morse-board-config-hotplug-model/description
+  When enabled, a hotplug script will be installed to
+  append a relevant module type suffix based on the value
+  programmed into the Morse chips OTP bits.
+endef
+
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+define Build/Compile
+
+endef
+
+define Package/morse-board-config/install
+	$(INSTALL_DIR) $(1)/usr/share/morse-bcf
+	$(INSTALL_DIR) $(1)/lib/firmware/morse
+
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/firmware/morse/* $(1)/lib/firmware/morse/
+
+	# Install all files from override folder, including failsafe.
+	$(INSTALL_DATA) ./files/lib/firmware/morse/* $(1)/lib/firmware/morse/
+
+ifeq ($(CONFIG_TARGET_PROFILE), "DEVICE_edgecore_eap112")
+	ln -s /lib/firmware/morse/bcf_edgecore_eap112_fcc.bin $(1)/lib/firmware/morse/bcf_default.bin
+else
+	# Link the failsafe bcf by default so userspace can query the driver.
+	ln -s /lib/firmware/morse/bcf_failsafe.bin $(1)/lib/firmware/morse/bcf_default.bin
+endif
+	# Create symlinks for the production programmed otp devices
+	while IFS=, read -r board_type suffix serial; do \
+		ln -s /lib/firmware/morse/bcf_$$$${serial}.bin $(1)/lib/firmware/morse/bcf_boardtype_$$$${board_type}.bin; \
+	done < ./files/usr/share/morse-bcf/db.txt
+
+	$(INSTALL_DATA) ./files/usr/share/morse-bcf/db.txt $(1)/usr/share/morse-bcf/db.txt
+endef
+
+define Package/morse-board-config-hotplug-model/install
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/ieee80211
+	$(INSTALL_DATA) ./files/etc/hotplug.d/ieee80211/20-module-type $(1)/etc/hotplug.d/ieee80211/20-module-type
+endef
+
+$(eval $(call BuildPackage,morse-board-config))
+$(eval $(call BuildPackage,morse-board-config-hotplug-model))
diff --git a/feeds/morse/kernel/mm-board-config/files/etc/hotplug.d/ieee80211/20-module-type b/feeds/morse/kernel/mm-board-config/files/etc/hotplug.d/ieee80211/20-module-type
new file mode 100644
index 000000000..52e21c1a1
--- /dev/null
+++ b/feeds/morse/kernel/mm-board-config/files/etc/hotplug.d/ieee80211/20-module-type
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+[ "${ACTION}" = "add" ] && {
+	basename "$(readlink -f "/sys/${DEVPATH}/device/driver")" | grep '^morse_' || return;
+
+	board_type=$(printf "%04x" "$(cat /sys/${DEVPATH}/device/board_type)");
+
+	# Avoid mutating model information when OTP is not burnt, ie 0000.
+	[ "$board_type" = "0000" ] && return;
+
+	module_id=$(awk -F, '$1==b{print toupper($2)}' b="$board_type" /usr/share/morse-bcf/db.txt)
+
+	model=$(cat /tmp/sysinfo/model)
+
+	# Don't append a module id if that module id already exists in the model
+	[ "${model%-"$module_id"}" != "${model}" ] && return;
+
+	echo "$model-$module_id" > /tmp/sysinfo/model
+}
diff --git a/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_edgecore_eap112_fcc.bin b/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_edgecore_eap112_fcc.bin
new file mode 100644
index 000000000..07af8e1b9
Binary files /dev/null and b/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_edgecore_eap112_fcc.bin differ
diff --git a/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_failsafe.bin b/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_failsafe.bin
new file mode 100644
index 000000000..b47329187
Binary files /dev/null and b/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_failsafe.bin differ
diff --git a/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_mf08651_us.bin b/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_mf08651_us.bin
new file mode 100755
index 000000000..6aa54e167
Binary files /dev/null and b/feeds/morse/kernel/mm-board-config/files/lib/firmware/morse/bcf_mf08651_us.bin differ
diff --git a/feeds/morse/kernel/mm-board-config/files/usr/share/morse-bcf/db.txt b/feeds/morse/kernel/mm-board-config/files/usr/share/morse-bcf/db.txt
new file mode 100644
index 000000000..09cbb53ca
--- /dev/null
+++ b/feeds/morse/kernel/mm-board-config/files/usr/share/morse-bcf/db.txt
@@ -0,0 +1 @@
+0801,05us,mf08651_us
diff --git a/feeds/morse/kernel/mm61xx/Makefile b/feeds/morse/kernel/mm61xx/Makefile
new file mode 100644
index 000000000..02c240577
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/Makefile
@@ -0,0 +1,183 @@
+#
+# Copyright 2022 Morse Micro
+#
+# This is free software, licensed under the GPL 2 license.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=morse_driver
+PKG_RELEASE=3
+
+PKG_VERSION:=1.11.4
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/MorseMicro/morse_driver.git
+PKG_HASH:=159d018a92e0cf742795ed49bd94fb6ed324163012bb91c2a2e4e0f6037bbf23
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b2ab42a5f22527422adf6afab73f2d019c16f162
+
+PKG_MAINTAINER:=Morse Micro
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+DTC=$(wildcard $(LINUX_DIR)/scripts/dtc/dtc)
+
+define KernelPackage/morse
+  SUBMENU:=Wireless Drivers
+  TITLE:=Morse Micro WIFI HaLow driver
+  DEPENDS:= +kmod-mmc +kmod-mac80211 +kmod-trelay +kmod-lib-crc7 +morse-fw +morse-board-config
+  FILES:=\
+    $(PKG_BUILD_DIR)/morse.ko \
+    $(PKG_BUILD_DIR)/dot11ah/dot11ah.ko
+  AUTOLOAD:=$(call AutoProbe,morse)
+  MODPARAMS.morse:=country=US
+  PROVIDES:=kmod-morse
+endef
+
+define KernelPackage/morse/config
+
+       config MORSE_SDIO
+            bool "SDIO support "
+            default n
+            depends on PACKAGE_kmod-morse
+
+       config MORSE_SPI
+            bool "SPI support "
+            default y
+            depends on PACKAGE_kmod-morse
+
+       config MORSE_USER_ACCESS
+            bool "User space access support "
+            default y
+            depends on PACKAGE_kmod-morse
+
+       config MORSE_VENDOR_COMMAND
+            bool "Vendor command support "
+            default y
+            depends on PACKAGE_kmod-morse
+
+       config MORSE_MONITOR
+            bool "Monitor mode support "
+            default n
+            depends on PACKAGE_kmod-morse
+
+       config MORSE_DEBUG
+            bool "Enable debug "
+            default n
+            depends on PACKAGE_kmod-morse
+            help
+              Compiles the driver with debug info and some additional debug features.
+
+      config MORSE_DEBUG_LOGGING
+            bool "Enable debug logging"
+            default n
+            depends on PACKAGE_kmod-morse
+            select KERNEL_DYNAMIC_DEBUG_CORE
+            help
+              Enables debug level logging from the driver. Logging must be enabled at run time.
+              There may be a binary size and performance impact when this is y.
+
+       config MORSE_RC
+            bool "Enable MMRC (Morse Micro Rate Control) "
+            default y
+            depends on PACKAGE_kmod-morse
+
+       config MORSE_SDIO_ALIGNMENT
+            int "Required alignment for bulk SDIO reads/writes"
+            default 2
+            range 2 8
+            depends on MORSE_SDIO
+            help
+              Number of bytes to align data buffers for bulk SDIO transactions. Some hosts have
+              specific alignment requirements for DMA, use this setting to
+              adjust the alignment required.
+
+              Must be a power of 2.
+
+endef
+
+ifeq ($(CONFIG_MORSE_SDIO),y)
+  NOSTDINC_FLAGS += -DCONFIG_MORSE_SDIO
+  MORSE_MAKEDEFS += CONFIG_MORSE_SDIO=y
+endif
+
+ifeq ($(CONFIG_MORSE_SPI),y)
+  MORSE_MAKEDEFS += CONFIG_MORSE_SPI=y
+endif
+
+ifeq ($(CONFIG_MORSE_USER_ACCESS),y)
+  NOSTDINC_FLAGS += -DCONFIG_MORSE_USER_ACCESS
+  MORSE_MAKEDEFS += CONFIG_MORSE_USER_ACCESS=y
+endif
+
+ifeq ($(CONFIG_MORSE_VENDOR_COMMAND),y)
+  NOSTDINC_FLAGS += -DCONFIG_MORSE_VENDOR_COMMAND
+  MORSE_MAKEDEFS += CONFIG_MORSE_VENDOR_COMMAND=y
+endif
+
+ifeq ($(CONFIG_MORSE_MONITOR),y)
+  NOSTDINC_FLAGS += -DCONFIG_MORSE_MONITOR
+  MORSE_MAKEDEFS += CONFIG_MORSE_MONITOR=y
+endif
+
+ifeq ($(CONFIG_MORSE_DEBUG),y)
+  # This DEBUG (used by the driver Makefile) should not be confused with
+  # -DDEBUG (used by the kernel build system).
+  MORSE_MAKEDEFS += DEBUG=y
+  MORSE_MAKEDEFS += CONFIG_MORSE_DEBUGFS=y
+  MORSE_MAKEDEFS += CONFIG_MORSE_ENABLE_TEST_MODES=y
+else
+  MORSE_MAKEDEFS += DEBUG=n
+endif
+
+ifeq ($(CONFIG_MORSE_RC),y)
+  NOSTDINC_FLAGS += -DCONFIG_MORSE_RC
+  MORSE_MAKEDEFS += CONFIG_MORSE_RC=y
+endif
+
+MORSE_MAKEDEFS += \
+  MORSE_VERSION=0-$(PKG_VERSION) \
+  KERNEL_SRC=$(LINUX_DIR) \
+  CONFIG_MORSE_SDIO_ALIGNMENT=$(CONFIG_MORSE_SDIO_ALIGNMENT) \
+  CONFIG_BACKPORT_VERSION=v5.18.1
+# This refers to the version of mac80211 backported to OpenWrt
+# Occasionally patches are required to remove some parts of the driver
+# as OpenWrt may sometimes pull in further patches from later kernel versions
+# than that of the mac80211 backport.
+
+NOSTDINC_FLAGS = \
+	-I$(PKG_BUILD_DIR) \
+	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
+	-I$(STAGING_DIR)/usr/include/mac80211-backport \
+	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	-include backport/autoconf.h \
+	-include backport/backport.h
+
+ifeq ($(CONFIG_MORSE_DEBUG_LOGGING),y)
+  NOSTDINC_FLAGS += -DDYNAMIC_DEBUG_MODULE
+  NOSTDINC_FLAGS += -DDEBUG
+endif
+
+MORSE_MAKEDEFS += CONFIG_WLAN_VENDOR_MORSE=m
+MORSE_MAKEDEFS += V=1
+
+NOSTDINC_FLAGS += -DMORSE_TRACE_PATH=.
+
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Build/Compile
+	$(MAKE) $(MORSE_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+		$(KERNEL_MAKE_FLAGS) \
+		M="$(PKG_BUILD_DIR)" \
+		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
+		modules
+endef
+
+$(eval $(call KernelPackage,morse))
diff --git a/feeds/morse/kernel/mm61xx/patches/002-fix-watchdog-interval.patch b/feeds/morse/kernel/mm61xx/patches/002-fix-watchdog-interval.patch
new file mode 100644
index 000000000..38037c335
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/patches/002-fix-watchdog-interval.patch
@@ -0,0 +1,15 @@
+--- a/watchdog.c
++++ b/watchdog.c
+@@ -54,12 +54,7 @@ static enum hrtimer_restart morse_watchd
+ static void watchdog_timer_start(struct morse *mors)
+ {
+ 	ktime_t interval = ktime_set(mors->watchdog.interval_secs, 0);
+-
+-#if defined(MAC80211_BACKPORT_VERSION_CODE) && (KERNEL_VERSION(4, 10, 0) <= MAC80211_VERSION_CODE)
+-	hrtimer_start(&mors->watchdog.timer, interval.tv64, HRTIMER_MODE_REL);
+-#else
+ 	hrtimer_start(&mors->watchdog.timer, interval, HRTIMER_MODE_REL);
+-#endif
+ }
+
+ int morse_watchdog_start(struct morse *mors)
diff --git a/feeds/morse/kernel/mm61xx/patches/003-ekh01-spi-fix.patch b/feeds/morse/kernel/mm61xx/patches/003-ekh01-spi-fix.patch
new file mode 100644
index 000000000..a3e871511
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/patches/003-ekh01-spi-fix.patch
@@ -0,0 +1,60 @@
+--- a/spi.c
++++ b/spi.c
+@@ -175,10 +175,12 @@ static int morse_spi_setup(struct spi_de
+ 	spi->bits_per_word = 8;
+ 	spi->max_speed_hz = max_speed_hz;
+ 
++#if 0
+ 	if (spi->max_speed_hz > MAX_SPI_CLK_SPEED) {
+ 		dev_err(&spi->dev, "SPI clocks above 50MHz are not supported by Morse chip\n");
+ 		return -EPERM;
+ 	}
++#endif
+ 
+ 	ret = spi_setup(spi);
+ 	if (ret < 0) {
+@@ -432,7 +434,7 @@ static u8 *morse_spi_find_data_ack(struc
+ {
+ 	u8 *cp = data;
+ 
+-	while (cp < end && *cp == 0xff)
++	while (cp < end && (SPI_MMC_RESPONSE_CODE(*cp) != SPI_RESPONSE_ACCEPTED))
+ 		cp++;
+ 
+ 	if (cp == end)
+@@ -529,13 +531,10 @@ static int morse_spi_cmd53_read(struct m
+ 	cp += 4;
+ 
+ 	if (!block) {
+-		/* Scale bytes delay to block */
+-		u32 extra_bytes = (count * mspi->inter_block_delay_bytes) / MMC_SPI_BLOCKSIZE;
+-
+ 		/* Allow 4 bytes for CRC and another 10 bytes for start block token & chip delays
+ 		 * (usually comes in 2).
+ 		 */
+-		data_size = count + 4 + 4 + extra_bytes;
++		data_size = count + 4 + 4 + mspi->inter_block_delay_bytes;
+ 		if (is_rk3288)
+ 			/* Short transactions are sometimes delayed. These extra bytes give enough
+ 			 * cycles to receive all the data. This could be optimised to a lower
+@@ -601,6 +600,7 @@ static int morse_spi_cmd53_write(struct
+ 	u8 *resp;
+ 	u8 *end;
+ 	u8 *ack = cp;
++	u8 *test_ack;
+ 	u32 data_size;
+ 	int i;
+ 
+@@ -656,10 +656,11 @@ static int morse_spi_cmd53_write(struct
+ 		/* crc */
+ 		*cp = (crc & 0xFF00) >> 8;
+ 		*(cp + 1) = (crc & 0xFF);
++		test_ack = cp + 2;
+ 		cp += sizeof(crc);
+ 
+ 		/* Allow more bytes for status and chip processing (depends on CLK) */
+-		cp += block ? mspi->inter_block_delay_bytes : 4;
++		cp += mspi->inter_block_delay_bytes;
+ 	}
+ 
+ 	/* Do the actual transfer */
diff --git a/feeds/morse/kernel/mm61xx/patches/004-fix-kernel-version-check.patch b/feeds/morse/kernel/mm61xx/patches/004-fix-kernel-version-check.patch
new file mode 100644
index 000000000..370558e01
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/patches/004-fix-kernel-version-check.patch
@@ -0,0 +1,13 @@
+Index: morse_driver-rel_1_12_3_2024_May_23/sdio.c
+===================================================================
+--- morse_driver-rel_1_12_3_2024_May_23.orig/sdio.c
++++ morse_driver-rel_1_12_3_2024_May_23/sdio.c
+@@ -572,7 +572,7 @@ static int morse_sdio_reset(int reset_pi
+ 
+ 	sdio_claim_host(func);
+ 	sdio_disable_func(func);
+-#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
++#if KERNEL_VERSION(5, 18, 0) > MAC80211_VERSION_CODE
+ 	mmc_hw_reset(func->card->host);
+ #else
+ 	mmc_hw_reset(func->card);
diff --git a/feeds/morse/kernel/mm61xx/patches/007-sysfs-add-sysfs-to-export-board-type-as-a-device-att.patch b/feeds/morse/kernel/mm61xx/patches/007-sysfs-add-sysfs-to-export-board-type-as-a-device-att.patch
new file mode 100644
index 000000000..e499cf54d
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/patches/007-sysfs-add-sysfs-to-export-board-type-as-a-device-att.patch
@@ -0,0 +1,160 @@
+From 9ebc9a01e90f65f058ed21d3190800dc130b6ef4 Mon Sep 17 00:00:00 2001
+From: Arien Judge <arien.judge@morsemicro.com>
+Date: Wed, 28 Feb 2024 13:29:28 +1100
+Subject: [PATCH] sysfs: add sysfs to export board type as a device attribute
+
+The driver reads the board type from OTP to decide which bcf file to load,
+but doesn't report this information anywhere useful.
+
+Read the value read from OTP as a sysfs device attribute to allow userspace
+applications to reliably report the module type on chip.
+
+Opted for creating a proper sysfs device attribute here instead of using
+debugfs as we shouldn't expect user tooling to have such a hard dependency
+
+cache board id on firmware init for sysfs reporting
+---
+ Makefile   |  1 +
+ firmware.c |  3 +++
+ mac.c      |  6 ++++++
+ morse.h    |  1 +
+ sysfs.c    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ sysfs.h    |  9 +++++++++
+ 6 files changed, 66 insertions(+)
+ create mode 100644 sysfs.c
+ create mode 100644 sysfs.h
+
+Index: morse_driver-rel_1_12_3_2024_May_23/Makefile
+===================================================================
+--- morse_driver-rel_1_12_3_2024_May_23.orig/Makefile
++++ morse_driver-rel_1_12_3_2024_May_23/Makefile
+@@ -96,6 +96,7 @@ endif
+ obj-$(CONFIG_WLAN_VENDOR_MORSE) += morse.o dot11ah/
+ 
+ morse-y = mac.o
++morse-y += sysfs.o
+ morse-y += init.o
+ morse-y += skbq.o
+ morse-y += debug.o
+Index: morse_driver-rel_1_12_3_2024_May_23/firmware.c
+===================================================================
+--- morse_driver-rel_1_12_3_2024_May_23.orig/firmware.c
++++ morse_driver-rel_1_12_3_2024_May_23/firmware.c
+@@ -881,6 +881,9 @@ int morse_firmware_init(struct morse *mo
+ 	if (mors->cfg->get_board_type && enable_otp_check)
+ 		board_id = mors->cfg->get_board_type(mors);
+ 
++	/* store the board id for sysfs reporting. Propagate the error */
++	mors->board_id = board_id;
++
+ 	if (strlen(board_config_file) > 0) {
+ 		n = snprintf(bcf_path, sizeof(bcf_path), "%s/%s", MORSE_FW_DIR, board_config_file);
+ 	} else if (strlen(mors->board_serial) > 0) {
+Index: morse_driver-rel_1_12_3_2024_May_23/mac.c
+===================================================================
+--- morse_driver-rel_1_12_3_2024_May_23.orig/mac.c
++++ morse_driver-rel_1_12_3_2024_May_23/mac.c
+@@ -14,6 +14,7 @@
+ #include "mac.h"
+ #include "s1g_ies.h"
+ #include "bus.h"
++#include "sysfs.h"
+ #include "debug.h"
+ #include "command.h"
+ #include "vendor.h"
+@@ -6422,6 +6423,10 @@ int morse_mac_register(struct morse *mor
+ 	INIT_WORK(&mors->driver_restart, morse_mac_restart_work);
+ 	INIT_WORK(&mors->health_check, morse_health_check_work);
+ 
++	ret = morse_sysfs_init(mors);
++	if (ret)
++		MORSE_ERR(mors, "Unable to initialise sysfs\n");
++
+ 	ret = morse_init_debug(mors);
+ 	if (ret)
+ 		MORSE_ERR(mors, "Unable to create debugfs files\n");
+@@ -6593,6 +6598,7 @@ static void morse_mac_deinit(struct mors
+ 
+ void morse_mac_unregister(struct morse *mors)
+ {
++	morse_sysfs_free(mors);
+ 	morse_deinit_debug(mors);
+ 	morse_ps_disable(mors);
+ 
+Index: morse_driver-rel_1_12_3_2024_May_23/morse.h
+===================================================================
+--- morse_driver-rel_1_12_3_2024_May_23.orig/morse.h
++++ morse_driver-rel_1_12_3_2024_May_23/morse.h
+@@ -979,6 +979,7 @@ struct morse {
+ 	struct morse_debug debug;
+ 
+ 	char *board_serial;
++	int board_id;
+ 
+ 	/* Stored Channel Information, sta_type, enc_mode, RAW */
+ 	struct morse_custom_configs custom_configs;
+Index: morse_driver-rel_1_12_3_2024_May_23/sysfs.c
+===================================================================
+--- /dev/null
++++ morse_driver-rel_1_12_3_2024_May_23/sysfs.c
+@@ -0,0 +1,46 @@
++/*
++ * Copyright 2024 Morse Micro
++ *
++ */
++
++#include <linux/sysfs.h>
++#include "morse.h"
++#include "sysfs.h"
++#include "debug.h"
++
++static ssize_t board_type_show(struct device *dev,
++					   struct device_attribute *attr,
++					   char *buf)
++{
++	struct morse *mors = dev_get_drvdata(dev);
++
++	if (!mors)
++		return -EINVAL;
++
++	if (mors->board_id < 0)
++		return mors->board_id;
++
++#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
++	return sysfs_emit(buf, "%d\n", mors->board_id);
++#else
++	return snprintf(buf, PAGE_SIZE, "%d\n", mors->board_id);
++#endif
++}
++
++static DEVICE_ATTR_RO(board_type);
++
++int morse_sysfs_init(struct morse *mors)
++{
++	int ret;
++
++	ret = device_create_file(mors->dev, &dev_attr_board_type);
++	if (ret < 0)
++		MORSE_ERR(mors, "failed to create sysfs file board_type");
++
++	return ret;
++}
++
++void morse_sysfs_free(struct morse *mors)
++{
++	device_remove_file(mors->dev, &dev_attr_board_type);
++}
+Index: morse_driver-rel_1_12_3_2024_May_23/sysfs.h
+===================================================================
+--- /dev/null
++++ morse_driver-rel_1_12_3_2024_May_23/sysfs.h
+@@ -0,0 +1,9 @@
++/*
++ * Copyright 2024 Morse Micro
++ *
++ */
++
++#pragma once
++
++int morse_sysfs_init(struct morse *mors);
++void morse_sysfs_free(struct morse *mors);
diff --git a/feeds/morse/kernel/mm61xx/patches/010-fix-sdio-error.patch b/feeds/morse/kernel/mm61xx/patches/010-fix-sdio-error.patch
new file mode 100644
index 000000000..9e8850055
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/patches/010-fix-sdio-error.patch
@@ -0,0 +1,13 @@
+--- a/sdio.c
++++ b/sdio.c
+@@ -587,9 +587,5 @@ static int morse_sdio_reset(int reset_pi
+	sdio_claim_host(func);
+	sdio_disable_func(func);
+-#if KERNEL_VERSION(5, 18, 0) > MAC80211_VERSION_CODE
+	mmc_hw_reset(func->card->host);
+-#else
+-	mmc_hw_reset(func->card);
+-#endif
+	sdio_enable_func(func);
+	sdio_release_host(func);
+
diff --git a/feeds/morse/kernel/mm61xx/patches/011-update-spi.patch b/feeds/morse/kernel/mm61xx/patches/011-update-spi.patch
new file mode 100644
index 000000000..fdfedf953
--- /dev/null
+++ b/feeds/morse/kernel/mm61xx/patches/011-update-spi.patch
@@ -0,0 +1,73 @@
+--- a/spi.c	2025-01-10 18:08:57.753837165 +0800
++++ b/spi.c	2025-01-13 14:17:01.746850459 +0800
+@@ -1057,7 +1057,7 @@ static irqreturn_t morse_spi_irq_handler
+	struct morse *mors = spi_get_drvdata(mspi->spi);
+
+	MORSE_WARN_ON(FEATURE_ID_SPI, !mors);
+-	if (irq == gpio_to_irq(mors->cfg->mm_spi_irq_gpio)) {
++
+		/*
+		 * If we are using edge interrupts, we need to continuously service the IRQ until
+		 * either the chip has cleared all its IRQ bits, or the pin goes high again.
+@@ -1067,8 +1067,7 @@ static irqreturn_t morse_spi_irq_handler
+		} while (spi_use_edge_irq && ret && !gpio_get_value(mors->cfg->mm_spi_irq_gpio));
+
+		return IRQ_HANDLED;
+-	}
+-	return IRQ_NONE;
++
+ }
+
+ static void morse_spi_enable_irq(struct morse_spi *mspi)
+@@ -1311,10 +1310,15 @@ static int morse_spi_probe(struct spi_de
+		ret = morse_spi_cmd(mspi, SD_IO_MORSE_INIT, 0x00000000);
+		if (!ret)
+			break;
+-		pr_info("%s: SD_IO_RESET\n", __func__);
++		MORSE_DBG(mors, "%s: SD_IO_RESET\n", __func__);
+		morse_spi_cmd(mspi, SD_IO_RESET, 0x00000000);
+	}
+
++	if (ret) {
++		MORSE_SPI_ERR(mors, "failed initialise SPI: %d\n", ret);
++		goto err_cfg;
++	}
++
+	ret = morse_chip_cfg_detect_and_init(mors, mors_chip_series);
+	if (ret) {
+		MORSE_SPI_ERR(mors, "morse_chip_cfg_detect_and_init failed: %d\n", ret);
+@@ -1327,7 +1331,11 @@ static int morse_spi_probe(struct spi_de
+	mors->cfg->mm_ps_gpios_supported = true;
+	ret = morse_spi_reg32_read(mors, MORSE_REG_CHIP_ID(mors), &mors->chip_id);
+
+-	if (!ret) {
++	if (ret) {
++		MORSE_SPI_ERR(mors, "failed to read chip id: %d\n", ret);
++		goto err_cfg;
++	}
++
+		/* Find out if the chip id matches our records */
+		if (!morse_hw_is_valid_chip_id(mors->chip_id, mors->cfg->valid_chip_ids)) {
+			MORSE_SPI_ERR(mors, "%s Morse chip (ChipId=0x%x) not supported\n",
+@@ -1357,9 +1365,6 @@ static int morse_spi_probe(struct spi_de
+								mspi->inter_block_delay_bytes);
+			}
+		}
+-	} else {
+-		goto err_cfg;
+-	}
+
+	MORSE_SPI_INFO(mors, "Morse Micro SPI device found, chip ID=0x%04x\n", mors->chip_id);
+	MORSE_SPI_INFO(mors, "Board serial: %s\n", mors->board_serial);
+@@ -1442,6 +1447,11 @@ static int morse_spi_probe(struct spi_de
+ #ifdef CONFIG_MORSE_ENABLE_TEST_MODES
+	if (test_mode == MORSE_CONFIG_TEST_MODE_BUS)
+		ret = morse_bus_test(mors, "SPI");
++
++	if (test_mode == MORSE_CONFIG_TEST_MODE_BUS_PROFILE) {
++		morse_bus_throughput_profiler(mors);
++		morse_spi_disable_irq(mspi);
++	}
+ #endif
+ 
+ 	return ret;
diff --git a/feeds/morse/kernel/morse-fw/LICENSE.binaries b/feeds/morse/kernel/morse-fw/LICENSE.binaries
new file mode 100644
index 000000000..adf90750d
--- /dev/null
+++ b/feeds/morse/kernel/morse-fw/LICENSE.binaries
@@ -0,0 +1,125 @@
+                                  MORSE MICRO
+                     BINARY DISTRIBUTION LICENSE AGREEMENT
+
+1. Parties.
+This Software License Agreement (SLA) is between Morse Micro Pty. Ltd. and the
+user of the Software set forth (“you”, “user”, “customer”), and is effective as
+of the date of first access or download of the software by you. Morse Micro is
+licensing this software to you free of charge upon the condition that you
+accept all the terms of this SLA and only use this Software in conjunction with
+Morse Micro products. ANY USE, REPRODUCTION, OR DISTRIBUTION OF THE SOFTWARE
+CONSTITUTES YOUR ACCEPTANCE OF THIS AGREEMENT.
+
+2. Definitions.
+"Software" means any binary or source code that you have received from Morse
+Micro or its authorized licensees and/or those portions of such software
+produced by Program’s code within the Software, as well as any other machine
+readable materials (including, but not limited to, libraries, source files,
+header files, and data files), any updates or error corrections provided by
+Morse Micro, and any user manuals, programming guides and other documentation
+provided to you by Morse Micro under this SLA.
+
+3. License and Restrictions.
+Morse Micro grants you a non-exclusive, non-transferable, limited license
+without license fees to:
+
+    a. use the software solely with a hardware product that includes one of the
+    Morse Micro Wi-Fi HaLow chips, including
+    wireless modules or evaluation kits;
+
+    b. to reproduce and distribute the Software complete, unmodified, and as
+    provided by Morse Micro, solely for use with a hardware product that
+    includes one of the Morse Micro Wi-Fi HaLow chips, including wireless
+    modules or evaluation kits.
+
+4. Reservation of Rights.
+You should distribute Software with a copy of this SLA. Software is
+copyrighted. Title to Software and all associated intellectual property rights
+is retained by Morse Micro. Except as expressly provided herein, no license or
+right, express or implied, is hereby conveyed or granted to you by Morse Micro.
+You must retain all copyright notices on all Software, derivative works and
+documentation. The intellectual property and proprietary rights of whatever
+nature in the Software and derivative works are and will remain the exclusive
+property of Morse Micro or its suppliers. Nothing in this Agreement should be
+construed as transferring any aspects of such rights to you or any third party.
+Morse Micro and its suppliers reserve any and all rights not expressly granted
+in this Agreement. You may not sell, assign, sublicense, lease, or otherwise
+transfer any part of this license. You must not:
+
+    a. use, license, sell or otherwise distribute the Software except as
+    provided in this SLA;
+
+    b. attempt to modify in any way, reverse engineer, decompile or disassemble
+    any portion of the Software;
+
+    c. use the Software or other material in violation of any applicable law or
+    regulation, including but not limited to any regulatory agency.
+
+5. Ownership.
+The Software is licensed and not sold.  Title to and ownership of the Software,
+including all intellectual property rights thereto, and any portion thereof
+remain with Morse Micro or its licensors. You hereby covenant that you will not
+assert any claim that the Software created by or for Morse Micro infringe any
+intellectual property right owned or controlled by you.
+
+6. Termination.
+This SLA will terminate immediately without notice from Morse Micro if you fail
+to comply with any of its provisions, including the export laws provisions and
+Section 10 that may govern the export of the Software from certain
+jurisdictions, including technical data.
+
+7. Disclaimer and Limitation of Liability.
+THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. MORSE MICRO
+FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT
+LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE OR NON-INFRINGEMENT. IN NO EVENT SHALL MORSE MICRO BE LIABLE FOR ANY
+INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES
+FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD
+PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF MORSE MICRO HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THE SOFTWARE IS NOT INTENDED FOR
+USE IN ENVIRONMENTS OR APPLICATIONS WHERE EXTRAORDINARILY HIGH LEVELS OF
+QUALITY, RELIABILITY, AND FAILURE TOLERANCE ARE DEMANDED, AND/OR WHERE A
+MALFUNCTION OR FAILURE COULD LEAD TO SIGNIFICANT HARM TO LIFE, HEALTH,
+PROPERTY, OR RESULT IN SEVERE SOCIETAL REPERCUSSIONS ("CRITICAL APPLICATIONS").
+CRITICAL APPLICATIONS ENCOMPASS, BUT ARE NOT LIMITED TO, EQUIPMENT UTILIZED IN
+NUCLEAR FACILITIES, AVIATION AND SPACE EQUIPMENT, MEDICAL DEVICES, AUTOMOTIVE,
+TRAIN, MARINE, AND OTHER TRANSPORTATION EQUIPMENT, DEVICES INVOLVED IN
+CONTROLLING COMBUSTION OR EXPLOSIONS, SAFETY DEVICES, ELEVATORS AND ESCALATORS,
+DEVICES ASSOCIATED WITH ELECTRIC POWER, AND EQUIPMENT USED IN FINANCE-RELATED
+FIELDS.
+
+8. Survival.
+Sections 4, 5, 6, 7 and 10 will survive termination or expiration of this SLA.
+
+9. Privacy.
+Some features of the Software, if activated, may transmit a limited amount of
+data to Morse Micro (or its service provider) about the status of the system
+before a crash event. Morse Micro does not associate the data with personally
+identifiable information.
+
+10. Export Laws.
+YOU UNDERSTAND AND AGREE THAT THE SOFTWARE IS SUBJECT TO ALL APPLICABLE EXPORT-
+RELATED LAWS AND REGULATIONS AND THAT YOU MAY NOT EXPORT, RE-EXPORT OR TRANSFER
+THE SOFTWARE OR ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER
+THOSE LAWS. WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT, OR TRANSFER OF
+THE SOFTWARE TO CUBA, IRAN, NORTH KOREA, SUDAN, AND SYRIA IS PROHIBITED.
+
+11. Governing Law.
+The laws of New South Wales, Australia, govern all matters arising out of or
+relating to this SLA without giving effect to any conflict of law principles.
+If any provision of this SLA is held to be unenforceable, this SLA will remain
+in effect with the provision omitted, unless omission would frustrate the
+intent of the parties, in which case this Agreement will immediately terminate.
+
+12. Entire Agreement.
+This Agreement constitutes the entire agreement between the parties and
+supersedes all prior and contemporaneous agreements, proposals or
+representations, written or oral, concerning its subject matter. No
+modification, amendment, or waiver of any provision of this Agreement will be
+effective unless in writing and either signed or accepted electronically by the
+party against whom the modification, amendment or waiver is to be asserted. A
+waiver of any breach under this Agreement does not constitute a waiver of any
+other breach or future breach.
+
+
+MORSE MICRO
diff --git a/feeds/morse/kernel/morse-fw/Makefile b/feeds/morse/kernel/morse-fw/Makefile
new file mode 100644
index 000000000..fbef9b7a6
--- /dev/null
+++ b/feeds/morse/kernel/morse-fw/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright 2022 Morse Micro
+#
+# This is free software, licensed under the MIT License.
+#
+# This package installs Morse Micro firmware binaries, which are
+# distributed under the Morse Micro Binary Distribution License.
+# This license is available in LICENSE.binaries.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=morse-fw
+PKG_RELEASE=2
+
+PKG_VERSION:=rel_1_11_4_2024_Jul_09
+
+PKG_SOURCE:=morsemicro-fw-rel_1_11_4_2024_Jul_09.tar
+PKG_SOURCE_URL:=https://github.com/MorseMicro/firmware_binaries/releases/download/v1.11.4/
+PKG_HASH:=6df1e39655278adf140776b3e76b8faced41828a9d482363aed0795e96f5d241
+
+PKG_MAINTAINER:=Morse Micro <info@morsemicro.com>
+PKG_BUILD_PARALLEL:=1
+
+RSTRIP:=:
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/morse-fw
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  URL:=$(PKG_SOURCE_URL)
+  TITLE:=Morse Micro WIFI HaLow firmware
+  PROVIDES:=morse-fw
+endef
+
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+define Build/Compile
+
+endef
+
+define Package/morse-fw/install
+	$(INSTALL_DIR) $(1)/lib/firmware/morse/.
+	if [ -e ./files/lib/firmware/morse/mm6108.bin ]; then \
+		$(INSTALL_DATA) ./files/lib/firmware/morse/mm6108.bin $(1)/lib/firmware/morse/; \
+	else \
+		$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/firmware/morse/mm6108.bin $(1)/lib/firmware/morse/; \
+	fi
+endef
+
+$(eval $(call BuildPackage,morse-fw))
diff --git a/feeds/morse/kernel/morse-fw/morsemicro-fw-rel_1_11_4_2024_Jul_09.tar b/feeds/morse/kernel/morse-fw/morsemicro-fw-rel_1_11_4_2024_Jul_09.tar
new file mode 100644
index 000000000..43663761e
Binary files /dev/null and b/feeds/morse/kernel/morse-fw/morsemicro-fw-rel_1_11_4_2024_Jul_09.tar differ
diff --git a/feeds/morse/kernel/morse-fw/morsemicro-fw-rel_1_12_4_2024_Jun_11.tar b/feeds/morse/kernel/morse-fw/morsemicro-fw-rel_1_12_4_2024_Jun_11.tar
new file mode 100644
index 000000000..9dc88f9a0
Binary files /dev/null and b/feeds/morse/kernel/morse-fw/morsemicro-fw-rel_1_12_4_2024_Jun_11.tar differ
diff --git a/feeds/morse/morse-regdb/Makefile b/feeds/morse/morse-regdb/Makefile
new file mode 100644
index 000000000..8222ec02a
--- /dev/null
+++ b/feeds/morse/morse-regdb/Makefile
@@ -0,0 +1,68 @@
+#
+# Copyright 2023 Morse Micro
+#
+# This is free software, licensed under the 3-Clause BSD License.
+#
+
+# Because the contents of morse_regdb are private, this package does
+# some tricky things to _avoid_ downloading under normal circumstances,
+# instead using a cached file stored in this repository. If you'd like
+# to regenerate the cached file, do:
+#
+#   make package/morse-regdb/clean package/morse-regdb/download package/morse-regdb/compile V=sc REGENERATE=1
+#
+include $(TOPDIR)/rules.mk
+
+
+PKG_NAME:=morse-regdb
+PKG_RELEASE:=1
+PKG_BUILD_DEPENDS:=python3/host
+
+PKG_SOURCE_VERSION:=v2.1.1
+PKG_SOURCE_URL:=https://github.com/MorseMicro/morse_regdb.git
+PKG_SOURCE_PROTO:=git
+PKG_MIRROR_HASH:=0d074d2810f520c138427ab63ce0b8ab61f0f073cf7cd91177ad840a3322540a
+
+PKG_VERSION:=$(PKG_SOURCE_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+# Skip download unless REGENERATE is on.
+# This must occur after including package.mk, as PKG_SKIP_DOWNLOAD is defined there.
+PKG_SKIP_DOWNLOAD=$(USE_SOURCE_DIR)$(USE_GIT_TREE)$(USE_GIT_SRC_CHECKOUT)$(if $(REGENERATE),,1)
+
+define Package/morse-regdb
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Regulatory data for 802.11ah
+  URL:=https://bitbucket.org/morsemicro/morse_regdb/src/master/
+  PKGARCH:=all
+endef
+
+define Package/morse-regdb/description
+	Regulatory data for 802.11ah in a csv.
+endef
+
+define Build/Prepare
+	$(if $(REGENERATE),$(call Build/Prepare/Default))
+endef
+
+define Build/Compile
+	$(if $(REGENERATE),
+		mkdir -p artefacts
+		python3 $(PKG_BUILD_DIR)/regdbconverter.py -v -f csv $(PKG_BUILD_DIR)/regdb_Sub-1_GHz.tsv > artefacts/repo_channels.csv
+	)
+	mkdir -p $(PKG_BUILD_DIR)/artefacts
+	# Mash the 5g shim channels in.
+	python3 add_5g_shim_channels.py < artefacts/repo_channels.csv > $(PKG_BUILD_DIR)/artefacts/channels.csv
+endef
+
+define Package/morse-regdb/install
+	$(INSTALL_DIR) $(1)/usr/share/morse-regdb
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/artefacts/* $(1)/usr/share/morse-regdb
+	# Make channels.csv accessible from the web.
+	$(INSTALL_DIR) $(1)/www
+	ln -sf /usr/share/morse-regdb/channels.csv $(1)/www/halow-channels.csv
+endef
+
+$(eval $(call BuildPackage,morse-regdb))
diff --git a/feeds/morse/morse-regdb/add_5g_shim_channels.py b/feeds/morse/morse-regdb/add_5g_shim_channels.py
new file mode 100755
index 000000000..5c64cad23
--- /dev/null
+++ b/feeds/morse/morse-regdb/add_5g_shim_channels.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+
+
+import csv
+import sys
+
+# Fake 5g channels reported by netlink instead of 1g channels.
+S1G_TO_5G= {
+    1: 132,
+    2: 134,
+    3: 136,
+    4: 'NA',
+    5: 36,
+    6: 38,
+    7: 40,
+    8: 42,
+    9: 44,
+    10: 46,
+    11: 48,
+    12: 50,
+    13: 52,
+    14: 54,
+    15: 56,
+    16: 58,
+    17: 60,
+    18: 62,
+    19: 64,
+    20: 'NA',
+    21: 100,
+    22: 102,
+    23: 104,
+    24: 106,
+    25: 108,
+    26: 110,
+    27: 112,
+    28: 114,
+    29: 116,
+    30: 118,
+    31: 120,
+    32: 122,
+    33: 124,
+    34: 126,
+    35: 128,
+    36: 'NA',
+    37: 149,
+    38: 151,
+    39: 153,
+    40: 155,
+    41: 157,
+    42: 159,
+    43: 161,
+    44: 163,
+    45: 165,
+    46: 167,
+    47: 169,
+    48: 171,
+    49: 173,
+    50: 175,
+    51: 177,
+}
+
+# Japanese channels are... different.
+JAPAN_S1G_TO_5G = {
+    9: 108,
+    13: 36,
+    15: 40,
+    17: 44,
+    19: 48,
+    21: 64,
+    2: 38,
+    6: 46,
+    4: 54,
+    8: 62,
+    36: 42,
+    38: 58,
+}
+
+
+dr = csv.DictReader(sys.stdin)
+dw = csv.DictWriter(sys.stdout, dr.fieldnames + ['5g_chan'], lineterminator='\n')
+dw.writeheader()
+for row in dr:
+     m = JAPAN_S1G_TO_5G if row['country_code'] == 'JP' else S1G_TO_5G
+     row['5g_chan'] = m.get(int(row['s1g_chan']))
+
+     assert row['5g_chan'], f'Missing 5G chan map for Channel {row["s1g_chan"]} in {row["country_code"]}'
+
+     dw.writerow(row)
diff --git a/feeds/morse/morse-regdb/artefacts/repo_channels.csv b/feeds/morse/morse-regdb/artefacts/repo_channels.csv
new file mode 100644
index 000000000..0b8d4167b
--- /dev/null
+++ b/feeds/morse/morse-regdb/artefacts/repo_channels.csv
@@ -0,0 +1,473 @@
+country_code,bw,s1g_chan,s1g_op_class,global_op_class,centre_freq_mhz,duty_cycle_ap,duty_cycle_sta,country,tx_power_max,duty_cycle_omit_ctrl_resp,pkt_spacing_ms,airtime_min_ms,airtime_max_ms,usable_banff_c
+AL,1,1,6,66,863.5,10.0,2.8,Albania,16.13,False,0.0,0.0,0.0,1
+AL,1,3,6,66,864.5,10.0,2.8,Albania,16.13,False,0.0,0.0,0.0,1
+AL,1,5,6,66,865.5,10.0,2.8,Albania,16.13,False,0.0,0.0,0.0,1
+AL,1,7,6,66,866.5,10.0,2.8,Albania,16.13,False,0.0,0.0,0.0,1
+AL,1,9,6,66,867.5,10.0,2.8,Albania,16.13,False,0.0,0.0,0.0,1
+AR,1,27,1,68,915.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,29,1,68,916.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,31,1,68,917.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,33,1,68,918.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,35,1,68,919.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,37,1,68,920.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,39,1,68,921.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,41,1,68,922.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,43,1,68,923.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,45,1,68,924.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,47,1,68,925.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,49,1,68,926.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,1,51,1,68,927.5,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,2,30,2,69,917.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,2,34,2,69,919.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,2,38,2,69,921.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,2,42,2,69,923.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,2,46,2,69,925.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,2,50,2,69,927.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,4,32,3,70,918.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,4,40,3,70,922.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,4,48,3,70,926.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AR,8,44,4,71,924.0,100.0,100.0,Argentina,36.0,False,0.0,0.0,0.0,1
+AT,1,1,6,66,863.5,10.0,2.8,Austria,16.13,False,0.0,0.0,0.0,1
+AT,1,3,6,66,864.5,10.0,2.8,Austria,16.13,False,0.0,0.0,0.0,1
+AT,1,5,6,66,865.5,10.0,2.8,Austria,16.13,False,0.0,0.0,0.0,1
+AT,1,7,6,66,866.5,10.0,2.8,Austria,16.13,False,0.0,0.0,0.0,1
+AT,1,9,6,66,867.5,10.0,2.8,Austria,16.13,False,0.0,0.0,0.0,1
+AU,1,27,22,68,915.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,29,22,68,916.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,31,22,68,917.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,33,22,68,918.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,35,22,68,919.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,37,22,68,920.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,39,22,68,921.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,41,22,68,922.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,43,22,68,923.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,45,22,68,924.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,47,22,68,925.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,49,22,68,926.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,1,51,22,68,927.5,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,2,30,23,69,917.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,2,34,23,69,919.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,2,38,23,69,921.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,2,42,23,69,923.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,2,46,23,69,925.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,2,50,23,69,927.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,4,32,24,70,918.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,4,40,24,70,922.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,4,48,24,70,926.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+AU,8,44,25,71,924.0,100.0,100.0,Australia,30.0,False,0.0,0.0,0.0,1
+BA,1,1,6,66,863.5,10.0,2.8,Bosnia and Herzegovina,16.13,False,0.0,0.0,0.0,1
+BA,1,3,6,66,864.5,10.0,2.8,Bosnia and Herzegovina,16.13,False,0.0,0.0,0.0,1
+BA,1,5,6,66,865.5,10.0,2.8,Bosnia and Herzegovina,16.13,False,0.0,0.0,0.0,1
+BA,1,7,6,66,866.5,10.0,2.8,Bosnia and Herzegovina,16.13,False,0.0,0.0,0.0,1
+BA,1,9,6,66,867.5,10.0,2.8,Bosnia and Herzegovina,16.13,False,0.0,0.0,0.0,1
+BE,1,1,6,66,863.5,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,3,6,66,864.5,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,5,6,66,865.5,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,7,6,66,866.5,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,9,6,66,867.5,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,31,30,77,916.9,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,33,30,77,917.9,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BE,1,35,30,77,918.9,10.0,2.8,Belgium,16.13,False,0.0,0.0,0.0,1
+BG,1,1,6,66,863.5,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BG,1,3,6,66,864.5,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BG,1,5,6,66,865.5,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BG,1,7,6,66,866.5,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BG,1,9,6,66,867.5,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BG,1,33,30,77,917.9,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BG,1,35,30,77,918.9,10.0,2.8,Bulgaria,16.13,False,0.0,0.0,0.0,1
+BR,1,1,1,68,902.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,0
+BR,1,3,1,68,903.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,5,1,68,904.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,7,1,68,905.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,9,1,68,906.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,2,2,69,903.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,0
+BR,2,6,2,69,905.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,27,1,68,915.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,29,1,68,916.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,31,1,68,917.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,33,1,68,918.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,35,1,68,919.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,37,1,68,920.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,39,1,68,921.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,41,1,68,922.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,43,1,68,923.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,45,1,68,924.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,47,1,68,925.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,49,1,68,926.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,1,51,1,68,927.5,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,30,2,69,917.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,34,2,69,919.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,38,2,69,921.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,42,2,69,923.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,46,2,69,925.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,2,50,2,69,927.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,4,32,3,70,918.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,4,40,3,70,922.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,4,48,3,70,926.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+BR,8,44,4,71,924.0,100.0,100.0,Brazil,36.0,False,0.0,0.0,0.0,1
+CA,1,1,1,68,902.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,0
+CA,1,3,1,68,903.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,5,1,68,904.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,7,1,68,905.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,9,1,68,906.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,11,1,68,907.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,13,1,68,908.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,15,1,68,909.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,17,1,68,910.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,19,1,68,911.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,21,1,68,912.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,23,1,68,913.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,25,1,68,914.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,27,1,68,915.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,29,1,68,916.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,31,1,68,917.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,33,1,68,918.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,35,1,68,919.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,37,1,68,920.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,39,1,68,921.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,41,1,68,922.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,43,1,68,923.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,45,1,68,924.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,47,1,68,925.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,49,1,68,926.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,1,51,1,68,927.5,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,2,2,69,903.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,0
+CA,2,6,2,69,905.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,10,2,69,907.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,14,2,69,909.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,18,2,69,911.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,22,2,69,913.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,26,2,69,915.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,30,2,69,917.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,34,2,69,919.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,38,2,69,921.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,42,2,69,923.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,46,2,69,925.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,2,50,2,69,927.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,4,8,3,70,906.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,4,16,3,70,910.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,4,24,3,70,914.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,4,32,3,70,918.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,4,40,3,70,922.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,4,48,3,70,926.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,8,12,4,71,908.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,8,28,4,71,916.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CA,8,44,4,71,924.0,100.0,100.0,Canada,36.0,False,0.0,0.0,0.0,1
+CH,1,1,6,66,863.5,10.0,2.8,Switzerland,16.13,False,0.0,0.0,0.0,1
+CH,1,3,6,66,864.5,10.0,2.8,Switzerland,16.13,False,0.0,0.0,0.0,1
+CH,1,5,6,66,865.5,10.0,2.8,Switzerland,16.13,False,0.0,0.0,0.0,1
+CH,1,7,6,66,866.5,10.0,2.8,Switzerland,16.13,False,0.0,0.0,0.0,1
+CH,1,9,6,66,867.5,10.0,2.8,Switzerland,16.13,False,0.0,0.0,0.0,1
+CY,1,1,6,66,863.5,10.0,2.8,Cypress,16.13,False,0.0,0.0,0.0,1
+CY,1,3,6,66,864.5,10.0,2.8,Cypress,16.13,False,0.0,0.0,0.0,1
+CY,1,5,6,66,865.5,10.0,2.8,Cypress,16.13,False,0.0,0.0,0.0,1
+CY,1,7,6,66,866.5,10.0,2.8,Cypress,16.13,False,0.0,0.0,0.0,1
+CY,1,9,6,66,867.5,10.0,2.8,Cypress,16.13,False,0.0,0.0,0.0,1
+CZ,1,1,6,66,863.5,10.0,2.8,Czech Republic,16.13,False,0.0,0.0,0.0,1
+CZ,1,3,6,66,864.5,10.0,2.8,Czech Republic,16.13,False,0.0,0.0,0.0,1
+CZ,1,5,6,66,865.5,10.0,2.8,Czech Republic,16.13,False,0.0,0.0,0.0,1
+CZ,1,7,6,66,866.5,10.0,2.8,Czech Republic,16.13,False,0.0,0.0,0.0,1
+CZ,1,9,6,66,867.5,10.0,2.8,Czech Republic,16.13,False,0.0,0.0,0.0,1
+DD,1,1,6,66,863.5,10.0,2.8,Germany,16.13,False,0.0,0.0,0.0,1
+DD,1,3,6,66,864.5,10.0,2.8,Germany,16.13,False,0.0,0.0,0.0,1
+DD,1,5,6,66,865.5,10.0,2.8,Germany,16.13,False,0.0,0.0,0.0,1
+DD,1,7,6,66,866.5,10.0,2.8,Germany,16.13,False,0.0,0.0,0.0,1
+DD,1,9,6,66,867.5,10.0,2.8,Germany,16.13,False,0.0,0.0,0.0,1
+DK,1,1,6,66,863.5,10.0,2.8,Denmark,16.13,False,0.0,0.0,0.0,1
+DK,1,3,6,66,864.5,10.0,2.8,Denmark,16.13,False,0.0,0.0,0.0,1
+DK,1,5,6,66,865.5,10.0,2.8,Denmark,16.13,False,0.0,0.0,0.0,1
+DK,1,7,6,66,866.5,10.0,2.8,Denmark,16.13,False,0.0,0.0,0.0,1
+DK,1,9,6,66,867.5,10.0,2.8,Denmark,16.13,False,0.0,0.0,0.0,1
+EE,1,1,6,66,863.5,10.0,2.8,Estonia,16.13,False,0.0,0.0,0.0,1
+EE,1,3,6,66,864.5,10.0,2.8,Estonia,16.13,False,0.0,0.0,0.0,1
+EE,1,5,6,66,865.5,10.0,2.8,Estonia,16.13,False,0.0,0.0,0.0,1
+EE,1,7,6,66,866.5,10.0,2.8,Estonia,16.13,False,0.0,0.0,0.0,1
+EE,1,9,6,66,867.5,10.0,2.8,Estonia,16.13,False,0.0,0.0,0.0,1
+ES,1,1,6,66,863.5,10.0,2.8,Spain,16.13,False,0.0,0.0,0.0,1
+ES,1,3,6,66,864.5,10.0,2.8,Spain,16.13,False,0.0,0.0,0.0,1
+ES,1,5,6,66,865.5,10.0,2.8,Spain,16.13,False,0.0,0.0,0.0,1
+ES,1,7,6,66,866.5,10.0,2.8,Spain,16.13,False,0.0,0.0,0.0,1
+ES,1,9,6,66,867.5,10.0,2.8,Spain,16.13,False,0.0,0.0,0.0,1
+EU,1,1,6,66,863.5,10.0,2.8,EU,16.13,False,0.0,0.0,0.0,1
+EU,1,3,6,66,864.5,10.0,2.8,EU,16.13,False,0.0,0.0,0.0,1
+EU,1,5,6,66,865.5,10.0,2.8,EU,16.13,False,0.0,0.0,0.0,1
+EU,1,7,6,66,866.5,10.0,2.8,EU,16.13,False,0.0,0.0,0.0,1
+EU,1,9,6,66,867.5,10.0,2.8,EU,16.13,False,0.0,0.0,0.0,1
+FI,1,1,6,66,863.5,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FI,1,3,6,66,864.5,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FI,1,5,6,66,865.5,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FI,1,7,6,66,866.5,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FI,1,9,6,66,867.5,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FI,1,33,30,77,917.9,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FI,1,35,30,77,918.9,10.0,2.8,Finland,16.13,False,0.0,0.0,0.0,1
+FL,1,1,6,66,863.5,10.0,2.8,Liechtenstein,16.13,False,0.0,0.0,0.0,1
+FL,1,3,6,66,864.5,10.0,2.8,Liechtenstein,16.13,False,0.0,0.0,0.0,1
+FL,1,5,6,66,865.5,10.0,2.8,Liechtenstein,16.13,False,0.0,0.0,0.0,1
+FL,1,7,6,66,866.5,10.0,2.8,Liechtenstein,16.13,False,0.0,0.0,0.0,1
+FL,1,9,6,66,867.5,10.0,2.8,Liechtenstein,16.13,False,0.0,0.0,0.0,1
+FR,1,1,6,66,863.5,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+FR,1,3,6,66,864.5,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+FR,1,5,6,66,865.5,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+FR,1,7,6,66,866.5,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+FR,1,9,6,66,867.5,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+FR,1,33,30,77,917.9,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+FR,1,35,30,77,918.9,10.0,2.8,France,16.13,False,0.0,0.0,0.0,1
+GR,1,1,6,66,863.5,10.0,2.8,Greece,16.13,False,0.0,0.0,0.0,1
+GR,1,3,6,66,864.5,10.0,2.8,Greece,16.13,False,0.0,0.0,0.0,1
+GR,1,5,6,66,865.5,10.0,2.8,Greece,16.13,False,0.0,0.0,0.0,1
+GR,1,7,6,66,866.5,10.0,2.8,Greece,16.13,False,0.0,0.0,0.0,1
+GR,1,9,6,66,867.5,10.0,2.8,Greece,16.13,False,0.0,0.0,0.0,1
+HR,1,1,6,66,863.5,10.0,2.8,Croatia,16.13,False,0.0,0.0,0.0,1
+HR,1,3,6,66,864.5,10.0,2.8,Croatia,16.13,False,0.0,0.0,0.0,1
+HR,1,5,6,66,865.5,10.0,2.8,Croatia,16.13,False,0.0,0.0,0.0,1
+HR,1,7,6,66,866.5,10.0,2.8,Croatia,16.13,False,0.0,0.0,0.0,1
+HR,1,9,6,66,867.5,10.0,2.8,Croatia,16.13,False,0.0,0.0,0.0,1
+HU,1,1,6,66,863.5,10.0,2.8,Hungary,16.13,False,0.0,0.0,0.0,1
+HU,1,3,6,66,864.5,10.0,2.8,Hungary,16.13,False,0.0,0.0,0.0,1
+HU,1,5,6,66,865.5,10.0,2.8,Hungary,16.13,False,0.0,0.0,0.0,1
+HU,1,7,6,66,866.5,10.0,2.8,Hungary,16.13,False,0.0,0.0,0.0,1
+HU,1,9,6,66,867.5,10.0,2.8,Hungary,16.13,False,0.0,0.0,0.0,1
+IE,1,1,6,66,863.5,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,3,6,66,864.5,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,5,6,66,865.5,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,7,6,66,866.5,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,9,6,66,867.5,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,31,30,77,916.9,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,33,30,77,917.9,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IE,1,35,30,77,918.9,10.0,2.8,Ireland,16.13,False,0.0,0.0,0.0,1
+IN,1,5,6,66,865.5,10.0,2.8,India,16.13,False,0.0,0.0,0.0,1
+IN,1,7,6,66,866.5,10.0,2.8,India,16.13,False,0.0,0.0,0.0,1
+IN,1,9,6,66,867.5,10.0,2.8,India,16.13,False,0.0,0.0,0.0,1
+IS,1,1,6,66,863.5,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,3,6,66,864.5,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,5,6,66,865.5,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,7,6,66,866.5,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,9,6,66,867.5,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,31,30,77,916.9,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,33,30,77,917.9,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IS,1,35,30,77,918.9,10.0,2.8,Iceland,16.13,False,0.0,0.0,0.0,1
+IT,1,1,6,66,863.5,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+IT,1,3,6,66,864.5,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+IT,1,5,6,66,865.5,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+IT,1,7,6,66,866.5,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+IT,1,9,6,66,867.5,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+IT,1,33,30,77,917.9,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+IT,1,35,30,77,918.9,10.0,2.8,Italy,16.13,False,0.0,0.0,0.0,1
+JP,1,9,8,73,921.0,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,1,13,8,73,923.0,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,1,15,8,73,924.0,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,1,17,8,73,925.0,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,1,19,8,73,926.0,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,1,21,8,73,927.0,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,2,2,9,64,923.5,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,2,4,10,64,924.5,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,2,6,9,64,925.5,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,2,8,10,64,926.5,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,4,36,11,65,924.5,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+JP,4,38,12,65,925.5,10.0,10.0,Japan,16.0,True,2.0,2.0,100.0,1
+KE,1,1,6,66,863.5,10.0,2.8,Kenya,16.13,False,0.0,0.0,0.0,1
+KE,1,3,6,66,864.5,10.0,2.8,Kenya,16.13,False,0.0,0.0,0.0,1
+KE,1,5,6,66,865.5,10.0,2.8,Kenya,16.13,False,0.0,0.0,0.0,1
+KE,1,7,6,66,866.5,10.0,2.8,Kenya,16.13,False,0.0,0.0,0.0,1
+KE,1,9,6,66,867.5,10.0,2.8,Kenya,16.13,False,0.0,0.0,0.0,1
+KR,1,1,14,74,918.0,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,1,3,14,74,919.0,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,1,5,14,74,920.0,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,1,7,14,74,921.0,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,1,9,14,74,922.0,100.0,100.0,South Korea,10.0,False,50.0,0.0,4000.0,1
+KR,1,11,14,74,923.0,100.0,100.0,South Korea,10.0,False,50.0,0.0,4000.0,1
+KR,2,2,15,75,918.5,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,2,6,15,75,920.5,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,2,10,15,75,922.5,100.0,100.0,South Korea,10.0,False,50.0,0.0,4000.0,1
+KR,4,8,16,76,921.5,100.0,100.0,South Korea,4.77,False,50.0,0.0,4000.0,1
+KR,1,18,14,74,926.5,100.0,100.0,South Korea,17.0,False,0.264,0.0,220.0,0
+KR,1,20,14,74,927.5,100.0,100.0,South Korea,17.0,False,0.264,0.0,220.0,0
+KR,1,22,14,74,928.5,100.0,100.0,South Korea,17.0,False,0.264,0.0,220.0,0
+KR,1,24,14,74,929.5,100.0,100.0,South Korea,17.0,False,0.264,0.0,220.0,0
+KR,2,19,15,75,927.0,100.0,100.0,South Korea,20.0,False,0.264,0.0,220.0,0
+KR,2,23,15,75,929.0,100.0,100.0,South Korea,20.0,False,0.264,0.0,220.0,0
+LT,1,1,6,66,863.5,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,3,6,66,864.5,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,5,6,66,865.5,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,7,6,66,866.5,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,9,6,66,867.5,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,31,30,77,916.9,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,33,30,77,917.9,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LT,1,35,30,77,918.9,10.0,2.8,Lithuania,16.13,False,0.0,0.0,0.0,1
+LU,1,1,6,66,863.5,10.0,2.8,Luxembourg,16.13,False,0.0,0.0,0.0,1
+LU,1,3,6,66,864.5,10.0,2.8,Luxembourg,16.13,False,0.0,0.0,0.0,1
+LU,1,5,6,66,865.5,10.0,2.8,Luxembourg,16.13,False,0.0,0.0,0.0,1
+LU,1,7,6,66,866.5,10.0,2.8,Luxembourg,16.13,False,0.0,0.0,0.0,1
+LU,1,9,6,66,867.5,10.0,2.8,Luxembourg,16.13,False,0.0,0.0,0.0,1
+LV,1,1,6,66,863.5,10.0,2.8,Latvia,16.13,False,0.0,0.0,0.0,1
+LV,1,3,6,66,864.5,10.0,2.8,Latvia,16.13,False,0.0,0.0,0.0,1
+LV,1,5,6,66,865.5,10.0,2.8,Latvia,16.13,False,0.0,0.0,0.0,1
+LV,1,7,6,66,866.5,10.0,2.8,Latvia,16.13,False,0.0,0.0,0.0,1
+LV,1,9,6,66,867.5,10.0,2.8,Latvia,16.13,False,0.0,0.0,0.0,1
+MD,1,1,6,66,863.5,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,3,6,66,864.5,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,5,6,66,865.5,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,7,6,66,866.5,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,9,6,66,867.5,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,31,30,77,916.9,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,33,30,77,917.9,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MD,1,35,30,77,918.9,10.0,2.8,Moldova,16.13,False,0.0,0.0,0.0,1
+MK,1,1,6,66,863.5,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,3,6,66,864.5,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,5,6,66,865.5,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,7,6,66,866.5,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,9,6,66,867.5,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,31,30,77,916.9,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,33,30,77,917.9,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MK,1,35,30,77,918.9,10.0,2.8,North Macedonia,16.13,False,0.0,0.0,0.0,1
+MT,1,1,6,66,863.5,10.0,2.8,Malta,16.13,False,0.0,0.0,0.0,1
+MT,1,3,6,66,864.5,10.0,2.8,Malta,16.13,False,0.0,0.0,0.0,1
+MT,1,5,6,66,865.5,10.0,2.8,Malta,16.13,False,0.0,0.0,0.0,1
+MT,1,7,6,66,866.5,10.0,2.8,Malta,16.13,False,0.0,0.0,0.0,1
+MT,1,9,6,66,867.5,10.0,2.8,Malta,16.13,False,0.0,0.0,0.0,1
+NL,1,1,6,66,863.5,10.0,2.8,Netherlands,16.13,False,0.0,0.0,0.0,1
+NL,1,3,6,66,864.5,10.0,2.8,Netherlands,16.13,False,0.0,0.0,0.0,1
+NL,1,5,6,66,865.5,10.0,2.8,Netherlands,16.13,False,0.0,0.0,0.0,1
+NL,1,7,6,66,866.5,10.0,2.8,Netherlands,16.13,False,0.0,0.0,0.0,1
+NL,1,9,6,66,867.5,10.0,2.8,Netherlands,16.13,False,0.0,0.0,0.0,1
+NO,1,1,6,66,863.5,10.0,2.8,Norway,16.13,False,0.0,0.0,0.0,1
+NO,1,3,6,66,864.5,10.0,2.8,Norway,16.13,False,0.0,0.0,0.0,1
+NO,1,5,6,66,865.5,10.0,2.8,Norway,16.13,False,0.0,0.0,0.0,1
+NO,1,7,6,66,866.5,10.0,2.8,Norway,16.13,False,0.0,0.0,0.0,1
+NO,1,9,6,66,867.5,10.0,2.8,Norway,16.13,False,0.0,0.0,0.0,1
+NZ,1,27,26,68,915.5,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,1,29,26,68,916.5,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,1,31,26,68,917.5,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,1,33,26,68,918.5,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,1,35,26,68,919.5,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,1,37,26,68,920.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,39,26,68,921.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,41,26,68,922.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,43,26,68,923.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,45,26,68,924.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,47,26,68,925.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,49,26,68,926.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,1,51,26,68,927.5,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,2,30,27,69,917.0,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,2,34,27,69,919.0,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,2,38,27,69,921.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,2,42,27,69,923.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,2,46,27,69,925.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,2,50,27,69,927.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,4,32,28,70,918.0,100.0,100.0,New Zealand,30.0,False,0.0,0.0,0.0,1
+NZ,4,40,28,70,922.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,4,48,28,70,926.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+NZ,8,44,29,71,924.0,100.0,100.0,New Zealand,36.0,False,0.0,0.0,0.0,1
+PL,1,1,6,66,863.5,10.0,2.8,Poland,16.13,False,0.0,0.0,0.0,1
+PL,1,3,6,66,864.5,10.0,2.8,Poland,16.13,False,0.0,0.0,0.0,1
+PL,1,5,6,66,865.5,10.0,2.8,Poland,16.13,False,0.0,0.0,0.0,1
+PL,1,7,6,66,866.5,10.0,2.8,Poland,16.13,False,0.0,0.0,0.0,1
+PL,1,9,6,66,867.5,10.0,2.8,Poland,16.13,False,0.0,0.0,0.0,1
+PT,1,1,6,66,863.5,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,3,6,66,864.5,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,5,6,66,865.5,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,7,6,66,866.5,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,9,6,66,867.5,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,31,30,77,916.9,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,33,30,77,917.9,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+PT,1,35,30,77,918.9,10.0,2.8,Portugal,16.13,False,0.0,0.0,0.0,1
+RO,1,1,6,66,863.5,10.0,2.8,Romania,16.13,False,0.0,0.0,0.0,1
+RO,1,3,6,66,864.5,10.0,2.8,Romania,16.13,False,0.0,0.0,0.0,1
+RO,1,5,6,66,865.5,10.0,2.8,Romania,16.13,False,0.0,0.0,0.0,1
+RO,1,7,6,66,866.5,10.0,2.8,Romania,16.13,False,0.0,0.0,0.0,1
+RO,1,9,6,66,867.5,10.0,2.8,Romania,16.13,False,0.0,0.0,0.0,1
+SE,1,1,6,66,863.5,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,3,6,66,864.5,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,5,6,66,865.5,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,7,6,66,866.5,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,9,6,66,867.5,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,31,30,77,916.9,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,33,30,77,917.9,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SE,1,35,30,77,918.9,10.0,2.8,Sweden,16.13,False,0.0,0.0,0.0,1
+SG,1,7,17,66,866.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
+SG,1,9,17,66,867.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
+SG,1,11,17,66,868.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
+SG,2,10,19,67,868.0,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
+SG,1,37,18,68,920.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,1,39,18,68,921.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,1,41,18,68,922.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,1,43,18,68,923.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,1,45,18,68,924.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,2,38,20,69,921.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,2,42,20,69,923.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,4,40,21,70,922.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SI,1,1,6,66,863.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,3,6,66,864.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,5,6,66,865.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,7,6,66,866.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,9,6,66,867.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,31,30,77,916.9,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,33,30,77,917.9,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SI,1,35,30,77,918.9,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
+SK,1,1,6,66,863.5,10.0,2.8,Slovakia,16.13,False,0.0,0.0,0.0,1
+SK,1,3,6,66,864.5,10.0,2.8,Slovakia,16.13,False,0.0,0.0,0.0,1
+SK,1,5,6,66,865.5,10.0,2.8,Slovakia,16.13,False,0.0,0.0,0.0,1
+SK,1,7,6,66,866.5,10.0,2.8,Slovakia,16.13,False,0.0,0.0,0.0,1
+SK,1,9,6,66,867.5,10.0,2.8,Slovakia,16.13,False,0.0,0.0,0.0,1
+TR,1,1,6,66,863.5,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+TR,1,3,6,66,864.5,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+TR,1,5,6,66,865.5,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+TR,1,7,6,66,866.5,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+TR,1,9,6,66,867.5,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+TR,1,33,30,77,917.9,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+TR,1,35,30,77,918.9,10.0,2.8,Turkey,16.13,False,0.0,0.0,0.0,1
+UK,1,1,6,66,863.5,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+UK,1,3,6,66,864.5,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+UK,1,5,6,66,865.5,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+UK,1,7,6,66,866.5,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+UK,1,9,6,66,867.5,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+UK,1,33,30,77,917.9,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+UK,1,35,30,77,918.9,10.0,2.8,United Kingdom,16.13,False,0.0,0.0,0.0,1
+US,1,1,1,68,902.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,0
+US,1,3,1,68,903.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,5,1,68,904.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,7,1,68,905.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,9,1,68,906.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,11,1,68,907.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,13,1,68,908.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,15,1,68,909.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,17,1,68,910.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,19,1,68,911.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,21,1,68,912.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,23,1,68,913.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,25,1,68,914.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,27,1,68,915.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,29,1,68,916.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,31,1,68,917.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,33,1,68,918.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,35,1,68,919.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,37,1,68,920.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,39,1,68,921.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,41,1,68,922.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,43,1,68,923.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,45,1,68,924.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,47,1,68,925.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,49,1,68,926.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,1,51,1,68,927.5,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,2,2,69,903.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,0
+US,2,6,2,69,905.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,10,2,69,907.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,14,2,69,909.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,18,2,69,911.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,22,2,69,913.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,26,2,69,915.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,30,2,69,917.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,34,2,69,919.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,38,2,69,921.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,42,2,69,923.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,46,2,69,925.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,2,50,2,69,927.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,4,8,3,70,906.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,4,16,3,70,910.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,4,24,3,70,914.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,4,32,3,70,918.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,4,40,3,70,922.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,4,48,3,70,926.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,8,12,4,71,908.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,8,28,4,71,916.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
+US,8,44,4,71,924.0,100.0,100.0,USA,36.0,False,0.0,0.0,0.0,1
diff --git a/feeds/morse/morse-regdb/patches/001-add_column_usable_bannf_c.patch b/feeds/morse/morse-regdb/patches/001-add_column_usable_bannf_c.patch
new file mode 100644
index 000000000..0f97524d5
--- /dev/null
+++ b/feeds/morse/morse-regdb/patches/001-add_column_usable_bannf_c.patch
@@ -0,0 +1,36 @@
+From 6c0733b125434b846bec2a744a812c890c82518d Mon Sep 17 00:00:00 2001
+From: Takura Mapani <takura.mapani@morsemicro.com>
+Date: Tue, 19 Sep 2023 03:25:45 +0000
+Subject: [PATCH] Merged in APP-1819_add_usable_by_bannf_column (pull request
+ #17)
+
+APP-1819 add a new column usable bannfC for the csv output
+
+* added new column usable bannfC for the csv output
+
+
+Approved-by: Arien Judge
+Approved-by: David Goodall
+Approved-by: Matthew Forgie
+Approved-by: Thomas Flynn
+Approved-by: Matt Jervis
+---
+ regdbconverter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/regdbconverter.py b/regdbconverter.py
+index 883f281..4bd44b1 100755
+--- a/regdbconverter.py
++++ b/regdbconverter.py
+@@ -311,7 +311,7 @@ def _output_channels_python(channels, out_file, args):
+ 
+ def _output_channels_csv(channels, out_file, args):
+     fields = ['country_code', 'bw', 's1g_chan', 's1g_op_class', 'global_op_class', 'centre_freq_mhz', 'duty_cycle_ap', 'duty_cycle_sta',
+-              'country', 'tx_power_max', 'duty_cycle_omit_ctrl_resp', 'pkt_spacing_ms', 'airtime_min_ms', 'airtime_max_ms']
++              'country', 'tx_power_max', 'duty_cycle_omit_ctrl_resp', 'pkt_spacing_ms', 'airtime_min_ms', 'airtime_max_ms', 'usable_banff_c']
+ 
+     dw = DictWriter(out_file, fields, extrasaction='ignore', lineterminator='\n')
+     dw.writeheader()
+-- 
+2.25.1
+
diff --git a/feeds/morse/netifd-morse/Makefile b/feeds/morse/netifd-morse/Makefile
new file mode 100644
index 000000000..6a13c0fad
--- /dev/null
+++ b/feeds/morse/netifd-morse/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright 2022 Morse Micro
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=netifd-morse
+PKG_RELEASE=1
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Morse Micro <info@morsemicro.com>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/netifd-morse
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Morse Micro HaLow support for netifd
+  DEPENDS:= netifd \
+	+@BUSYBOX_CONFIG_USLEEP +@BUSYBOX_CONFIG_BASE64 +@BUSYBOX_CONFIG_XXD \
+	+kmod-morse +kmod-cfg80211 \
+	+morse-regdb +wpa_event_listener +wpa_supplicant_s1g +hostapd_s1g +morsecli
+endef
+
+define Build/Compile
+endef
+
+define Package/netifd-morse/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) ./lib/* $(1)/lib/
+	$(INSTALL_BIN) ./etc/init.d/halow-gpio-reset $(1)/etc/init.d/
+endef
+
+$(eval $(call BuildPackage,netifd-morse))
diff --git a/feeds/morse/netifd-morse/etc/init.d/halow-gpio-reset b/feeds/morse/netifd-morse/etc/init.d/halow-gpio-reset
new file mode 100755
index 000000000..08d1b48f9
--- /dev/null
+++ b/feeds/morse/netifd-morse/etc/init.d/halow-gpio-reset
@@ -0,0 +1,28 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=09
+
+. /lib/functions.sh
+. /lib/functions/uci-defaults.sh
+. /lib/functions/system.sh
+
+boot() {
+	. /lib/functions.sh
+	. /lib/functions/uci-defaults.sh
+	. /lib/functions/system.sh
+
+	board=$(board_name)
+
+	case "$board" in
+	edgecore,eap112)
+   
+		echo 486 > /sys/class/gpio/export
+		echo "out" > /sys/class/gpio/gpio486/direction
+		echo 0 > /sys/class/gpio/gpio486/value
+		sleep 1
+		echo "in" > /sys/class/gpio/gpio486/direction
+		echo 486 > /sys/class/gpio/unexport    
+
+	esac
+}
diff --git a/feeds/morse/netifd-morse/lib/netifd/morse/morse_overrides.sh b/feeds/morse/netifd-morse/lib/netifd/morse/morse_overrides.sh
new file mode 100644
index 000000000..f284c8a7f
--- /dev/null
+++ b/feeds/morse/netifd-morse/lib/netifd/morse/morse_overrides.sh
@@ -0,0 +1,1170 @@
+# netifd wireless implements _wdev_prepare_channel
+# which parses the band and hwmode config options before a drv_* function is called
+# for now, we override these with desired vals to avoid modifying netifd-wireless
+morse_band_override(){
+	band=s1g
+	hwmode=a
+}
+
+# Unlike the other morse functions, this doesn't override but instead
+# just adds some extra config options before the network definition.
+morse_wpa_supplicant_prepare_interface() {
+	local _ifname=$1
+	_wpa_supplicant_common $_ifname
+
+	json_get_vars sae_pwe multi_ap
+	json_get_values sae_group_list sae_group
+
+	[ "${multi_ap:=0}" -lt 1 ] && set_default sae_pwe 1
+
+	local pmf=
+	[ "${multi_ap:=0}" -eq 1 ] && pmf=2
+
+	cat >> "$_config" <<EOF
+ctrl_interface=/var/run/wpa_supplicant_s1g
+${sae_pwe:+sae_pwe=$sae_pwe}
+${sae_group_list:+sae_groups=$sae_group_list}
+${owe_group:+owe_group=$owe_group}
+${pmf:+pmf=$pmf}
+${vendor_keep_alive_offload:+vendor_keep_alive_offload=$vendor_keep_alive_offload}
+EOF
+	return 0
+}
+
+morse_override_wpa3_encryption() {
+	json_get_vars encryption
+	[ $encryption == "wpa3" ] &&  {
+		wpa_pairwise=CCMP
+		wpa_cipher=CCMP
+	}
+}
+
+morse_override_hostapd_set_bss_options() {
+	local var="$1"
+	local phy="$2"
+	local vif="$3"
+
+	wireless_vif_parse_encryption
+	morse_override_wpa3_encryption
+
+	local bss_conf bss_md5sum ft_key
+	local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt
+
+	json_get_vars \
+		wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_strict_rekey \
+		wpa_disable_eapol_key_retries tdls_prohibit \
+		maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
+		wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
+		wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
+		macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
+		iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
+		acct_secret acct_port acct_interval \
+		bss_load_update_period chan_util_avg_period sae_require_mfp \
+		multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key skip_inactivity_poll \
+		ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
+		multicast_to_unicast_all per_sta_vif \
+		eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
+		vendor_elements fils ocv \
+		wps_virtual_push_button \
+		beacon_int
+
+	json_get_values sae_group_list sae_group
+	json_get_values owe_group_list owe_group
+
+	set_default fils 0
+	set_default isolate 0
+	set_default maxassoc 0
+	set_default max_inactivity 0
+	set_default short_preamble 1
+	set_default disassoc_low_ack 1
+	set_default skip_inactivity_poll 0
+	set_default hidden 0
+	set_default wmm 1
+	set_default uapsd 1
+	set_default wpa_disable_eapol_key_retries 0
+	set_default tdls_prohibit 0
+	set_default eapol_version $((wpa & 1))
+	set_default acct_port 1813
+	set_default bss_load_update_period 60
+	set_default chan_util_avg_period 600
+	set_default utf8_ssid 1
+	set_default multi_ap 0
+	set_default ppsk 0
+	set_default airtime_bss_weight 0
+	set_default airtime_bss_limit 0
+	set_default eap_server 0
+	set_default wpa_group_rekey 604800
+	set_default beacon_int 100
+
+	/sbin/hostapd_s1g -vfils || fils=0
+
+	append bss_conf "ctrl_interface=/var/run/hostapd_s1g"
+	if [ "$isolate" -gt 0 ]; then
+		append bss_conf "ap_isolate=$isolate" "$N"
+	fi
+	if [ "$maxassoc" -gt 0 ]; then
+		append bss_conf "max_num_sta=$maxassoc" "$N"
+	fi
+	if [ "$max_inactivity" -gt 0 ]; then
+		append bss_conf "ap_max_inactivity=$max_inactivity" "$N"
+	fi
+
+	[ "$airtime_bss_weight" -gt 0 ] && append bss_conf "airtime_bss_weight=$airtime_bss_weight" "$N"
+	[ "$airtime_bss_limit" -gt 0 ] && append bss_conf "airtime_bss_limit=$airtime_bss_limit" "$N"
+	json_for_each_item append_airtime_sta_weight airtime_sta_weight
+
+	append bss_conf "bss_load_update_period=$bss_load_update_period" "$N"
+	append bss_conf "chan_util_avg_period=$chan_util_avg_period" "$N"
+	append bss_conf "disassoc_low_ack=$disassoc_low_ack" "$N"
+	append bss_conf "skip_inactivity_poll=$skip_inactivity_poll" "$N"
+	append bss_conf "preamble=$short_preamble" "$N"
+	append bss_conf "wmm_enabled=$wmm" "$N"
+	append bss_conf "ignore_broadcast_ssid=$hidden" "$N"
+	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
+	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
+	append bss_conf "multi_ap=$multi_ap" "$N"
+	append bss_conf "beacon_int=$beacon_int" "$N"
+	[ -n "$vendor_elements" ] && append bss_conf "vendor_elements=$vendor_elements" "$N"
+
+	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
+
+	[ "$wpa" -gt 0 ] && {
+		[ -n "$wpa_group_rekey"  ] && append bss_conf "wpa_group_rekey=$wpa_group_rekey" "$N"
+		[ -n "$wpa_pair_rekey"   ] && append bss_conf "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
+		[ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
+		[ -n "$wpa_strict_rekey" ] && append bss_conf "wpa_strict_rekey=$wpa_strict_rekey" "$N"
+	}
+
+	[ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
+
+	[ -n "$acct_interval" ] && \
+		append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
+	json_for_each_item append_acct_server acct_server
+	json_for_each_item append_radius_acct_req_attr radius_acct_req_attr
+
+	case "$auth_type" in
+		sae|owe|eap2|eap192)
+			set_default ieee80211w 2
+			set_default sae_require_mfp 1
+		;;
+		psk-sae|eap-eap2)
+			set_default ieee80211w 1
+			set_default sae_require_mfp 1
+		;;
+	esac
+	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
+
+	local vlan_possible=""
+
+	case "$auth_type" in
+		none|owe)
+			json_get_vars owe_transition_bssid owe_transition_ssid owe_transition_ifname
+
+			[ -n "$owe_transition_ssid" ] && append bss_conf "owe_transition_ssid=\"$owe_transition_ssid\"" "$N"
+			[ -n "$owe_transition_bssid" ] && append bss_conf "owe_transition_bssid=$owe_transition_bssid" "$N"
+			[ -n "$owe_transition_ifname" ] && append bss_conf "owe_transition_ifname=$owe_transition_ifname" "$N"
+
+			[ -n "$owe_group_list" ] && append bss_conf "owe_groups=$owe_group_list" "$N"
+
+			wps_possible=1
+			# Here we make the assumption that if we're in open mode
+			# with WPS enabled, we got to be in unconfigured state.
+			wps_not_configured=1
+		;;
+		psk|sae|psk-sae)
+			json_get_vars key wpa_psk_file
+			if [ "$auth_type" = "psk" ] && [ "$ppsk" -ne 0 ] ; then
+				json_get_vars auth_secret auth_port
+				set_default auth_port 1812
+				json_for_each_item append_auth_server auth_server
+				append bss_conf "macaddr_acl=2" "$N"
+				append bss_conf "wpa_psk_radius=2" "$N"
+			elif [ ${#key} -eq 64 ]; then
+				append bss_conf "wpa_psk=$key" "$N"
+			elif [ ${#key} -ge 8 ] && [ ${#key} -le 63 ]; then
+				append bss_conf "wpa_passphrase=$key" "$N"
+				# Workaround for SW-12231 (dpp hostapd_s1g bug)
+				append bss_conf "sae_password=${key}" "$N"
+			elif [ -n "$key" ] || [ -z "$wpa_psk_file" ]; then
+				wireless_setup_vif_failed INVALID_WPA_PSK
+				return 1
+			fi
+			[ -z "$wpa_psk_file" ] && set_default wpa_psk_file /var/run/hostapd-$ifname.psk
+			[ -n "$wpa_psk_file" ] && {
+				[ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
+				append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
+			}
+			[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
+
+			[ -n "$sae_group_list" ] && append bss_conf "sae_groups=$sae_group_list" "$N"
+
+			set_default dynamic_vlan 0
+			vlan_possible=1
+			wps_possible=1
+		;;
+		eap|eap2|eap-eap2|eap192)
+			json_get_vars \
+				auth_server auth_secret auth_port \
+				dae_client dae_secret dae_port \
+				dynamic_ownip ownip radius_client_addr \
+				eap_reauth_period request_cui \
+				erp_domain mobility_domain \
+				fils_realm fils_dhcp
+
+			# radius can provide VLAN ID for clients
+			vlan_possible=1
+
+			# This is the normal OpenWrt behaviour, but currently hostapd_s1g doesn't
+			# understand dynamic_ownip so we avoid setting it by default.
+			# set_default dynamic_ownip 1
+
+			# legacy compatibility
+			[ -n "$auth_server" ] || json_get_var auth_server server
+			[ -n "$auth_port" ] || json_get_var auth_port port
+			[ -n "$auth_secret" ] || json_get_var auth_secret key
+
+			[ "$fils" -gt 0 ] && {
+				set_default erp_domain "$mobility_domain"
+				set_default erp_domain "$(echo "$ssid" | md5sum | head -c 8)"
+				set_default fils_realm "$erp_domain"
+
+				append bss_conf "erp_send_reauth_start=1" "$N"
+				append bss_conf "erp_domain=$erp_domain" "$N"
+				append bss_conf "fils_realm=$fils_realm" "$N"
+				append bss_conf "fils_cache_id=$(echo "$fils_realm" | md5sum | head -c 4)" "$N"
+
+				[ "$fils_dhcp" = "*" ] && {
+					json_get_values network network
+					fils_dhcp=
+					for net in $network; do
+						fils_dhcp="$(ifstatus "$net" | jsonfilter -e '@.data.dhcpserver')"
+						[ -n "$fils_dhcp" ] && break
+					done
+
+					[ -z "$fils_dhcp" -a -n "$network_bridge" -a -n "$network_ifname" ] && \
+						fils_dhcp="$(udhcpc -B -n -q -s /lib/netifd/dhcp-get-server.sh -t 1 -i "$network_ifname" 2>/dev/null)"
+				}
+				[ -n "$fils_dhcp" ] && append bss_conf "dhcp_server=$fils_dhcp" "$N"
+			}
+
+			set_default auth_port 1812
+			set_default dae_port 3799
+			set_default request_cui 0
+
+			[ "$eap_server" -eq 0 ] && json_for_each_item append_auth_server auth_server
+
+			[ "$request_cui" -gt 0 ] && append bss_conf "radius_request_cui=$request_cui" "$N"
+			[ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
+
+			[ -n "$dae_client" -a -n "$dae_secret" ] && {
+				append bss_conf "radius_das_port=$dae_port" "$N"
+				append bss_conf "radius_das_client=$dae_client $dae_secret" "$N"
+			}
+			json_for_each_item append_radius_auth_req_attr radius_auth_req_attr
+
+			if [ -n "$ownip" ]; then
+				append bss_conf "own_ip_addr=$ownip" "$N"
+			elif [ "$dynamic_ownip" -gt 0 ]; then
+				append bss_conf "dynamic_own_ip_addr=$dynamic_ownip" "$N"
+			fi
+
+			[ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
+			append bss_conf "eapol_key_index_workaround=1" "$N"
+			append bss_conf "ieee8021x=1" "$N"
+
+			[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
+		;;
+		wep)
+			local wep_keyidx=0
+			json_get_vars key
+			hostapd_append_wep_key bss_conf
+			append bss_conf "wep_default_key=$wep_keyidx" "$N"
+			[ -n "$wep_rekey" ] && append bss_conf "wep_rekey_period=$wep_rekey" "$N"
+		;;
+	esac
+
+	case "$auth_type" in
+		none|owe|psk|sae|psk-sae|wep)
+			json_get_vars \
+			auth_server auth_port auth_secret \
+			ownip radius_client_addr
+
+			[ -n "$auth_server" ] &&  {
+				set_default auth_port 1812
+
+				json_for_each_item append_auth_server auth_server
+				[ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
+				[ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
+				append bss_conf "macaddr_acl=2" "$N"
+			}
+		;;
+	esac
+
+	local auth_algs="$((($auth_mode_shared << 1) | $auth_mode_open))"
+	append bss_conf "auth_algs=${auth_algs:-1}" "$N"
+	append bss_conf "wpa=$wpa" "$N"
+	[ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
+
+	set_default wps_pushbutton 0
+	set_default wps_label 0
+	set_default wps_pbc_in_m1 0
+	set_default wps_virtual_push_button 0
+
+	config_methods=
+	[ "$wps_pushbutton" -gt 0 ] && append config_methods push_button
+	[ "$wps_label" -gt 0 ] && append config_methods label
+	[ "$wps_virtual_push_button" -gt 0 ] && append config_methods virtual_push_button
+
+	# WPS not possible on Multi-AP backhaul-only SSID
+	[ "$multi_ap" = 1 ] && wps_possible=
+
+	[ -n "$wps_possible" -a -n "$config_methods" ] && {
+		set_default ext_registrar 0
+		set_default wps_device_type "6-0050F204-1"
+		set_default wps_device_name "OpenWrt AP"
+		set_default wps_manufacturer "www.openwrt.org"
+		set_default wps_independent 1
+
+		wps_state=2
+		[ -n "$wps_not_configured" ] && wps_state=1
+
+		[ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N"
+
+		append bss_conf "eap_server=1" "$N"
+		[ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N"
+		append bss_conf "wps_state=$wps_state" "$N"
+		append bss_conf "device_type=$wps_device_type" "$N"
+		append bss_conf "device_name=$wps_device_name" "$N"
+		append bss_conf "manufacturer=$wps_manufacturer" "$N"
+		append bss_conf "config_methods=$config_methods" "$N"
+		append bss_conf "wps_independent=$wps_independent" "$N"
+		[ -n "$wps_ap_setup_locked" ] && append bss_conf "ap_setup_locked=$wps_ap_setup_locked" "$N"
+		[ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N"
+		[ "$multi_ap" -gt 0 ] && [ -n "$multi_ap_backhaul_ssid" ] && {
+			append bss_conf "multi_ap_backhaul_ssid=\"$multi_ap_backhaul_ssid\"" "$N"
+			if [ -z "$multi_ap_backhaul_key" ]; then
+				:
+			elif [ ${#multi_ap_backhaul_key} -lt 8 ]; then
+				wireless_setup_vif_failed INVALID_WPA_PSK
+				return 1
+			elif [ ${#multi_ap_backhaul_key} -eq 64 ]; then
+				append bss_conf "multi_ap_backhaul_wpa_psk=$multi_ap_backhaul_key" "$N"
+			else
+				append bss_conf "multi_ap_backhaul_wpa_passphrase=$multi_ap_backhaul_key" "$N"
+			fi
+		}
+	}
+
+	append bss_conf "ssid=$ssid" "$N"
+	# AJ 26/05/2023: I've commented out the bridge= setting as it is causing our standard 
+	# bridged interface configuration to not function correctly. Further investigation will be required here
+	# as this setting is not any different to what the system does anyway if it's not set, and the documentation
+	# indicates it is optional...
+	#[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=" "$N"
+	[ -n "$iapp_interface" ] && {
+		local ifname
+		network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
+		append bss_conf "iapp_interface=$ifname" "$N"
+	}
+
+	json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
+	set_default bss_transition 0
+	set_default wnm_sleep_mode 1
+	set_default wnm_sleep_mode_no_keys 0
+
+	[ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
+	[ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
+	if [ "$wnm_sleep_mode" -eq "1" ]; then
+		append bss_conf "wnm_sleep_mode=1" "$N"
+		[ "$wnm_sleep_mode_no_keys" -eq "1" ] && append bss_conf "wnm_sleep_mode_no_keys=1" "$N"
+	fi
+	[ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"
+
+	json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report rnr
+	set_default ieee80211k 0
+	set_default rnr 0
+	if [ "$ieee80211k" -eq "1" ]; then
+		set_default rrm_neighbor_report 1
+		set_default rrm_beacon_report 1
+	else
+		set_default rrm_neighbor_report 0
+		set_default rrm_beacon_report 0
+	fi
+
+	[ "$rrm_neighbor_report" -eq "1" ] && append bss_conf "rrm_neighbor_report=1" "$N"
+	[ "$rrm_beacon_report" -eq "1" ] && append bss_conf "rrm_beacon_report=1" "$N"
+	[ "$rnr" -eq "1" ] && append bss_conf "rnr=1" "$N"
+
+	json_get_vars ftm_responder stationary_ap lci civic
+	set_default ftm_responder 0
+	if [ "$ftm_responder" -eq "1" ]; then
+		set_default stationary_ap 0
+		iw phy "$phy" info | grep -q "ENABLE_FTM_RESPONDER" && {
+			append bss_conf "ftm_responder=1" "$N"
+			[ "$stationary_ap" -eq "1" ] && append bss_conf "stationary_ap=1" "$N"
+			[ -n "$lci" ] && append bss_conf "lci=$lci" "$N"
+			[ -n "$civic" ] && append bss_conf "civic=$civic" "$N"
+		}
+	fi
+
+	if [ "$wpa" -ge "1" ]; then
+		json_get_vars ieee80211r
+		set_default ieee80211r 0
+
+		if [ "$ieee80211r" -gt "0" ]; then
+			json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
+
+			set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)"
+			set_default ft_over_ds 0
+			set_default reassociation_deadline 1000
+
+			case "$auth_type" in
+				psk|sae|psk-sae)
+					set_default ft_psk_generate_local 1
+				;;
+				*)
+					set_default ft_psk_generate_local 0
+				;;
+			esac
+
+			[ -n "$network_ifname" ] && append bss_conf "ft_iface=$network_ifname" "$N"
+			append bss_conf "mobility_domain=$mobility_domain" "$N"
+			append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
+			append bss_conf "ft_over_ds=$ft_over_ds" "$N"
+			append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
+
+			if [ "$ft_psk_generate_local" -eq "0" ]; then
+				json_get_vars r0_key_lifetime r1_key_holder pmk_r1_push
+				json_get_values r0kh r0kh
+				json_get_values r1kh r1kh
+
+				set_default r0_key_lifetime 10000
+				set_default pmk_r1_push 0
+
+				[ -n "$r0kh" -a -n "$r1kh" ] || {
+					ft_key=`echo -n "$mobility_domain/${auth_secret:-${key}}" | md5sum | awk '{print $1}'`
+
+					set_default r0kh "ff:ff:ff:ff:ff:ff,*,$ft_key"
+					set_default r1kh "00:00:00:00:00:00,00:00:00:00:00:00,$ft_key"
+				}
+
+				[ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
+				append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
+				append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
+
+				for kh in $r0kh; do
+					append bss_conf "r0kh=${kh//,/ }" "$N"
+				done
+				for kh in $r1kh; do
+					append bss_conf "r1kh=${kh//,/ }" "$N"
+				done
+			fi
+		fi
+		if [ "$fils" -gt 0 ]; then
+			json_get_vars fils_realm
+			set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
+		fi
+
+		append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
+
+		hostapd_append_wpa_key_mgmt
+		[ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
+	fi
+
+	if [ "$wpa" -ge "2" ]; then
+		if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
+			set_default auth_cache 1
+			append bss_conf "rsn_preauth=1" "$N"
+			append bss_conf "rsn_preauth_interfaces=$network_bridge" "$N"
+		else
+			case "$auth_type" in
+			sae|psk-sae|owe)
+				set_default auth_cache 1
+			;;
+			*)
+				set_default auth_cache 0
+			;;
+			esac
+		fi
+
+		append bss_conf "okc=$auth_cache" "$N"
+		[ "$auth_cache" = 0 -a "$fils" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
+
+		# RSN -> allow management frame protection
+		case "$ieee80211w" in
+			[012])
+				json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout
+				append bss_conf "ieee80211w=$ieee80211w" "$N"
+				[ "$ieee80211w" -gt "0" ] && {
+					if [ "$auth_type" = "eap192" ]; then
+						append bss_conf "group_mgmt_cipher=BIP-GMAC-256" "$N"
+					else
+						append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N"
+					fi
+					[ -n "$ieee80211w_max_timeout" ] && \
+						append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+					[ -n "$ieee80211w_retry_timeout" ] && \
+						append bss_conf "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+				}
+			;;
+		esac
+	fi
+
+	_macfile="/var/run/hostapd-$ifname.maclist"
+	case "$macfilter" in
+		allow)
+			append bss_conf "macaddr_acl=1" "$N"
+			append bss_conf "accept_mac_file=$_macfile" "$N"
+			# accept_mac_file can be used to set MAC to VLAN ID mapping
+			vlan_possible=1
+		;;
+		deny)
+			append bss_conf "macaddr_acl=0" "$N"
+			append bss_conf "deny_mac_file=$_macfile" "$N"
+		;;
+		*)
+			_macfile=""
+		;;
+	esac
+
+	[ -n "$_macfile" ] && {
+		json_get_vars macfile
+		json_get_values maclist maclist
+
+		rm -f "$_macfile"
+		(
+			for mac in $maclist; do
+				echo "$mac"
+			done
+			[ -n "$macfile" -a -f "$macfile" ] && cat "$macfile"
+		) > "$_macfile"
+	}
+
+	json_get_vars iw_enabled iw_internet iw_asra iw_esr iw_uesa iw_access_network_type
+	json_get_vars iw_hessid iw_venue_group iw_venue_type iw_network_auth_type
+	json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
+	json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
+	json_get_vars iw_venue_name iw_venue_url
+
+	set_default iw_enabled 0
+	if [ "$iw_enabled" = "1" ]; then
+		append bss_conf "interworking=1" "$N"
+		set_default iw_internet 1
+		set_default iw_asra 0
+		set_default iw_esr 0
+		set_default iw_uesa 0
+
+		append bss_conf "internet=$iw_internet" "$N"
+		append bss_conf "asra=$iw_asra" "$N"
+		append bss_conf "esr=$iw_esr" "$N"
+		append bss_conf "uesa=$iw_uesa" "$N"
+
+		[ -n "$iw_access_network_type" ] && \
+			append bss_conf "access_network_type=$iw_access_network_type" "$N"
+		[ -n "$iw_hessid" ] && append bss_conf "hessid=$iw_hessid" "$N"
+		[ -n "$iw_venue_group" ] && \
+			append bss_conf "venue_group=$iw_venue_group" "$N"
+		[ -n "$iw_venue_type" ] && append bss_conf "venue_type=$iw_venue_type" "$N"
+		[ -n "$iw_network_auth_type" ] && \
+			append bss_conf "network_auth_type=$iw_network_auth_type" "$N"
+		[ -n "$iw_gas_address3" ] && append bss_conf "gas_address3=$iw_gas_address3" "$N"
+
+		json_for_each_item append_iw_roaming_consortium iw_roaming_consortium
+		json_for_each_item append_iw_anqp_elem iw_anqp_elem
+		json_for_each_item append_iw_nai_realm iw_nai_realm
+		json_for_each_item append_iw_venue_name iw_venue_name
+		json_for_each_item append_iw_venue_url iw_venue_url
+
+		iw_domain_name_conf=
+		json_for_each_item append_iw_domain_name iw_domain_name
+		[ -n "$iw_domain_name_conf" ] && \
+			append bss_conf "domain_name=$iw_domain_name_conf" "$N"
+
+		iw_anqp_3gpp_cell_net_conf=
+		json_for_each_item append_iw_anqp_3gpp_cell_net iw_anqp_3gpp_cell_net
+		[ -n "$iw_anqp_3gpp_cell_net_conf" ] && \
+			append bss_conf "anqp_3gpp_cell_net=$iw_anqp_3gpp_cell_net_conf" "$N"
+	fi
+
+	set_default iw_qos_map_set 0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56
+	case "$iw_qos_map_set" in
+		*,*);;
+		*) iw_qos_map_set="";;
+	esac
+	[ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N"
+
+	local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
+		osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
+		hs20_t_c_server_url
+	json_get_vars hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
+		osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
+		hs20_t_c_server_url
+
+	set_default hs20 0
+	set_default disable_dgaf $hs20
+	set_default osen 0
+	set_default anqp_domain_id 0
+	set_default hs20_deauth_req_timeout 60
+	if [ "$hs20" = "1" ]; then
+		append bss_conf "hs20=1" "$N"
+		append_hs20_icons
+		append bss_conf "disable_dgaf=$disable_dgaf" "$N"
+		append bss_conf "osen=$osen" "$N"
+		append bss_conf "anqp_domain_id=$anqp_domain_id" "$N"
+		append bss_conf "hs20_deauth_req_timeout=$hs20_deauth_req_timeout" "$N"
+		[ -n "$osu_ssid" ] && append bss_conf "osu_ssid=$osu_ssid" "$N"
+		[ -n "$hs20_wan_metrics" ] && append bss_conf "hs20_wan_metrics=$hs20_wan_metrics" "$N"
+		[ -n "$hs20_operating_class" ] && append bss_conf "hs20_operating_class=$hs20_operating_class" "$N"
+		[ -n "$hs20_t_c_filename" ] && append bss_conf "hs20_t_c_filename=$hs20_t_c_filename" "$N"
+		[ -n "$hs20_t_c_timestamp" ] && append bss_conf "hs20_t_c_timestamp=$hs20_t_c_timestamp" "$N"
+		[ -n "$hs20_t_c_server_url" ] && append bss_conf "hs20_t_c_server_url=$hs20_t_c_server_url" "$N"
+		json_for_each_item append_hs20_oper_friendly_name hs20_oper_friendly_name
+		json_for_each_item append_hs20_conn_capab hs20_conn_capab
+		json_for_each_item append_osu_provider osu_provider
+		json_for_each_item append_operator_icon operator_icon
+	fi
+
+	if [ "$eap_server" = "1" ]; then
+		append bss_conf "eap_server=1" "$N"
+		append bss_conf "eap_server_erp=1" "$N"
+		[ -n "$eap_user_file" ] && append bss_conf "eap_user_file=$eap_user_file" "$N"
+		[ -n "$ca_cert" ] && append bss_conf "ca_cert=$ca_cert" "$N"
+		[ -n "$server_cert" ] && append bss_conf "server_cert=$server_cert" "$N"
+		[ -n "$private_key" ] && append bss_conf "private_key=$private_key" "$N"
+		[ -n "$private_key_passwd" ] && append bss_conf "private_key_passwd=$private_key_passwd" "$N"
+		[ -n "$server_id" ] && append bss_conf "server_id=$server_id" "$N"
+	fi
+
+	set_default multicast_to_unicast_all 0
+	if [ "$multicast_to_unicast_all" -gt 0 ]; then
+		append bss_conf "multicast_to_unicast=$multicast_to_unicast_all" "$N"
+	fi
+
+	set_default per_sta_vif 0
+	if [ "$per_sta_vif" -gt 0 ]; then
+		append bss_conf "per_sta_vif=$per_sta_vif" "$N"
+	fi
+
+	json_get_values opts hostapd_bss_options
+	for val in $opts; do
+		append bss_conf "$val" "$N"
+	done
+
+	json_get_vars $TX_Q_CONFIGS
+	set_default tx_queue_data3_aifs 7
+	set_default tx_queue_data3_cwmin 15
+	set_default tx_queue_data3_cwmax 1023
+	set_default tx_queue_data3_burst 15.0
+	
+	set_default tx_queue_data2_aifs 3
+	set_default tx_queue_data2_cwmin 15
+	set_default tx_queue_data2_cwmax 1023
+	set_default tx_queue_data2_burst 15.0
+
+	set_default tx_queue_data1_aifs 2
+	set_default tx_queue_data1_cwmin 7
+	set_default tx_queue_data1_cwmax 15
+	set_default tx_queue_data1_burst 15.0
+
+	set_default tx_queue_data0_aifs 2
+	set_default tx_queue_data0_cwmin 3
+	set_default tx_queue_data0_cwmax 7
+	set_default tx_queue_data0_burst 15.0
+
+	append bss_conf "$N# TX queue configs" "$N"
+	for opt in $TX_Q_CONFIGS; do
+		local val=$(eval "echo \${$opt}")
+		append bss_conf "$opt=$val" "$N"
+	done 
+	append bss_conf "# End of TX queue configs" "$N"
+	append bss_conf "$N"
+
+	json_get_vars $WMM_AC_CONFIGS
+	set_default tx_queue_data3_aifs 7
+	set_default tx_queue_data3_cwmin 15
+	set_default tx_queue_data3_cwmax 1023
+	set_default tx_queue_data3_burst 15.0
+	
+	set_default tx_queue_data2_aifs 3
+	set_default tx_queue_data2_cwmin 15
+	set_default tx_queue_data2_cwmax 1023
+	set_default tx_queue_data2_burst 15.0
+
+	set_default tx_queue_data1_aifs 2
+	set_default tx_queue_data1_cwmin 7
+	set_default tx_queue_data1_cwmax 15
+	set_default tx_queue_data1_burst 15.0
+
+	set_default tx_queue_data0_aifs 2
+	set_default tx_queue_data0_cwmin 3
+	set_default tx_queue_data0_cwmax 7
+	set_default tx_queue_data0_burst 15.0
+
+	set_default wmm_ac_bk_aifs 7
+	set_default wmm_ac_bk_cwmin 4
+	set_default wmm_ac_bk_cwmax 10
+	set_default wmm_ac_bk_txop_limit 469
+	set_default wmm_ac_bk_acm 0
+
+	set_default wmm_ac_be_aifs 3
+	set_default wmm_ac_be_cwmin 4
+	set_default wmm_ac_be_cwmax 10
+	set_default wmm_ac_be_txop_limit 469
+	set_default wmm_ac_be_acm 0
+
+	set_default wmm_ac_vi_aifs 2
+	set_default wmm_ac_vi_cwmin 3
+	set_default wmm_ac_vi_cwmax 4
+	set_default wmm_ac_vi_txop_limit 469
+	set_default wmm_ac_vi_acm 0
+
+	set_default wmm_ac_vo_aifs 2
+	set_default wmm_ac_vo_cwmin 2
+	set_default wmm_ac_vo_cwmax 3
+	set_default wmm_ac_vo_txop_limit 469
+	set_default wmm_ac_vo_acm 0
+
+	append bss_conf "# WMM parameters" "$N"
+	for opt in $WMM_AC_CONFIGS; do
+		local val=$(eval "echo \${$opt}")
+		append bss_conf "$opt=$val" "$N"
+	done 
+	append bss_conf "# End of WMM parameters" "$N"
+	append bss_conf "$N"
+
+
+	append "$var" "$bss_conf" "$N"
+	return 0
+}
+
+morse_override_wpa_supplicant_add_network() {
+	local ifname="$1"
+	local freq="$2"
+	local htmode="$3"
+	local noscan="$4"
+	local enable_sgi="$5"
+
+	_wpa_supplicant_common "$1"
+	wireless_vif_parse_encryption
+	morse_override_wpa3_encryption
+
+	json_get_vars \
+		ssid bssid key \
+		basic_rate mcast_rate \
+		ieee80211w ieee80211r fils ocv \
+		multi_ap dpp \
+		beacon_int
+
+	# Note that owe_group is a list in UCI, but the wpa supplicant conf file
+	# (unlike the hostapd one!) expects a single group rather than a list
+	# of preferences.
+	if json_is_a owe_group array
+	then
+		json_select owe_group
+		json_get_var owe_group 1
+		json_select ..
+	fi
+
+	[ -n "$ocv" ] && append bss_conf "ocv=$ocv" "$N"
+
+	case "$auth_type" in
+		sae|owe|eap2|eap192)
+			set_default ieee80211w 2
+		;;
+		psk-sae)
+			set_default ieee80211w 1
+		;;
+	esac
+
+	set_default ieee80211r 0
+	set_default multi_ap 0
+
+	local key_mgmt='NONE'
+	local network_data=
+	local T="	"
+
+	local scan_ssid="scan_ssid=1"
+	local freq wpa_key_mgmt
+
+	[ "$_w_mode" = "adhoc" ] && {
+		append network_data "mode=1" "$N$T"
+		[ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+		[ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
+
+		scan_ssid="scan_ssid=0"
+
+		[ "$_w_driver" = "nl80211" ] ||	append wpa_key_mgmt "WPA-NONE"
+
+		[ -n "$channel" ] && append network_data "channel=$channel" "$N$T"
+		[ -n "$op_class" ] && append network_data "op_class=$op_class" "$N$T"
+		[ -n "$country" ] && append network_data "country=\"$country\"" "$N$T"
+		[ -n "$s1g_prim_chwidth" ] && append network_data "s1g_prim_chwidth=$s1g_prim_chwidth" "$N$T"
+		[ -n "$s1g_prim_1mhz_chan_index" ] && append network_data "s1g_prim_1mhz_chan_index=$s1g_prim_1mhz_chan_index" "$N$T"
+
+		# Some preliminary testing shows our chip only seems to be able to support an open adhoc network
+		# This also appears to be backed up by the work to the bring up scripts used by software
+		# So for now, let's force none as an auth and warn.
+		case "$auth_type" in
+			none)
+			;;
+
+			*)
+				auth_type="none"
+				echo "adhoc currently only supports open networks. Forcing auth_type=none!"
+			;;
+		esac
+		set_default beacon_int 100
+	}
+
+	[ "$_w_mode" = "mesh" ] && {
+		json_get_vars mesh_id dtim_period encryption
+		[ -n "$mesh_id" ] && ssid="${mesh_id}"
+		[ -n "$mesh_max_peer_links" ] && append mesh_data "max_peer_links=${mesh_max_peer_links}" "$N"
+		[ -n "$mesh_plink_timeout" ] && append mesh_data "mesh_max_inactivity=${mesh_plink_timeout}" "$N"
+		[ -n "$mesh_fwding" ] && append mesh_data "mesh_fwding=${mesh_fwding}" "$N"
+
+		append network_data "mode=5" "$N$T"
+		[ -n "$channel" ] && append network_data "channel=$channel" "$N$T"
+		[ -n "$op_class" ] && append network_data "op_class=$op_class" "$N$T"
+		[ -n "$country" ] && append network_data "country=\"$country\"" "$N$T"
+		[ -n "$s1g_prim_chwidth" ] && append network_data "s1g_prim_chwidth=$s1g_prim_chwidth" "$N$T"
+		[ -n "$s1g_prim_1mhz_chan_index" ] && append network_data "s1g_prim_1mhz_chan_index=$s1g_prim_1mhz_chan_index" "$N$T"
+		[ -n "$dtim_period" ] && append network_data "dtim_period=$dtim_period" "$N$T"
+
+		[ -n "$mesh_rssi_threshold" ] && append network_data "mesh_rssi_threshold=${mesh_rssi_threshold}" "$N$T"
+		[ -n "$mesh_hwmp_rootmode" ] && append network_data "dot11MeshHWMPRootMode=${mesh_hwmp_rootmode}" "$N$T"
+		[ -n "$mesh_gate_announcements" ] && append network_data "dot11MeshGateAnnouncements=${mesh_gate_announcements}" "$N$T"
+		[ -n "$mbca_config" ] && append network_data "mbca_config=${mbca_config}" "$N$T"
+		[ -n "$mbca_min_beacon_gap_ms" ] && append network_data "mbca_min_beacon_gap_ms=${mbca_min_beacon_gap_ms}" "$N$T"
+		[ -n "$mbca_tbtt_adj_interval_sec" ] && append network_data "mbca_tbtt_adj_interval_sec=${mbca_tbtt_adj_interval_sec}" "$N$T"
+		[ -n "$mesh_beacon_timing_report_int" ] && append network_data "dot11MeshBeaconTimingReportInterval=${mesh_beacon_timing_report_int}" "$N$T"
+		[ -n "$mbss_start_scan_duration_ms" ] && append network_data "mbss_start_scan_duration_ms=${mbss_start_scan_duration_ms}" "$N$T"
+		[ -n "$mesh_beacon_less_mode" ] && append network_data "mesh_beaconless_mode=${mesh_beacon_less_mode}" "$N$T"
+		[ -n "$mesh_dynamic_peering" ] && append network_data "mesh_dynamic_peering=${mesh_dynamic_peering}" "$N$T"
+		[ -n "$mesh_rssi_margin" ] && append network_data "mesh_rssi_margin=${mesh_rssi_margin}" "$N$T"
+		[ -n "$mesh_blacklist_timeout" ] && append network_data "mesh_blacklist_timeout=${mesh_blacklist_timeout}" "$N$T"
+
+		[ "$encryption" = "none" -o -z "$encryption" ] || append wpa_key_mgmt "SAE"
+		scan_ssid=""
+		set_default beacon_int 1000
+
+		[ "$enable_sgi" = 0 ] && append network_data "disable_s1g_sgi=1" "$N$T"
+	}
+
+	[ "$multi_ap" = 1 -a "$_w_mode" = "sta" ] && append network_data "multi_ap_backhaul_sta=1" "$N$T"
+
+	[ -n "$ocv" ] && append network_data "ocv=$ocv" "$N$T"
+
+	case "$auth_type" in
+		none) ;;
+		owe)
+			hostapd_append_wpa_key_mgmt
+			key_mgmt="$wpa_key_mgmt"
+
+			[ -n "$owe_group" ] && append network_data "owe_group=$owe_group" "$N$T"
+		;;
+		wep)
+			local wep_keyidx=0
+			hostapd_append_wep_key network_data
+			append network_data "wep_tx_keyidx=$wep_keyidx" "$N$T"
+		;;
+		wps)
+			key_mgmt='WPS'
+		;;
+		psk|sae|psk-sae)
+			local passphrase
+
+			if [ "$_w_mode" != "mesh" ]; then
+				hostapd_append_wpa_key_mgmt
+			fi
+
+			key_mgmt="$wpa_key_mgmt"
+
+			if [ "$_w_mode" = "mesh" ] || [ "$auth_type" = "sae" ]; then
+				passphrase="sae_password=\"${key}\""
+			else
+				if [ ${#key} -eq 64 ]; then
+					passphrase="psk=${key}"
+				else
+					passphrase="psk=\"${key}\""
+				fi
+			fi
+			append network_data "$passphrase" "$N$T"
+		;;
+		eap|eap2|eap192)
+			hostapd_append_wpa_key_mgmt
+			key_mgmt="$wpa_key_mgmt"
+
+			json_get_vars eap_type identity anonymous_identity ca_cert ca_cert_usesystem
+
+			[ "$fils" -gt 0 ] && append network_data "erp=1" "$N$T"
+			if [ "$ca_cert_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then
+				append network_data "ca_cert=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T"
+			else
+				[ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"
+			fi
+			[ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T"
+			[ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T"
+			case "$eap_type" in
+				tls)
+					json_get_vars client_cert priv_key priv_key_pwd
+					# When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be commented out
+					if [ -n "$priv_key" ]; then
+						case "$priv_key" in
+							*".p12")
+								;;
+							*".pfx")
+								;;
+							*)
+								append network_data "client_cert=\"$client_cert\"" "$N$T"
+								;;
+						esac
+					fi
+					append network_data "private_key=\"$priv_key\"" "$N$T"
+					append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T"
+
+					json_get_vars subject_match
+					[ -n "$subject_match" ] && append network_data "subject_match=\"$subject_match\"" "$N$T"
+
+					json_get_values altsubject_match altsubject_match
+					if [ -n "$altsubject_match" ]; then
+						local list=
+						for x in $altsubject_match; do
+							append list "$x" ";"
+						done
+						append network_data "altsubject_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_match domain_match
+					if [ -n "$domain_match" ]; then
+						local list=
+						for x in $domain_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_suffix_match domain_suffix_match
+					if [ -n "$domain_suffix_match" ]; then
+						local list=
+						for x in $domain_suffix_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_suffix_match=\"$list\"" "$N$T"
+					fi
+				;;
+				fast|peap|ttls)
+					json_get_vars auth password ca_cert2 ca_cert2_usesystem client_cert2 priv_key2 priv_key2_pwd
+					set_default auth MSCHAPV2
+
+					if [ "$auth" = "EAP-TLS" ]; then
+						if [ "$ca_cert2_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then
+							append network_data "ca_cert2=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T"
+						else
+							[ -n "$ca_cert2" ] && append network_data "ca_cert2=\"$ca_cert2\"" "$N$T"
+						fi
+						append network_data "client_cert2=\"$client_cert2\"" "$N$T"
+						append network_data "private_key2=\"$priv_key2\"" "$N$T"
+						append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T"
+					else
+						append network_data "password=\"$password\"" "$N$T"
+					fi
+
+					json_get_vars subject_match
+					[ -n "$subject_match" ] && append network_data "subject_match=\"$subject_match\"" "$N$T"
+
+					json_get_values altsubject_match altsubject_match
+					if [ -n "$altsubject_match" ]; then
+						local list=
+						for x in $altsubject_match; do
+							append list "$x" ";"
+						done
+						append network_data "altsubject_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_match domain_match
+					if [ -n "$domain_match" ]; then
+						local list=
+						for x in $domain_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_suffix_match domain_suffix_match
+					if [ -n "$domain_suffix_match" ]; then
+						local list=
+						for x in $domain_suffix_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_suffix_match=\"$list\"" "$N$T"
+					fi
+
+					phase2proto="auth="
+					case "$auth" in
+						"auth"*)
+							phase2proto=""
+						;;
+						"EAP-"*)
+							auth="$(echo $auth | cut -b 5- )"
+							[ "$eap_type" = "ttls" ] &&
+								phase2proto="autheap="
+							json_get_vars subject_match2
+							[ -n "$subject_match2" ] && append network_data "subject_match2=\"$subject_match2\"" "$N$T"
+
+							json_get_values altsubject_match2 altsubject_match2
+							if [ -n "$altsubject_match2" ]; then
+								local list=
+								for x in $altsubject_match2; do
+									append list "$x" ";"
+								done
+								append network_data "altsubject_match2=\"$list\"" "$N$T"
+							fi
+
+							json_get_values domain_match2 domain_match2
+							if [ -n "$domain_match2" ]; then
+								local list=
+								for x in $domain_match2; do
+									append list "$x" ";"
+								done
+								append network_data "domain_match2=\"$list\"" "$N$T"
+							fi
+
+							json_get_values domain_suffix_match2 domain_suffix_match2
+							if [ -n "$domain_suffix_match2" ]; then
+								local list=
+								for x in $domain_suffix_match2; do
+									append list "$x" ";"
+								done
+								append network_data "domain_suffix_match2=\"$list\"" "$N$T"
+							fi
+						;;
+					esac
+					append network_data "phase2=\"$phase2proto$auth\"" "$N$T"
+				;;
+			esac
+			eap_type_data=$(echo $eap_type | tr 'a-z' 'A-Z')
+			append network_data "eap=$eap_type_data" "$N$T"
+		;;
+	esac
+
+	[ "$wpa_cipher" = GCMP ] && {
+		append network_data "pairwise=GCMP" "$N$T"
+		append network_data "group=GCMP" "$N$T"
+	}
+
+	[ "$wpa_cipher" = CCMP ] && append network_data "pairwise=CCMP" "$N$T"
+
+	[ "$mode" = mesh ] || {
+		case "$wpa" in
+			1)
+				[  ${multi_ap:=0} = 0 ] && append network_data "proto=WPA" "$N$T"
+			;;
+			2)
+				[ ${multi_ap:=0}  = 0 ] && append network_data "proto=RSN" "$N$T"
+			;;
+		esac
+	}
+
+	case "$ieee80211w" in
+		[012])
+			[ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
+		;;
+	esac
+
+	[ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
+	[ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
+
+	local bssid_blacklist bssid_whitelist
+	json_get_values bssid_blacklist bssid_blacklist
+	json_get_values bssid_whitelist bssid_whitelist
+
+	[ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T"
+	[ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T"
+
+	[ -n "$basic_rate" ] && {
+		local br rate_list=
+		for br in $basic_rate; do
+			wpa_supplicant_add_rate rate_list "$br"
+		done
+		[ -n "$rate_list" ] && append network_data "rates=$rate_list" "$N$T"
+	}
+
+	[ -n "$mcast_rate" ] && {
+		local mc_rate=
+		wpa_supplicant_add_rate mc_rate "$mcast_rate"
+		append network_data "mcast_rate=$mc_rate" "$N$T"
+	}
+
+	json_get_vars raw_sta_priority
+	[ -n "$raw_sta_priority" ] && append network_data "raw_sta_priority=$raw_sta_priority" "$N$T"
+
+	json_get_vars cac
+	[ -n "$cac" ] && append network_data "cac=$cac" "$N$T"
+
+	json_get_vars twt wake_interval min_wake_duration setup_command
+	twt_block=
+	if [ "${twt:=0}" -eq "1" ]; then
+		append twt_block "twt={" "$N$T$T"
+		append twt_block "wake_interval=${wake_interval:=300000000}" "$N$T$T"
+		append twt_block "min_wake_duration=${min_wake_duration:=65280}" "$N$T$T"
+		append twt_block "setup_command=${setup_command:=0}" "$N$T$T"
+		append twt_block "}" "$N$T"
+	fi
+
+	if [ "$multi_ap" -eq 1 ]; then
+		echo "wps_priority=1" >> "$_config"
+		echo "update_config=1"  >> "$_config"
+		#Adding obtained wps network credentials here to make it persistent
+		append network_data "proto=RSN" "$N$T"
+		if [ -z "$ssid" ]; then
+			echo "No creds in UCI to update network config"
+		else
+			wpa_add_network_block "multiap_bh" "$_config"
+		fi
+	elif [ "$dpp" = 1 ]; then
+		echo "update_config=1"  >> "$_config"
+		echo "ctrl_interface_group=0"  >> "$_config"
+		echo "dpp_config_processing=0"  >> "$_config"
+		echo "dpp_key=/etc/dpp_key.pem"  >> "$_config"
+		echo "dpp_chirp_forever=1"  >> "$_config"
+
+	else
+		wpa_add_network_block "sta" "$_config"
+	fi
+	return 0
+}
+
+
+# $1: network type (sta, multiap_bh, ...)
+# $2: output file
+wpa_add_network_block()
+{
+	local network_type=$1
+	local output_file=$2
+	case "$network_type" in
+		sta)
+			cat >> "$output_file" <<EOF
+$mesh_data
+network={
+	$scan_ssid
+	ssid="$ssid"
+	key_mgmt=$key_mgmt
+	$network_data
+	$twt_block
+}
+EOF
+		;;
+		multiap_bh)
+			cat >> "$_config" <<EOF
+network={
+	$scan_ssid
+	ssid="$ssid"
+	key_mgmt=$key_mgmt
+	$network_data
+	mesh_fwding=1
+}
+EOF
+	esac
+
+}
diff --git a/feeds/morse/netifd-morse/lib/netifd/morse/morse_utils.sh b/feeds/morse/netifd-morse/lib/netifd/morse/morse_utils.sh
new file mode 100644
index 000000000..4a74726c2
--- /dev/null
+++ b/feeds/morse/netifd-morse/lib/netifd/morse/morse_utils.sh
@@ -0,0 +1,161 @@
+kill_wait()
+{
+	local names=$*
+	local count=30
+
+	for pid in $(pidof $names)
+	do
+		kill $pid &> /dev/null
+	done
+
+	while pidof $names &> /dev/null;
+	do
+		usleep 100000
+		let "count--"
+		if [ $count -eq 0 ]
+		then
+			echo "$names failed to terminate normally, force quitting" >&2
+			kill -9 $(pidof $names)
+			return 1
+		fi
+	done
+	return 0
+}
+
+_list_phy_interfaces() {
+	local phy="$1"
+	if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then
+		ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null;
+	else
+		ls "/sys/class/ieee80211/${phy}/device" 2>/dev/null | grep net: | sed -e 's,net:,,g'
+	fi
+}
+
+list_phy_interfaces() {
+	local phy="$1"
+
+	for dev in $(_list_phy_interfaces "$phy"); do
+		readlink "/sys/class/net/${dev}/phy80211" | grep -q "/${phy}\$" || continue
+	done
+}
+
+num_test()
+{
+	case $1 in
+		''|*[!0-9]*)
+			return 1
+			;;
+		*)
+			;;
+	esac
+	return 0
+}
+
+_get_regulatory() {
+	local _mode=$1
+	local _country=$2
+	local _channel=$3
+	local _op_class=$4
+
+	local dc_min="0.01"
+	local dc_max="100.00"
+	local cc; local bw; local l_op; local g_op;
+	local freq; local dc_ap; local dc_sta;
+
+	oIFS=$IFS
+	HEADER=1
+	while IFS=, read -r cc bw ch l_op g_op freq remainder; do
+		if [ $HEADER = 1 ]; then
+			HEADER=0
+			continue
+		fi
+		num_test $bw
+		[ $? -eq 1 ] 		&& continue
+		num_test $ch
+		[ $? -eq 1 ] 		&& continue
+		num_test $l_op
+		[ $? -eq 1 ] 		&& continue
+		num_test $g_op
+		[ $? -eq 1 ] 		&& continue
+
+		if [ "$cc" == "$_country" ] && [ "$ch" -eq "$_channel" ]; then
+			if [ -z "$_op_class" ]; then
+				halow_bw=$bw
+				center_freq=$freq
+				# If you didn't pass op_class, set it from this data.
+				op_class="$g_op"
+				IFS=$oIFS
+				return 0;
+			elif [ "$l_op" -eq "$_op_class" ] || [ "$g_op" -eq "$_op_class" ]; then
+				halow_bw=$bw
+				center_freq=$freq
+				IFS=$oIFS
+				return 0;
+			fi
+		fi
+	done < /usr/share/morse-regdb/channels.csv
+
+	IFS=$oIFS
+	return 1;
+}
+
+
+morse_find_ifname()
+{
+	for file in "/sys/class/net/wlan"*;
+	do
+		if [ -d "$file"/device/morse ]
+		then
+			ifname=$(basename $file)
+			break
+		fi
+	done
+}
+
+# this function checks if an macaddr is burnt into the device.
+# if so, returns it, otherwise returns an empty string
+morse_get_chip_macaddr()
+{
+	ifname=
+	morse_find_ifname
+	local state=$(cat /sys/class/net/${ifname}/operstate 2>/dev/null)
+	[ $? -ne 0 ] && return
+
+	if [ "$state" == "down" ]; then
+		ip link set ${ifname} up
+		[ $? -ne 0 ] && return
+	fi
+
+	local chip_macaddr="$(morse_cli -i ${ifname} macaddr 2>/dev/null)"
+	[ $? -ne 0 ] && printf ""
+	chip_macaddr=${chip_macaddr##"Chip MAC address: "}
+
+	#make sure (using regex) that the we got a macaddr
+	if [[ "$chip_macaddr" =~ ^\([0-9A-Fa-f]{2}[:]\){5}\([0-9A-Fa-f]{2}\)$ ]]; then
+		[ "$chip_macaddr" = "00:00:00:00:00:00" ] && printf "" || printf "$chip_macaddr"
+	else
+		printf ""
+	fi
+
+	if [ "$state" == "down" ]; then
+		ip link set ${ifname} down
+	fi
+}
+
+update_dpp_qrcode()
+{
+	local uci_changes_path="$(mktemp -d)"
+	local private_key_path=$1
+	#remove ':' from the macaddress
+	local mac_address=$(echo "$2" | sed -r 's/://g')
+	#generate the public key string from the private key.
+	#unfortunately, there is no way to quiet the 'read EC key' messages without redirecting stderr.
+	local pubkey=$(openssl ec -in $private_key_path -pubout -conv_form compressed -outform DER 2> /dev/null | hexdump -e '16/1 "%02x " "\n"' | xxd -r -p | base64 -w0)
+	#save qrcode string into /www
+	qrencode --inline --8bit --type=SVG --output=/tmp/dpp_qrcode.svg "DPP:V:2;M:$mac_address;K:$pubkey;;"
+	#only write if necessary
+	if ! cmp -s /tmp/dpp_qrcode.svg /www/dpp_qrcode.svg; then
+		cp /tmp/dpp_qrcode.svg /www/dpp_qrcode.svg
+	fi
+	rm /tmp/dpp_qrcode.svg
+}
\ No newline at end of file
diff --git a/feeds/morse/netifd-morse/lib/netifd/morse/wpa_s1g_dpp_action.sh b/feeds/morse/netifd-morse/lib/netifd/morse/wpa_s1g_dpp_action.sh
new file mode 100755
index 000000000..b6597d087
--- /dev/null
+++ b/feeds/morse/netifd-morse/lib/netifd/morse/wpa_s1g_dpp_action.sh
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+. /lib/netifd/netifd-wireless.sh
+. /etc/diag.sh
+
+#returns 0 if config is complete
+is_config_complete()
+{
+    [ -z "$encryption" ] && return 1
+
+    #if encryption is sae, check if we have psk
+    if [ "$encryption" = "sae" ]; then
+        [ -z "$psk" ] && return 1
+    fi
+
+    #check if we have ssid
+    [ -z "$ssid" ] && return 1
+
+    return 0
+}
+
+get_uci_section()
+{
+    local target_iface=$1
+    local dpp_wifi_iface=
+
+    check_interface() {
+        json_get_vars section ifname
+        [ "$ifname" = "$target_iface" ] && [ -n "$section" ] && [ -z "$dpp_wifi_iface" ] && dpp_wifi_iface=$section
+    }
+
+    wireless_status=$(ubus call network.wireless status)
+
+    json_init
+    json_load "$wireless_status"
+    json_get_keys radios
+
+    for radio in $radios; do
+        json_select $radio
+        for_each_interface "sta" check_interface
+        json_select ..
+    done
+    echo "$dpp_wifi_iface"
+}
+
+save_and_reload()
+{
+    logger "Saving Received AP Credentials."
+    local uci_section=$(get_uci_section $iface_name)
+    if [ -z "$uci_section" ]; then
+        logger "FATAL: unable to find the correct wifi interface in configs."
+        exit 0
+    fi
+
+    uci set wireless.$uci_section.encryption="$encryption"
+
+    #if encryption is sae, check if we have psk
+    if [ "$encryption" = "sae" ]; then
+        uci set wireless.$uci_section.key="$psk"
+    fi
+
+    uci set wireless.$uci_section.ssid="$ssid"
+
+    uci set wireless.$uci_section.dpp='0'
+
+    uci commit
+    ubus call service event "{ \"type\": \"config.change\", \"data\": { \"package\": \"wireless\" }}"
+}
+
+# Do not name 'config'; will clash with uci functions.
+do_config() {
+    # convert password from hex string to string.
+    psk="$(echo "$psk" | xxd -r -p)"
+
+    # if the file contains all the necessary stuff, then save and reload.
+    is_config_complete && save_and_reload
+}
+
+failed() {
+    set_state dpp_failed
+}
+
+finished() {
+    set_state done
+}
+
+started() {
+    set_state dpp_started
+}
+
+case "$1" in
+    config)
+        do_config
+    ;;
+    failed)
+        failed
+    ;;
+    finished)
+        finished
+    ;;
+    started)
+        started
+    ;;
+    *)
+        echo "Usage: $0 {config|failed|finished|started}"
+        exit 1
+    ;;
+esac
diff --git a/feeds/morse/netifd-morse/lib/netifd/wireless/morse.sh b/feeds/morse/netifd-morse/lib/netifd/wireless/morse.sh
new file mode 100755
index 000000000..0019a38a1
--- /dev/null
+++ b/feeds/morse/netifd-morse/lib/netifd/wireless/morse.sh
@@ -0,0 +1,1097 @@
+#!/bin/sh
+
+echo "Adding device handler type: morse"
+
+. /lib/netifd/netifd-wireless.sh
+. /lib/netifd/hostapd_s1g.sh
+. /lib/netifd/morse/morse_overrides.sh
+. /lib/netifd/morse/morse_utils.sh
+
+echo "Configuring $3"
+init_wireless_driver "$@"
+
+MM_MOD_INT="watchdog_interval_secs max_rates max_rate_tries spi_clock_speed max_txq_len virtual_sta_max max_aggregation_count
+			default_cmd_timeout_ms sdio_reset_time tx_max_power_mbm max_mc_frames duty_cycle_mode ocs_type fixed_mcs fixed_bw
+			fixed_ss fixed_guard tx_status_lifetime_ms max_total_vendor_ie_bytes"
+MM_MOD_BOOL="enable_mac80211_connection_monitor mcs10_mode enable_rts_8mhz
+			enable_otp_check enable_survey enable_subbands enable_ps enable_trav_pilot enable_watchdog_reset
+			enable_watchdog no_hwcrypt enable_raw enable_arp_offload enable_dynamic_ps_offload
+			enable_coredump thin_lmac enable_mbssid_ie enable_trav_pilot enable_cts_to_self enable_airtime_fairness
+			enable_twt enable_bcn_change_seq_monitor enable_dhcpc_offload enable_ibss_probe_filtering enable_auto_duty_cycle
+			enable_auto_mpsw enable_mcast_whitelist log_modparams_on_boot enable_fixed_rate spi_use_edge_irq"
+MM_MOD_STRING="bcf serial country test_mode debug_mask macaddr_octet mcs_mask dhcpc_lease_update_script"
+MM_MOD_UNKNOWN=
+MOD_PARAMS=
+
+TX_Q_CONFIGS=" tx_queue_data3_aifs tx_queue_data3_cwmin tx_queue_data3_cwmax tx_queue_data3_burst
+			   tx_queue_data2_aifs tx_queue_data2_cwmin tx_queue_data2_cwmax tx_queue_data2_burst
+			   tx_queue_data1_aifs tx_queue_data1_cwmin tx_queue_data1_cwmax tx_queue_data1_burst
+			   tx_queue_data0_aifs tx_queue_data0_cwmin tx_queue_data0_cwmax tx_queue_data0_burst"
+WMM_AC_CONFIGS="wmm_ac_bk_aifs wmm_ac_bk_cwmin wmm_ac_bk_cwmax wmm_ac_bk_txop_limit wmm_ac_bk_acm
+			    wmm_ac_be_aifs wmm_ac_be_cwmin wmm_ac_be_cwmax wmm_ac_be_txop_limit wmm_ac_be_acm
+			    wmm_ac_vi_aifs wmm_ac_vi_cwmin wmm_ac_vi_cwmax wmm_ac_vi_txop_limit wmm_ac_vi_acm
+			    wmm_ac_vo_aifs wmm_ac_vo_cwmin wmm_ac_vo_cwmax wmm_ac_vo_txop_limit wmm_ac_vo_acm "
+
+check_cac(){
+	json_select config
+	json_get_vars cac
+	if [ "${cac:-0}" -gt 0 ]; then
+		enable_cac=1
+	fi
+	json_select ..
+}
+
+check_sgi(){
+	enable_sgi=1
+	if json_is_a s1g_capab array
+	then
+		json_select s1g_capab
+		idx=1
+		while json_is_a ${idx} string
+		do
+			json_get_var capab $idx
+			[ "${capab}" = "[SHORT-GI-NONE]" ] && enable_sgi=0
+			idx=$(( idx + 1 ))
+		done
+		json_select ..
+	fi
+}
+
+build_morse_mod_params(){
+	json_select config
+
+	for var in $MM_MOD_BOOL $MM_MOD_INT $MM_MOD_STRING; do
+		json_get_var mm_mod_val "$var"
+		[ -n "$mm_mod_val" ] && MOD_PARAMS="$MOD_PARAMS $var=$mm_mod_val"
+	done
+
+	check_sgi
+	if [ $enable_sgi -ne 1 ]; then
+		MOD_PARAMS="$MOD_PARAMS enable_sgi_rc=0"
+
+	else
+		MOD_PARAMS="$MOD_PARAMS enable_sgi_rc=1"
+	fi
+	json_select ..
+	enable_cac=
+	for_each_interface "ap" check_cac
+	[ -n "$enable_cac" ] && MOD_PARAMS="$MOD_PARAMS enable_cac=$enable_cac"
+
+	# Get the last three octets of the eth0 MAC address
+	# to use as the default HaLow MAC address
+	local ETH0_MAC_SUFFIX=`cat /sys/class/net/eth0/address | cut -d: -f4-`
+
+	MOD_PARAMS="$MOD_PARAMS macaddr_suffix=$ETH0_MAC_SUFFIX"
+
+	MOD_PARAMS=`echo $MOD_PARAMS | xargs`
+}
+
+drv_morse_cleanup() {
+	hostapd_common_cleanup
+}
+
+drv_morse_init_device_config() {
+	hostapd_common_add_device_config
+
+	config_add_string path phy 'macaddr:macaddr'
+	config_add_string tx_burst
+	config_add_int frag rts
+	config_add_int op_class
+	config_add_int txpower
+	config_add_int s1g_prim_chwidth
+	config_add_string s1g_prim_1mhz_chan_index
+	config_add_int bss_color
+	config_add_boolean ampdu
+	config_add_int forced_listen_interval
+	config_add_boolean noscan
+	config_add_array s1g_capab
+	config_add_array channels
+	config_add_boolean vendor_keep_alive_offload
+
+	#module parameters
+	config_add_int $MM_MOD_INT
+	config_add_boolean $MM_MOD_BOOL
+	config_add_string $MM_MOD_STRING $MM_MOD_UNKNOWN
+}
+
+
+drv_morse_init_iface_config() {
+	hostapd_common_add_bss_config
+	config_add_string 'macaddr:macaddr' ifname
+	config_add_boolean wds powersave enable
+	config_add_boolean wps_virtual_push_button
+	config_add_array sae_group
+	config_add_array owe_group
+	config_add_int maxassoc
+	config_add_int max_listen_int
+	config_add_int dtim_period
+	config_add_int start_disabled
+	config_add_int sae_pwe
+	config_add_string $TX_Q_CONFIGS
+	config_add_string $WMM_AC_CONFIGS
+	config_add_string ca_cert2
+	config_add_string client_cert2
+	config_add_string priv_key2
+	config_add_string priv_key2_pwd
+	config_add_string password
+
+	#twt
+	config_add_boolean twt
+	config_add_string wake_interval
+	config_add_int min_wake_duration setup_command
+
+	#cac
+	config_add_boolean cac
+
+	#raw
+	config_add_int raw_sta_priority
+	config_add_array raws
+
+	# mesh
+	config_add_string mesh_id
+
+	#dpp
+	config_add_boolean dpp
+
+	#beacon interval
+	config_add_int beacon_int
+}
+
+get_mesh11sd_config() {
+	config_load mesh11sd
+	var=
+
+	json_select config
+
+	config_get var mesh_params mesh_fwding
+	json_add_boolean mesh_fwding $var
+
+	config_get var mesh_params mesh_rssi_threshold
+	json_add_int mesh_rssi_threshold $var
+
+	config_get var mesh_params mesh_max_peer_links
+	json_add_int mesh_max_peer_links $var
+
+	config_get var mesh_params mesh_plink_timeout
+	json_add_int mesh_plink_timeout $var
+
+	config_get var mesh_params mesh_hwmp_rootmode
+	json_add_int mesh_hwmp_rootmode $var
+
+	config_get var mesh_params mesh_gate_announcements
+	json_add_int mesh_gate_announcements $var
+
+	config_get var mbca mbca_config
+	json_add_int mbca_config $var
+
+	config_get var mbca mbca_min_beacon_gap_ms
+	json_add_int mbca_min_beacon_gap_ms $var
+
+	config_get var mbca mbca_tbtt_adj_interval_sec
+	json_add_int mbca_tbtt_adj_interval_sec $var
+
+	config_get var mbca mesh_beacon_timing_report_int
+	json_add_int mesh_beacon_timing_report_int $var
+
+	config_get var mbca mbss_start_scan_duration_ms
+	json_add_int mbss_start_scan_duration_ms $var
+
+	config_get var mesh_beaconless mesh_beacon_less_mode
+	json_add_int mesh_beacon_less_mode $var
+
+	config_get var mesh_dynamic_peering enabled 0
+	json_add_int mesh_dynamic_peering $var
+
+	config_get var mesh_dynamic_peering mesh_rssi_margin
+	json_add_int mesh_rssi_margin $var
+
+	config_get var mesh_dynamic_peering mesh_blacklist_timeout
+	json_add_int mesh_blacklist_timeout $var
+
+	json_select ..
+}
+
+is_module_loaded() {
+	lsmod | grep -q '^morse '
+}
+
+change_module_parameters() {
+	# These are parameters that we use morse_cli to configure,
+	# but because we have no way to revert back to the original
+	# state any change requires us to reload the module.
+	#
+	# Therefore we store these as a comment in /etc/modules.d/morse
+	# (and changing this comment will mean that we will decide
+	# to reload the module; see use of cmp below).
+	local morse_cli_params="bss_color=$bss_color forced_listen_interval=$forced_listen_interval"
+	local proposed_module="$(mktemp)"
+	cat > "$proposed_module" <<-MORSE
+	# Morse module, with subsequent morse_cli commands: $morse_cli_params
+	morse $MOD_PARAMS
+	MORSE
+
+	if cmp -s "$proposed_module" /etc/modules.d/morse; then
+		# Parameters didn't change; do nothing.
+		rm "$proposed_module"
+		return 1
+	else
+		mv "$proposed_module" /etc/modules.d/morse
+		return 0
+	fi
+}
+
+drv_morse_setup() {
+	morse_band_override
+	json_select config
+	json_get_vars \
+		phy macaddr path \
+		country \
+		txpower \
+		frag rts htmode \
+		ampdu \
+		op_class \
+		bss_color forced_listen_interval
+	json_get_values basic_rate_list basic_rate
+	json_select ..
+
+	MOD_PARAMS=
+	build_morse_mod_params
+
+	#if [ -n "$country" ]; then
+	#	if change_module_parameters || ! is_module_loaded; then
+	#		is_module_loaded && rmmod morse
+	#		/sbin/kmodloader /etc/modules.d/morse
+	#	fi
+		# don't do iw reg set as in mac80211
+	#fi
+
+	local retries=4
+	while ! find_phy; do
+		sleep 0.5
+		retries="$((retries - 1))"
+		if [ "$retries" -le 0 ]; then
+			echo "Could not find PHY for device '$1'" >&2
+			wireless_set_retry 0
+			return 1
+		fi
+	done
+
+	# wlan? is automatically created on module insertion, which usually
+	# happens in two situations: boot, and a module load above.
+	auto_ifname=$(morse_get_ifname "$phy")
+	if [ $auto_ifname ]; then
+		# As a happy byproduct of the bonus wlan?, we can interact
+		# without module to determine the MAC and chip id.
+		# This is an ugly place to do this, since we really only
+		# need to do it once.
+		# Note that this currently guaranteed to happen on each boot
+		# (since we'll have a wlan? then).
+		set_chipid $auto_ifname
+		update_dpp_qrcode /etc/dpp_key.pem "$(cat /sys/class/ieee80211/$phy/macaddress)"
+
+		# Now remove wlan?, since any wlan* interfaces we want will be
+		# created by the wifi-iface sections in the uci config.
+		iw dev "$auto_ifname" del
+	fi
+
+	json_add_object data
+	json_add_string phy "$phy"
+	json_close_object
+
+	local hostapd_conf_file="/var/run/hostapd-$phy.conf"
+	rm -f "$hostapd_conf_file"
+
+	wireless_set_data phy="$phy"
+
+	[ -z "$(uci -q -P /var/state show wireless._${phy})" ] && uci -q -P /var/state set wireless._${phy}=phy
+
+	morse_interface_cleanup ${phy}
+
+	set_default rts 1000
+	iw phy "$phy" set rts "${rts%%.*}"
+
+	[ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
+
+
+	already_have_wpa_supplicant_running=
+	already_have_hostapd_running=
+	has_ap=
+	has_sta=
+	has_mesh=
+	has_adhoc=
+
+	#bring the interfaces up
+	for_each_interface "ap sta adhoc mesh none" morse_iface_bringup
+
+	# setup the 11ah specific regulatory translation
+	# and setup the general s1g device defaults as common configs for all interfaces
+	morse_set_ap_regulatory
+	morse_setup_s1g_device_defaults
+
+	[ -n "$has_ap" ] && {
+		morse_hostapd_conf_setup "$phy"
+	}
+	for_each_interface "ap" morse_setup_ap
+
+	[ -n "$has_sta" ] && {
+		json_select config
+		json_get_vars vendor_keep_alive_offload
+		json_select ..
+	}
+	for_each_interface "sta" morse_setup_sta
+
+	[ -n "$has_mesh" ] && {
+		get_mesh11sd_config
+		json_select config
+		json_get_vars mesh_max_peer_links mesh_plink_timeout mesh_hwmp_rootmode mesh_gate_announcements mesh_fwding mesh_rssi_threshold mbca_config mbca_min_beacon_gap_ms mbca_tbtt_adj_interval_sec mesh_beacon_timing_report_int mbss_start_scan_duration_ms mesh_beacon_less_mode mesh_dynamic_peering mesh_rssi_margin mesh_blacklist_timeout
+		json_select ..
+	}
+	for_each_interface "mesh" morse_setup_mesh
+
+	[ -n "$has_adhoc" ] && {
+		json_select config
+		json_get_vars op_class channel country s1g_prim_chwidth s1g_prim_1mhz_chan_index
+		json_select ..
+
+	}
+	for_each_interface "adhoc" morse_setup_adhoc
+
+	# Ideally, this would also be in the hostapd/wpa_supplicant config,
+	# but for now they don't have support so we use morse_cli.
+	set_default ampdu 1
+
+	# There will only be an ifname if at least one interface is brought up.
+	# If no interfaces, it doesn't matter if we don't set these
+	# (since they won't be used).
+	if [ -n "$ifname" ]; then
+		morse_cli -i $ifname ampdu $ampdu
+		[ -n "$bss_color" ] && morse_cli -i $ifname bsscolor $bss_color
+	fi
+
+	if [ -n "$forced_listen_interval" ]
+	then
+		# 802.11ah supports listen intervals beyond 65535 by
+		# using the first two bits as a scale factor.
+		# We calculate this transformation here to keep the UI/config simple.
+		local max_val=16383
+		local scale_factor
+		local unscaled_interval
+		if [ "$forced_listen_interval" -gt $((1000 * $max_val)) ]; then
+			scale_factor=3
+			unscaled_interval=$(("$forced_listen_interval" / 10000))
+		elif [ "$forced_listen_interval" -gt $((10 * $max_val)) ]; then
+			scale_factor=2
+			unscaled_interval=$(("$forced_listen_interval" / 1000))
+		elif [ "$forced_listen_interval" -gt $max_val ]; then
+			scale_factor=1
+			unscaled_interval=$(("$forced_listen_interval" / 1000))
+		else
+			scale_factor=0
+			unscaled_interval="$forced_listen_interval"
+		fi
+
+		morse_cli -i $ifname li $unscaled_interval $scale_factor
+	fi
+
+	wireless_set_up
+}
+
+drv_morse_teardown() {
+	if json_is_a data object
+	then
+		json_select data
+		json_get_vars phy
+		json_select ..
+	fi
+
+	if [ -z "$phy" ]; then
+		json_select config
+		json_get_vars path
+		json_select ..
+		if [ -z "$path" ]; then
+			echo "Could not find phy from data, nor could find device path from device configuration." >&2
+			return 1;
+		fi
+		phy=$(iwinfo nl80211 phyname "path=$path")
+		if [ -z "$phy" ]; then
+			echo "Could not find phy from device path." >&2
+			return 1;
+		fi
+	fi
+
+	#remove hostapd conffile before tearing down.
+	local hostapd_conf_file="/var/run/hostapd-$phy.conf"
+	rm "$hostapd_conf_file" -f
+
+	morse_interface_cleanup "$phy"
+	uci -q -P /var/state revert wireless._${phy}
+
+	#Set mesh11sd to disabled
+	uci set mesh11sd.setup.enabled='0'
+	uci commit mesh11sd
+}
+
+morse_iface_bringup() {
+	json_select config
+	json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file
+
+	# guard against more than one AP interface
+	if [ -n "$has_ap" -a "$mode" = "ap" ]; then
+		echo "Can't have more than one AP interface."
+		json_select ..
+		return
+	fi
+	# guard against more than one STA interface
+	if [ -n "$has_sta" -a "$mode" = "sta" ]; then
+		echo "Can't have more than one STA interface."
+		json_select ..
+		return
+	fi
+
+	# guard against more than one mesh interface
+	if [ -n "$has_mesh" -a "$mode" = "mesh" ]; then
+		echo "Can't have more than one MESH interface."
+		json_select ..
+		return
+	fi
+
+	set_default wds 0
+
+	[ -z "$ifname" ] && ifname="$(_find_free_ifname wlan)"
+
+	json_add_string ifname "$ifname"
+	json_add_string phy "$phy"
+
+
+	[ -n "$macaddr" ] || {
+		macaddr="$(morse_generate_mac $phy)"
+		macidx="$(($macidx + 1))"
+	}
+
+	json_add_string macaddr "$macaddr"
+	json_select ..
+
+	case "$mode" in
+		ap)
+			has_ap=1
+			morse_iw_interface_add "$phy" "$ifname" __ap
+			if [ $? -ne 0 ]; then
+				echo "morse_iface_bringup: error adding interface $ifname to $phy" >&2
+				exit 1
+			fi
+			ifconfig "$ifname" hw ether $macaddr
+			ip link set $ifname up
+		;;
+
+		sta)
+			has_sta=1
+			[ "$wds" -gt 0 ] && wdsflag="4addr on"
+			morse_iw_interface_add "$phy" "$ifname" managed "$wdsflag" || return
+			if [ "$wds" -gt 0 ]; then
+				iw dev "$ifname" set 4addr on
+			else
+				iw dev "$ifname" set 4addr off
+			fi
+
+			set_default powersave 1
+			[ "$powersave" -gt 0 ] && powersave="on" || powersave="off"
+			iw dev "$ifname" set power_save "$powersave"
+			ifconfig "$ifname" hw ether $macaddr
+			ip link set $ifname up
+		;;
+
+		mesh)
+			has_mesh=1
+			morse_iw_interface_add "$phy" "$ifname" mp
+			ifconfig "$ifname" hw ether $macaddr
+			ip link set $ifname up
+		;;
+
+		adhoc)
+			has_adhoc=1
+			morse_iw_interface_add "$phy" "$ifname" adhoc
+		;;
+
+		*)
+			morse_iw_interface_add "$phy" "$ifname" managed || return
+			ip link set $ifname up
+		;;
+	esac
+
+}
+
+morse_get_ifname()
+{
+	local _phy=$1
+	local _oldifname="$(basename "/sys/class/ieee80211/${_phy}/device/net"/* 2>/dev/null)"
+
+	if [[ "$_oldifname" == "wlan"* ]]; then
+		echo "$_oldifname"
+	else
+		echo ""
+	fi
+}
+
+_find_free_ifname()
+{
+	local prefix=$1
+	local idx=0
+
+	while [ -e "/sys/class/net/$prefix$idx" ]
+	do
+		idx="$(( idx + 1 ))"
+	done
+
+	echo "$prefix$idx"
+}
+
+morse_setup_ap() {
+	local iface_index=$1
+	json_select config
+	json_get_vars ifname phy mode ssid wds powersave macaddr enable wpa_psk_file vlan_file multi_ap key encryption
+	json_select ..
+
+	# guard against more than one hostapd_s1g instance
+	if [ -n "$already_have_hostapd_running" ]; then
+		echo "Can't have more than one hostapd_s1g running."
+		return
+	fi
+
+	local hostapd_ctrl="${hostapd_ctrl:-/var/run/hostapd/$ifname}"
+	local type=interface
+
+	morse_hostapd_add_bss "$phy" "$ifname" "$macaddr" "$type"
+
+	json_get_vars mode
+	json_get_var vif_txpower
+
+	uci -q -P /var/state set wireless._${phy}.aplist="${ifname}"
+
+	/sbin/hostapd_s1g -t -B -s ${hostapd_conf_file}
+	# prplmesh is looking for /var/morse/hostapd_s1g_multiap.conf as hostapd conf file.
+	# So, we add a symlink from the actual conf file for prplmesh.
+	if [ "$multi_ap" -gt 0 ]; then
+		mkdir -p /var/morse
+		rm /var/morse/hostapd_s1g_multiap.conf
+		ln -s ${hostapd_conf_file} /var/morse/hostapd_s1g_multiap.conf
+	fi
+
+	#mark that we have already started the hostapd_s1g
+	already_have_hostapd_running=1
+
+	[ -z "$vif_txpower" ] || iw dev "$ifname" set txpower fixed "${vif_txpower%%.*}00"
+
+	wireless_add_vif "$iface_index" "$ifname"
+}
+
+morse_set_ap_regulatory() {
+	halow_bw=
+	center_freq=
+	if [ -n "$has_ap" ] ||  [ -n "$has_mesh" ] || [ -n "$has_adhoc" ]; then
+		_get_regulatory "$mode" "$country" "$channel" "$op_class"
+		if [ $? -ne 0 ]; then
+			echo "Couldn't find reg for $mode in $country with ch=$channel op=$op_class" >&2
+			return
+		fi
+
+		#add ap radio settings to the ap interface configs to be used when bringing hostapd_s1g up.
+		json_select config
+		json_add_int bw "$halow_bw"
+		json_add_string freq "$center_freq"
+		json_add_string op_class "$op_class"
+		json_select ..
+	fi
+}
+
+morse_setup_sta() {
+	local iface_index=$1
+
+	# guard against more than one wpa_supplicant_s1g instance
+	if [ -n "$already_have_wpa_supplicant_running" ]; then
+		echo "Can't have more than one wpa_supplicant_s1g running."
+		return
+	fi
+
+	json_select config
+	json_get_vars ifname
+
+	morse_wpa_supplicant_add $ifname 1 || failed=1
+	#mark that we have already started the wpa_supp_s1g
+	already_have_wpa_supplicant_running=1
+	json_select ..
+
+	[ -n "$failed" ] || wireless_add_vif "$iface_index" "$ifname"
+	uci -q -P /var/state set wireless._${phy}.splist="${ifname}"
+	uci -q -P /var/state set wireless._${phy}.umlist="${ifname}"
+}
+
+morse_setup_mesh() {
+	local iface_index=$1
+
+	# guard against more than one wpa_supplicant_s1g instance
+	if [ -n "$already_have_wpa_supplicant_running" ]; then
+		echo "Can't have more than one wpa_supplicant_s1g running."
+		return
+	fi
+
+	json_select config
+	json_get_vars ifname
+
+	morse_wpa_supplicant_add $ifname 1 || failed=1
+	#mark that we have already started the wpa_supp_s1g
+	already_have_wpa_supplicant_running=1
+	json_select ..
+
+	[ -n "$failed" ] || wireless_add_vif "$iface_index" "$ifname"
+	uci -q -P /var/state set wireless._${phy}.splist="${ifname}"
+	uci -q -P /var/state set wireless._${phy}.umlist="${ifname}"
+
+	#Set mesh11sd to enabled
+	uci set mesh11sd.setup.enabled='1'
+	uci commit mesh11sd
+
+}
+
+morse_setup_adhoc() {
+	local iface_index=$1
+
+	wireless_vif_parse_encryption
+	# guard against more than one wpa_supplicant_s1g instance
+	if [ -n "$already_have_wpa_supplicant_running" ]; then
+		echo "Can't have more than one wpa_supplicant_s1g running."
+		return
+	fi
+
+	json_select config
+	json_get_vars ifname
+
+	morse_wpa_supplicant_add $ifname 1 || failed=1
+	#mark that we have already started the wpa_supp_s1g
+	already_have_wpa_supplicant_running=1
+	json_select ..
+
+	[ -n "$failed" ] || wireless_add_vif "$iface_index" "$ifname"
+	uci -q -P /var/state set wireless._${phy}.splist="${ifname}"
+	uci -q -P /var/state set wireless._${phy}.umlist="${ifname}"
+}
+
+morse_vap_cleanup() {
+	local service="$1"
+	local vaps="$2"
+
+	for wdev in $vaps; do
+		[ "$service" != "none" ] && kill_wait $service &> /dev/null
+		ip link set dev "$wdev" down 2>/dev/null
+		iw dev "$wdev" del
+	done
+}
+
+morse_interface_cleanup() {
+	local phy="$1"
+
+	morse_vap_cleanup hostapd_s1g "$(uci -q -P /var/state get wireless._${phy}.aplist)"
+	morse_vap_cleanup wpa_supplicant_s1g "$(uci -q -P /var/state get wireless._${phy}.splist)"
+	morse_vap_cleanup none "$(uci -q -P /var/state get wireless._${phy}.umlist)"
+}
+
+#################################################
+#
+#      generic s1g helpers
+#
+#################################################
+
+morse_setup_s1g_device_defaults() {
+	json_select config
+	json_get_vars s1g_prim_1mhz_chan_index s1g_prim_chwidth bw
+
+	if [ -n "$bw" ] && [ -n "$s1g_prim_chwidth" ] && [ "$s1g_prim_chwidth" -gt "$bw" ]; then
+		s1g_prim_chwidth=
+		echo "s1g_prim_chwidth incorrectly set for bw=$bw, using default"
+	fi
+
+	if [ -n "$bw" ] && [ -n "$s1g_prim_1mhz_chan_index" ] && [ "$s1g_prim_1mhz_chan_index" -ge "$bw" ]; then
+		s1g_prim_1mhz_chan_index=
+		echo "s1g_prim_1mhz_chan_index incorrectly set for bw=$bw, using default"
+	fi
+
+	#If bw config is empty the chwidth and chanindex are set to defaults.
+	#In case of STA, where bw config is empty these configs are omitted and not configured to wpa_supplicant
+
+	if [ -z "$s1g_prim_chwidth" ]; then
+		if [ ! -z $bw ] && ([ $bw -eq 4 ] || [ $bw -eq 8 ]); then
+			s1g_prim_chwidth=2
+		else
+			s1g_prim_chwidth=1
+		fi
+	fi
+
+	set_default s1g_prim_1mhz_chan_index auto
+	if [ "$s1g_prim_1mhz_chan_index" = "auto" ]; then
+		if [ ! -z $bw ] && [ $bw -eq 8 ]; then
+			s1g_prim_1mhz_chan_index=3
+		elif [ ! -z $bw ] && [ $bw -eq 4 ]; then
+			if [ "$s1g_prim_chwidth" -eq 2 ]; then
+				s1g_prim_1mhz_chan_index=2
+			else
+				s1g_prim_1mhz_chan_index=1
+			fi
+		else
+			s1g_prim_1mhz_chan_index=0
+		fi
+	fi
+
+	s1g_prim_chwidth=$(( $s1g_prim_chwidth - 1 ))
+
+	json_add_string s1g_prim_1mhz_chan_index "$s1g_prim_1mhz_chan_index"
+	json_add_int s1g_prim_chwidth "$s1g_prim_chwidth"
+
+	json_select ..
+}
+
+
+#################################################
+#
+#      hostapd helpers
+#
+#################################################
+
+
+morse_hostapd_conf_setup() {
+	local phy=$1
+	json_select config
+	json_get_vars noscan
+	json_get_vars s1g_prim_chwidth s1g_prim_1mhz_chan_index op_class dtim_period
+	json_get_vars bw freq
+	json_get_values channel_list channels tx_burst
+
+	if json_is_a s1g_capab array
+	then
+		json_select s1g_capab
+		idx=1
+		while json_is_a ${idx} string
+		do
+			json_get_var capab $idx
+			[ -z "$s1g_capab" ] && s1g_capab=$capab || s1g_capab="$s1g_capab,$capab"
+			idx=$(( idx + 1 ))
+		done
+		json_select ..
+	fi
+
+	#auto_channel preloaded before drv_ called
+	[ "$auto_channel" -gt 0 ] && json_get_vars acs_exclude_dfs
+	[ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
+		append base_cfg "acs_exclude_dfs=1" "$N"
+
+	[ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
+		channel_list="$channel"
+
+	set_default noscan 0
+
+	[ "$noscan" -gt 0 ] && hostapd_noscan=1
+	[ "$tx_burst" = 0 ] && tx_burst=
+
+	if [ "$band" = "s1g" ]; then
+		append base_cfg "ieee80211ah=1" "$N"
+
+		set_default s1g_capab "[SHORT-GI-ALL]"
+
+	fi
+
+	json_get_vars country_ie doth
+	[ -z "$country_ie" ] && json_add_boolean country_ie '0'
+	[ -z "$doth" ] && json_add_boolean doth '0'
+
+	hostapd_prepare_device_config "$hostapd_conf_file" nl80211
+	cat >> "$hostapd_conf_file" <<EOF
+${channel:+channel=$channel}
+${channel_list:+chanlist=$channel_list}
+${op_class:+op_class=$op_class}
+${s1g_capab:+s1g_capab=$s1g_capab}
+${s1g_prim_chwidth:+s1g_prim_chwidth=$s1g_prim_chwidth}
+${s1g_prim_1mhz_chan_index:+s1g_prim_1mhz_chan_index=$s1g_prim_1mhz_chan_index}
+${hostapd_noscan:+noscan=1}
+${tx_burst:+tx_queue_data2_burst=$tx_burst}
+$base_cfg
+
+EOF
+	json_select ..
+}
+
+
+morse_hostapd_add_bss(){
+	local _phy="$1"
+	local _ifname="$2"
+	local _macaddr="$3"
+	local _type="$4"
+
+	hostapd_cfg=
+	append hostapd_cfg "# Interface $_ifname "
+	append hostapd_cfg "$_type=$_ifname" "$N"
+
+	json_select config
+	morse_override_hostapd_set_bss_options hostapd_cfg "$_phy" "$vif" || return 1
+	json_get_vars wds wds_bridge sae_pwe dtim_period max_listen_int start_disabled
+
+
+	raw_block=
+	json_for_each_item morse_hostapd_add_raw raws
+	json_select ..
+
+	set_default wds 0
+	set_default start_disabled 0
+	set_default sae_pwe 1
+
+	if [ "$wds" -gt 0 ]; then
+		append hostapd_cfg "wds_sta=1" "$N"
+		[ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N"
+	fi
+
+	[ "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
+
+		cat >> /var/run/hostapd-$_phy.conf <<EOF
+$hostapd_cfg
+bssid=$_macaddr
+${dtim_period:+dtim_period=$dtim_period}
+${max_listen_int:+max_listen_interval=$max_listen_int}
+${sae_pwe:+sae_pwe=$sae_pwe}
+$raw_block
+EOF
+}
+
+morse_hostapd_add_raw(){
+	local cfgtype priority enabled start_time_us duration_us slots cross_slot max_beacon_spread nominal_stas_per_beacon
+	local T="	"
+	config_load wireless
+	config_get cfgtype "$1" TYPE
+	[ "$cfgtype" != "raw" ] && return
+
+	config_get priority "$1" priority
+	config_get enabled "$1" enabled
+	config_get start_time_us "$1" start_time_us
+	config_get duration_us "$1" duration_us
+	config_get slots "$1" slots
+	config_get cross_slot "$1" cross_slot
+	config_get max_beacon_spread "$1" max_beacon_spread
+	config_get nominal_stas_per_beacon "$1" nominal_stas_per_beacon
+
+	append raw_block "raw={" "$N"
+	append raw_block "priority=${priority:=0}" "$N$T"
+	append raw_block "enabled=${enabled:=0}" "$N$T"
+	append raw_block "${start_time_us:+start_time_us=$start_time_us}" "$N$T"
+	append raw_block "${duration_us:+duration_us=$duration_us}" "$N$T"
+	append raw_block "${slots:+slots=$slots}" "$N$T"
+	append raw_block "cross_slot=${cross_slot:=false}" "$N$T"
+	append raw_block "${max_beacon_spread:+max_beacon_spread=$max_beacon_spread}" "$N$T"
+	append raw_block "${nominal_stas_per_beacon:+nominal_stas_per_beacon=$nominal_stas_per_beacon}" "$N$T"
+	append raw_block "}" "$N"
+}
+
+#################################################
+#
+#      wpa_supplicant helpers
+#
+#################################################
+
+morse_wpa_supplicant_add() {
+	local _ifname=$1
+	local _enable=$2
+
+	if [ "$_enable" = 0 ]; then
+		echo "interface is disabled"
+		kill_wait wpa_supplicant_s1g &> /dev/null
+		ip link set dev "$_ifname" down
+		iw dev "$_ifname" del
+		return 0
+	fi
+
+	wpa_supplicant_prepare_interface "$_ifname" nl80211 || {
+		echo "wpa_supplicant_prepare_interface failed."
+		iw dev "$_ifname" del
+		return 1
+	}
+	morse_wpa_supplicant_prepare_interface "$_ifname"
+	if [ "$mode" = "sta" ]; then
+		morse_override_wpa_supplicant_add_network "$_ifname"
+	else
+		morse_override_wpa_supplicant_add_network "$_ifname" "$freq" "$htmode" "$noscan" "$enable_sgi"
+	fi
+
+	_wpa_supplicant_common $_ifname
+	#need to handle bridge mode??
+	/sbin/wpa_supplicant_s1g -t -D nl80211 -s -i $_ifname -c $_config -B
+
+	#React to DPP events (wpa_s1g_dpp_action will persist creds and restart network)
+	[ "$dpp" = 1 ] && /usr/sbin/wpa_event_listener -a "/lib/netifd/morse/wpa_s1g_dpp_action.sh" -B
+	return 0
+}
+
+
+#################################################
+#
+#      interface helpers
+#
+#################################################
+
+find_phy() {
+	[ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
+
+	if [ -n "$path" ]; then
+		phy="$(iwinfo nl80211 phyname "path=$path")"
+		[ -n "$phy" ] && return 0
+	fi
+
+	if [ -n "$macaddr" ]; then
+		for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
+			grep -i -q "$macaddr" "/sys/class/ieee80211/${phy}/macaddress" && return 0
+		done
+	fi
+	return 1
+}
+
+morse_iw_interface_add() {
+	local _phy="$1"
+	local _ifname="$2"
+	local _type="$3"
+	local _wdsflag="$4"
+	local rc
+	local old_ifname
+
+	iw phy "$_phy" interface add "$_ifname" type "$_type" $_wdsflag
+	rc="$?"
+
+	if [ "$rc" = 233 ]; then
+		# Device might have just been deleted, give the kernel some time to finish cleaning it up
+		sleep 1
+		echo "retrying..."
+		iw phy "$_phy" interface add "$_ifname" type "$_type" $_wdsflag >/dev/null 2>&1
+		rc="$?"
+	fi
+
+	if [ "$rc" = 233 ]; then
+		# Keep matching pre-existing interface
+		if [ -d "/sys/class/ieee80211/${_phy}/device/net/${_ifname}" ]; then
+			case "$(iw dev $_ifname info | grep "^\ttype" | cut -d' ' -f2- 2>/dev/null)" in
+				"AP")
+					[ "$_type" = "__ap" ] && rc=0
+					;;
+				"IBSS")
+					[ "$_type" = "adhoc" ] && rc=0
+					;;
+				"managed")
+					[ "$_type" = "managed" ] && rc=0
+					;;
+				"mesh point")
+					[ "$_type" = "mp" ] && rc=0
+					;;
+				"monitor")
+					[ "$_type" = "monitor" ] && rc=0
+					;;
+			esac
+		fi
+	fi
+
+	if [ "$rc" = 233 ]; then
+		iw dev "$_ifname" del >/dev/null 2>&1
+		if [ "$?" = 0 ]; then
+			sleep 1
+			iw phy "$_phy" interface add "$_ifname" type "$_type" $_wdsflag >/dev/null 2>&1
+			rc="$?"
+		fi
+	fi
+
+	if [ "$rc" != 0 ]; then
+		# Device might not support virtual interfaces, so the interface never got deleted in the first place.
+		# Check if the interface already exists, and avoid failing in this case.
+		[ -d "/sys/class/ieee80211/${_phy}/device/net/${_ifname}" ] && rc=0
+	fi
+
+	if [ "$rc" != 0 ]; then
+		# Device doesn't support virtual interfaces and may have existing interface other than _ifname.
+		old_ifname="$(basename "/sys/class/ieee80211/${_phy}/device/net"/* 2>/dev/null)"
+		[ "$old_ifname" ] && ip link set "$old_ifname" name "$_ifname" 1>/dev/null 2>&1
+		rc="$?"
+	fi
+
+	[ "$rc" != 0 ] && echo "Failed to create interface $_ifname"
+	return $rc
+}
+
+morse_get_addr() {
+	local phy="$1"
+	local idx="$(($2 + 1))"
+
+	head -n $idx /sys/class/ieee80211/${phy}/addresses | tail -n1
+}
+
+#this is exactly same as mac80211.sh
+morse_generate_mac() {
+	local phy="$1"
+	local id="${macidx:-0}"
+
+	local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
+	local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)"
+
+	[ "$mask" = "00:00:00:00:00:00" ] && {
+		mask="ff:ff:ff:ff:ff:ff";
+
+		[ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt $id ] && {
+			addr="$(morse_get_addr "$phy" "$id")"
+			[ -n "$addr" ] && {
+				echo "$addr"
+				return
+			}
+		}
+	}
+
+	local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
+
+	local mask1=$1
+	local mask6=$6
+
+	local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+
+	macidx=$(($id + 1))
+	[ "$((0x$mask1))" -gt 0 ] && {
+		b1="0x$1"
+		[ "$id" -gt 0 ] && \
+			b1=$(($b1 ^ ((($id - !($b1 & 2)) << 2)) | 0x2))
+		printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
+		return
+	}
+
+	[ "$((0x$mask6))" -lt 255 ] && {
+		printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $(( 0x$6 ^ $id ))
+		return
+	}
+
+	off2=$(( (0x$6 + $id) / 0x100 ))
+	printf "%s:%s:%s:%s:%02x:%02x" \
+		$1 $2 $3 $4 \
+		$(( (0x$5 + $off2) % 0x100 )) \
+		$(( (0x$6 + $id) % 0x100 ))
+}
+
+set_chipid() {
+	local _ifname=$1
+	local state
+	state="$(cat /sys/class/net/${_ifname}/operstate 2>/dev/null)"
+	[ $? -ne 0 ] && return
+
+	if [ "$state" == "down" ]; then
+		ip link set ${_ifname} up
+		[ $? -ne 0 ] && return
+	fi
+	local chip_revision
+	chip_revision="$(morse_cli -i ${_ifname} hw_version 2>/dev/null)"
+	[ $? -ne 0 ] && return
+	chip_revision=${chip_revision##"HW Version: "}
+
+	uci set system.@system[0].notes="${chip_revision}"
+	uci commit system
+
+	if [ "$state" == "down" ]; then
+		ip link set ${_ifname} down
+	fi
+}
+
+add_driver morse
diff --git a/feeds/morse/netifd-morse/lib/wifi/morse.sh b/feeds/morse/netifd-morse/lib/wifi/morse.sh
new file mode 100755
index 000000000..b47033774
--- /dev/null
+++ b/feeds/morse/netifd-morse/lib/wifi/morse.sh
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# This script is copied and modified from
+# package/kernel/mac80211/files/lib/wifi/mac80211.sh
+# and modified (simplified) to work with morse devices.
+
+append DRIVERS "morse"
+
+# Find and set $phy for this $device (a wifi-device section name)
+lookup_phy() {
+	[ -n "$phy" ] && {
+		[ -d /sys/class/ieee80211/$phy ] && return
+	}
+
+	local devpath
+	config_get devpath "$device" path
+	[ -n "$devpath" ] && {
+		phy="$(iwinfo dot11ah phyname "path=$devpath")"
+		[ -n "$phy" ] && return
+	}
+
+	local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')"
+	[ -n "$macaddr" ] && {
+		for _phy in /sys/class/ieee80211/*; do
+			[ -e "$_phy" ] || continue
+
+			[ "$macaddr" = "$(cat ${_phy}/macaddress)" ] || continue
+			phy="${_phy##*/}"
+			return
+		done
+	}
+	phy=
+	return
+}
+
+# Find and save the phy and macaddr for this $device (a wifi-device section name)
+find_morse_phy() {
+	local device="$1"
+
+	config_get phy "$device" phy
+	lookup_phy
+	[ -n "$phy" -a -d "/sys/class/ieee80211/$phy" ] || {
+		echo "PHY for wifi device $1 not found"
+		return 1
+	}
+	config_set "$device" phy "$phy"
+
+	config_get macaddr "$device" macaddr
+	[ -z "$macaddr" ] && {
+		config_set "$device" macaddr "$(cat /sys/class/ieee80211/${phy}/macaddress)"
+	}
+
+	return 0
+}
+
+# Set found=1 if the $phy for this $device (a wifi-device section name) is the same as $dev
+check_morse_device() {
+	config_get phy "$1" phy
+	[ -z "$phy" ] && {
+		find_morse_phy "$1" >/dev/null || return 0
+		config_get phy "$1" phy
+	}
+	[ "$phy" = "$dev" ] && found=1
+}
+
+detect_morse() {
+	devidx=0
+	config_load wireless
+	while :; do
+		config_get type "radio$devidx" type
+		[ -n "$type" ] || break
+		devidx=$(($devidx + 1))
+	done
+
+	for _dev in /sys/class/ieee80211/*; do
+		[ -e "$_dev" ] || continue
+
+		# Only configure morse devices.
+		basename "$(readlink -f "$_dev/device/driver/")" | grep '^morse_' || continue
+
+		dev="${_dev##*/}"
+
+		# Skip already configured devices.
+		# The path or macaddr are used to find the corresponding phy.
+		found=0
+		config_foreach check_morse_device wifi-device
+		[ "$found" -gt 0 ] && continue
+
+		path="$(iwinfo dot11ah path "$dev")"
+		if [ -n "$path" ]; then
+			dev_id="set wireless.radio${devidx}.path='$path'"
+		else
+			dev_id="set wireless.radio${devidx}.macaddr=$(cat /sys/class/ieee80211/${dev}/macaddress)"
+		fi
+
+		uci -q batch <<-EOF
+			set wireless.radio${devidx}=wifi-device
+			set wireless.radio${devidx}.type=morse
+			${dev_id}
+			set wireless.radio${devidx}.band=s1g
+			set wireless.radio${devidx}.hwmode=11ah
+			set wireless.radio${devidx}.reconf=0
+			set wireless.radio${devidx}.disabled=1
+
+			set wireless.default_radio${devidx}=wifi-iface
+			set wireless.default_radio${devidx}.mode=ap
+			set wireless.default_radio${devidx}.wds=1
+			set wireless.default_radio${devidx}.device=radio${devidx}
+			set wireless.default_radio${devidx}.network=lan
+			set wireless.default_radio${devidx}.ssid=MorseMicro
+			set wireless.default_radio${devidx}.encryption=sae
+			set wireless.default_radio${devidx}.key=12345678
+EOF
+
+		board=$(board_name)
+
+		case "$board" in
+			morse,ekh01-03 |\
+			morse,ekh03v3)
+				bcf=bcf_mf08551.bin
+			;;
+			morse,ekh01v1)
+				bcf=bcf_mf03120.bin
+			;;
+			morse,ekh01v2)
+				bcf=bcf_mf08251.bin
+			;;
+			morse,ekh04v4)
+				bcf=bcf_ekh04_v4.bin
+			;;
+		esac
+
+		[ -n "${bcf}" ] && uci -q set wireless.radio${devidx}.bcf="${bcf}"
+
+		uci -q commit wireless
+
+		devidx=$(($devidx + 1))
+	done
+}
diff --git a/feeds/morse/utils/hostapd_s1g/Config.in b/feeds/morse/utils/hostapd_s1g/Config.in
new file mode 100644
index 000000000..04c985d18
--- /dev/null
+++ b/feeds/morse/utils/hostapd_s1g/Config.in
@@ -0,0 +1,17 @@
+if PACKAGE_hostapd_s1g
+
+	config MORSE_HOSTAPD_S1G_EAP
+		bool
+		default n
+		prompt "Enable Extensible Authentication Protocol (EAP) support"
+
+	config MORSE_HOSTAPD_S1G_ACS
+		bool
+		default n
+		prompt "Enable automatic channel selection (ACS) support"
+		help
+			This will allow hostapd to pick the channel automatically when channel is set
+			to "acs_survey" or "0". Eventually, other ACS algorithms can be added in
+			similar way.
+
+endif
diff --git a/feeds/morse/utils/hostapd_s1g/Makefile b/feeds/morse/utils/hostapd_s1g/Makefile
new file mode 100644
index 000000000..89224ef66
--- /dev/null
+++ b/feeds/morse/utils/hostapd_s1g/Makefile
@@ -0,0 +1,167 @@
+#
+# Copyright 2022 Morse Micro
+#
+# This is free software, licensed under the 3-Clause BSD License.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostapd_s1g
+PKG_RELEASE=2
+
+PKG_VERSION:=1.12.4
+
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/MorseMicro/hostap.git
+PKG_HASH:=a2f17ce3d2fe25d45cc2d6869e9ea644bcac441ec9b541972034768d4fc63608
+PKG_SOURCE_PROTO:=git
+
+PKG_MAINTAINER:=Morse Micro <info@morsemicro.com>
+PKG_BUILD_PARALLEL:=1
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_PACKAGE_kmod-morse \
+	CONFIG_PACKAGE_kmod-cfg80211 \
+	CONFIG_PACKAGE_hostapd \
+	CONFIG_PACKAGE_hostapd-basic \
+	CONFIG_PACKAGE_hostapd-mini \
+	CONFIG_WPA_RFKILL_SUPPORT \
+	CONFIG_DRIVER_WEXT_SUPPORT \
+	CONFIG_DRIVER_11N_SUPPORT \
+	CONFIG_DRIVER_11AC_SUPPORT \
+	CONFIG_DRIVER_11AX_SUPPORT \
+	CONFIG_WPA_ENABLE_WEP
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_FLAGS += \
+	MORSEHOSTAPD_VERSION_STRING=$(PKG_VERSION)
+
+MMHOSTAPD_CONFIG_ENABLE = \
+	CONFIG_INTERNAL_LIBTOMMATH \
+	CONFIG_DEBUG_FILE \
+	CONFIG_DEBUG_SYSLOG \
+	CONFIG_PMKSA_CACHE_EXTERNAL \
+	CONFIG_SAE \
+	CONFIG_TESTING_OPTIONS \
+	CONFIG_WNM \
+	CONFIG_DRIVER_ACS \
+	CONFIG_DRIVER_HOSTAP \
+	CONFIG_DRIVER_NL80211 \
+	CONFIG_HS20 \
+	CONFIG_IEEE80211AC \
+	CONFIG_IEEE80211N \
+	CONFIG_IEEE80211AH \
+	CONFIG_IEEE80211R \
+	CONFIG_INTERWORKING \
+	CONFIG_FULL_DYNAMIC_VLAN \
+	CONFIG_VLAN_NETLINK \
+	CONFIG_OWE \
+	CONFIG_LIBNL32 \
+	CONFIG_DPP \
+	CONFIG_DPP2 \
+	CONFIG_WPS
+
+MMHOSTAPD_CONFIG_SET = \
+	NEED_LINUX_IOCTL \
+	CONFIG_DPP \
+	CONFIG_SAE
+
+MMHOSTAPD_CONFIG_DISABLE = \
+    CONFIG_DRIVER_NONE \
+	CONFIG_DRIVER_RTW \
+	CONFIG_DRIVER_WIRED
+
+MMHOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
+
+ifeq ($(CONFIG_MORSE_HOSTAPD_S1G_ACS),y)
+	MMHOSTAPD_CONFIG_ENABLE += CONFIG_ACS
+endif
+
+ifeq ($(CONFIG_MORSE_HOSTAPD_S1G_EAP),y)
+	MMHOSTAPD_CONFIG_ENABLE += \
+		CONFIG_EAP \
+		CONFIG_RADIUS_SERVER \
+		CONFIG_TLSV1
+else
+	MMHOSTAPD_CONFIG_DISABLE += CONFIG_HOSTAPD_EAP
+	MMHOSTAPD_CONFIG_ENABLE += \
+		CONFIG_NO_ACCOUNTING \
+		CONFIG_NO_RADIUS
+endif
+
+define Package/hostapd_s1g
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=WirelessAPD
+  TITLE:=Morse Micro HaLow hostapd
+  DEPENDS:= +kmod-morse +libnl +libopenssl +libubus
+  USERID:=network=101:network=101
+  PROVIDES:=hostapd_s1g
+endef
+
+define Package/hostapd_s1g/description
+ This package contains a full featured Morse Micro patched
+ Authenticator.
+endef
+
+define Package/hostapd_s1g/config
+    source "$(SOURCE)/Config.in"
+endef
+
+MMHOSTAPD_CONFIG = $(PKG_BUILD_DIR)/hostapd/.config
+
+define Build/Prepare
+    $(call Build/Prepare/Default)
+	$(CP) $(PKG_BUILD_DIR)/hostapd/defconfig $(MMHOSTAPD_CONFIG)
+	sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(MMHOSTAPD_CONFIG_ENABLE)) \
+		$(patsubst %,-e 's/^\(%\)/#\1/',$(MMHOSTAPD_CONFIG_DISABLE)) \
+		$(patsubst %,-e '1i%=y',$(MMHOSTAPD_CONFIG_SET)) \
+		$(patsubst %,-e %,$(MMHOSTAPD_CONFIG_EDITS)) \
+		$(MMHOSTAPD_CONFIG)
+endef
+
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(PKG_BUILD_DIR)/src/crypto \
+	$(TARGET_CPPFLAGS) \
+	-DCONFIG_LIBNL20 \
+	-D_GNU_SOURCE
+
+TARGET_LDFLAGS += -lnl-3 -lnl-genl-3 -lnl-route-3
+TARGET_LDFLAGS += -lm -lpthread -lcrypto -lssl
+
+TARGET_LDFLAGS += -lrt
+TARGET_LDFLAGS_C += -lrt
+
+define Build/RunMake
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(DRIVER_MAKEOPTS) \
+		LIBS="$(TARGET_LDFLAGS)" \
+		LIBS_c="$(TARGET_LDFLAGS_C)" \
+		AR="$(TARGET_CROSS)gcc-ar" \
+		BCHECK= \
+		$(2)
+endef
+
+define Build/Compile
+	+$(call Build/RunMake,hostapd, \
+		hostapd_s1g hostapd_cli_s1g \
+	)
+endef
+
+#Ian
+define Package/hostapd_s1g/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_s1g $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli_s1g $(1)/sbin
+	$(INSTALL_DIR) $(1)/lib/netifd
+	$(INSTALL_DATA) ./files/lib/netifd/hostapd_s1g.sh $(1)/lib/netifd 
+endef
+
+$(eval $(call BuildPackage,hostapd_s1g))
diff --git a/feeds/morse/utils/hostapd_s1g/files/lib/netifd/hostapd_s1g.sh b/feeds/morse/utils/hostapd_s1g/files/lib/netifd/hostapd_s1g.sh
new file mode 100644
index 000000000..7b03f4b00
--- /dev/null
+++ b/feeds/morse/utils/hostapd_s1g/files/lib/netifd/hostapd_s1g.sh
@@ -0,0 +1,1603 @@
+. /lib/functions/network.sh
+. /lib/functions.sh
+
+wpa_supplicant_add_rate() {
+	local var="$1"
+	local val="$(($2 / 1000))"
+	local sub="$((($2 / 100) % 10))"
+	append $var "$val" ","
+	[ $sub -gt 0 ] && append $var "."
+}
+
+hostapd_add_rate() {
+	local var="$1"
+	local val="$(($2 / 100))"
+	append $var "$val" " "
+}
+
+hostapd_append_wep_key() {
+	local var="$1"
+
+	wep_keyidx=0
+	set_default key 1
+	case "$key" in
+		[1234])
+			for idx in 1 2 3 4; do
+				local zidx
+				zidx="$(($idx - 1))"
+				json_get_var ckey "key${idx}"
+				[ -n "$ckey" ] && \
+					append $var "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N$T"
+			done
+			wep_keyidx="$((key - 1))"
+		;;
+		*)
+			append $var "wep_key0=$(prepare_key_wep "$key")" "$N$T"
+		;;
+	esac
+}
+
+hostapd_append_wpa_key_mgmt() {
+	local auth_type_l="$(echo $auth_type | tr 'a-z' 'A-Z')"
+
+	case "$auth_type" in
+		psk|eap)
+			append wpa_key_mgmt "WPA-$auth_type_l"
+			[ "${wpa:-2}" -ge 2 ] && [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type_l}"
+			[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
+		;;
+		eap192)
+			append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP-SHA384"
+		;;
+		eap-eap2)
+			append wpa_key_mgmt "WPA-EAP"
+			append wpa_key_mgmt "WPA-EAP-SHA256"
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
+		;;
+		eap2)
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
+			append wpa_key_mgmt "WPA-EAP-SHA256"
+		;;
+		sae)
+			append wpa_key_mgmt "SAE"
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
+		;;
+		psk-sae)
+			append wpa_key_mgmt "WPA-PSK"
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-PSK"
+			[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-PSK-SHA256"
+			append wpa_key_mgmt "SAE"
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
+		;;
+		owe)
+			append wpa_key_mgmt "OWE"
+		;;
+	esac
+
+	[ "$fils" -gt 0 ] && {
+		case "$auth_type" in
+			eap192)
+				append wpa_key_mgmt FILS-SHA384
+				[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt FT-FILS-SHA384
+			;;
+			eap*)
+				append wpa_key_mgmt FILS-SHA256
+				[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt FT-FILS-SHA256
+			;;
+		esac
+	}
+
+	[ "$auth_osen" = "1" ] && append wpa_key_mgmt "OSEN"
+}
+
+hostapd_add_log_config() {
+	config_add_boolean \
+		log_80211 \
+		log_8021x \
+		log_radius \
+		log_wpa \
+		log_driver \
+		log_iapp \
+		log_mlme
+
+	config_add_int log_level
+}
+
+hostapd_common_add_device_config() {
+	config_add_array basic_rate
+	config_add_array supported_rates
+	config_add_string beacon_rate
+
+	config_add_string country country3
+	config_add_boolean country_ie doth
+	config_add_boolean spectrum_mgmt_required
+	config_add_int local_pwr_constraint
+	config_add_string require_mode
+	config_add_boolean legacy_rates
+	config_add_int cell_density
+	config_add_int rts_threshold
+	config_add_int rssi_reject_assoc_rssi
+	config_add_int rssi_ignore_probe_request
+	config_add_int maxassoc
+
+	config_add_string acs_chan_bias
+	config_add_array hostapd_options
+
+	config_add_int airtime_mode
+	config_add_int mbssid
+
+	hostapd_add_log_config
+}
+
+hostapd_prepare_device_config() {
+	local config="$1"
+	local driver="$2"
+
+	local base_cfg=
+
+	json_get_vars country country3 country_ie doth require_mode legacy_rates \
+		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
+		rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
+		mbssid:0
+
+	hostapd_set_log_options base_cfg
+
+	set_default country_ie 1
+	set_default spectrum_mgmt_required 0
+	set_default doth 1
+	set_default legacy_rates 0
+	set_default airtime_mode 0
+	set_default cell_density 0
+
+	[ -n "$country" ] && {
+		append base_cfg "country_code=$country" "$N"
+		[ -n "$country3" ] && append base_cfg "country3=$country3" "$N"
+
+		[ "$country_ie" -gt 0 ] && {
+			append base_cfg "ieee80211d=1" "$N"
+			[ -n "$local_pwr_constraint" ] && append base_cfg "local_pwr_constraint=$local_pwr_constraint" "$N"
+			[ "$spectrum_mgmt_required" -gt 0 ] && append base_cfg "spectrum_mgmt_required=$spectrum_mgmt_required" "$N"
+		}
+		[ "$hwmode" = "a" -a "$doth" -gt 0 ] && append base_cfg "ieee80211h=1" "$N"
+	}
+
+	[ -n "$acs_chan_bias" ] && append base_cfg "acs_chan_bias=$acs_chan_bias" "$N"
+
+	local brlist= br
+	json_get_values basic_rate_list basic_rate
+	local rlist= r
+	json_get_values rate_list supported_rates
+
+	[ -n "$hwmode" ] && append base_cfg "hw_mode=$hwmode" "$N"
+	if [ "$hwmode" = "g" ] || [ "$hwmode" = "a" ]; then
+		[ -n "$require_mode" ] && legacy_rates=0
+		case "$require_mode" in
+			n) append base_cfg "require_ht=1" "$N";;
+			ac) append base_cfg "require_vht=1" "$N";;
+		esac
+	fi
+	case "$hwmode" in
+		b)
+			if [ "$cell_density" -eq 1 ]; then
+				set_default rate_list "5500 11000"
+				set_default basic_rate_list "5500 11000"
+			elif [ "$cell_density" -ge 2 ]; then
+				set_default rate_list "11000"
+				set_default basic_rate_list "11000"
+			fi
+		;;
+		g)
+			if [ "$cell_density" -eq 0 ] || [ "$cell_density" -eq 1 ]; then
+				if [ "$legacy_rates" -eq 0 ]; then
+					set_default rate_list "6000 9000 12000 18000 24000 36000 48000 54000"
+					set_default basic_rate_list "6000 12000 24000"
+				elif [ "$cell_density" -eq 1 ]; then
+					set_default rate_list "5500 6000 9000 11000 12000 18000 24000 36000 48000 54000"
+					set_default basic_rate_list "5500 11000"
+				fi
+			elif [ "$cell_density" -ge 3 ] && [ "$legacy_rates" -ne 0 ] || [ "$cell_density" -eq 2 ]; then
+				if [ "$legacy_rates" -eq 0 ]; then
+					set_default rate_list "12000 18000 24000 36000 48000 54000"
+					set_default basic_rate_list "12000 24000"
+				else
+					set_default rate_list "11000 12000 18000 24000 36000 48000 54000"
+					set_default basic_rate_list "11000"
+				fi
+			elif [ "$cell_density" -ge 3 ]; then
+				set_default rate_list "24000 36000 48000 54000"
+				set_default basic_rate_list "24000"
+			fi
+		;;
+		a)
+			if [ "$cell_density" -eq 1 ]; then
+				set_default rate_list "6000 9000 12000 18000 24000 36000 48000 54000"
+				set_default basic_rate_list "6000 12000 24000"
+			elif [ "$cell_density" -eq 2 ]; then
+				set_default rate_list "12000 18000 24000 36000 48000 54000"
+				set_default basic_rate_list "12000 24000"
+			elif [ "$cell_density" -ge 3 ]; then
+				set_default rate_list "24000 36000 48000 54000"
+				set_default basic_rate_list "24000"
+			fi
+		;;
+	esac
+
+	for r in $rate_list; do
+		hostapd_add_rate rlist "$r"
+	done
+
+	for br in $basic_rate_list; do
+		hostapd_add_rate brlist "$br"
+	done
+
+	[ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
+	[ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
+	[ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
+	[ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
+	[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
+	[ -n "$rts_threshold" ] && append base_cfg "rts_threshold=$rts_threshold" "$N"
+	[ "$airtime_mode" -gt 0 ] && append base_cfg "airtime_mode=$airtime_mode" "$N"
+	[ -n "$maxassoc" ] && append base_cfg "iface_max_num_sta=$maxassoc" "$N"
+	[ "$mbssid" -gt 0 ] && [ "$mbssid" -le 2 ] && append base_cfg "mbssid=$mbssid" "$N"
+
+	json_get_values opts hostapd_options
+	for val in $opts; do
+		append base_cfg "$val" "$N"
+	done
+
+	cat > "$config" <<EOF
+driver=$driver
+$base_cfg
+EOF
+}
+
+hostapd_common_add_bss_config() {
+	config_add_string 'bssid:macaddr' 'ssid:string'
+	config_add_boolean wds wmm uapsd hidden utf8_ssid ppsk
+
+	config_add_int maxassoc max_inactivity
+	config_add_boolean disassoc_low_ack isolate short_preamble skip_inactivity_poll
+
+	config_add_int \
+		wep_rekey eap_reauth_period \
+		wpa_group_rekey wpa_pair_rekey wpa_master_rekey
+	config_add_boolean wpa_strict_rekey
+	config_add_boolean wpa_disable_eapol_key_retries
+
+	config_add_boolean tdls_prohibit
+
+	config_add_boolean rsn_preauth auth_cache
+	config_add_int ieee80211w
+	config_add_int eapol_version
+
+	config_add_array auth_server acct_server
+	config_add_string 'server:host'
+	config_add_string auth_secret key
+	config_add_int 'auth_port:port' 'port:port'
+
+	config_add_string acct_secret
+	config_add_int acct_port
+	config_add_int acct_interval
+
+	config_add_int bss_load_update_period chan_util_avg_period
+
+	config_add_string dae_client
+	config_add_string dae_secret
+	config_add_int dae_port
+
+	config_add_string nasid
+	config_add_string ownip
+	config_add_string radius_client_addr
+	config_add_string iapp_interface
+	config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd
+	config_add_boolean ca_cert_usesystem ca_cert2_usesystem
+	config_add_string subject_match subject_match2
+	config_add_array altsubject_match altsubject_match2
+	config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2
+	config_add_string ieee80211w_mgmt_cipher
+
+	config_add_int dynamic_vlan vlan_naming vlan_no_bridge
+	config_add_string vlan_tagged_interface vlan_bridge
+	config_add_string vlan_file
+
+	config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
+
+	config_add_string wpa_psk_file
+
+	config_add_int multi_ap
+	config_add_int beacon_int
+
+	config_add_boolean wps_pushbutton wps_label ext_registrar wps_pbc_in_m1
+	config_add_int wps_ap_setup_locked wps_independent
+	config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
+	config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
+
+	config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition mbo
+	config_add_int time_advertisement
+	config_add_string time_zone
+	config_add_string vendor_elements
+
+	config_add_boolean ieee80211k rrm_neighbor_report rrm_beacon_report
+
+	config_add_boolean ftm_responder stationary_ap
+	config_add_string lci civic
+
+	config_add_boolean ieee80211r pmk_r1_push ft_psk_generate_local ft_over_ds
+	config_add_int r0_key_lifetime reassociation_deadline
+	config_add_string mobility_domain r1_key_holder
+	config_add_array r0kh r1kh
+
+	config_add_int ieee80211w_max_timeout ieee80211w_retry_timeout
+
+	config_add_string macfilter 'macfile:file'
+	config_add_array 'maclist:list(macaddr)'
+
+	config_add_array bssid_blacklist
+	config_add_array bssid_whitelist
+
+	config_add_int mcast_rate
+	config_add_array basic_rate
+	config_add_array supported_rates
+
+	config_add_boolean sae_require_mfp
+	config_add_int sae_pwe
+
+	config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
+	config_add_string owe_transition_ifname
+
+	config_add_boolean iw_enabled iw_internet iw_asra iw_esr iw_uesa
+	config_add_int iw_access_network_type iw_venue_group iw_venue_type
+	config_add_int iw_ipaddr_type_availability iw_gas_address3
+	config_add_string iw_hessid iw_network_auth_type iw_qos_map_set
+	config_add_array iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
+	config_add_array iw_anqp_elem iw_venue_name iw_venue_url
+
+	config_add_boolean hs20 disable_dgaf osen
+	config_add_int anqp_domain_id
+	config_add_int hs20_deauth_req_timeout
+	config_add_array hs20_oper_friendly_name
+	config_add_array osu_provider
+	config_add_array operator_icon
+	config_add_array hs20_conn_capab
+	config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
+
+	config_add_string hs20_t_c_server_url
+
+	config_add_array airtime_sta_weight
+	config_add_int airtime_bss_weight airtime_bss_limit
+
+	config_add_boolean multicast_to_unicast multicast_to_unicast_all proxy_arp per_sta_vif
+
+	config_add_array hostapd_bss_options
+	config_add_boolean default_disabled
+
+	config_add_boolean request_cui
+	config_add_array radius_auth_req_attr
+	config_add_array radius_acct_req_attr
+
+	config_add_int eap_server
+	config_add_string eap_user_file ca_cert server_cert private_key private_key_passwd server_id
+
+	config_add_boolean fils
+	config_add_string fils_dhcp
+
+	config_add_int ocv
+}
+
+hostapd_set_vlan_file() {
+	local ifname="$1"
+	local vlan="$2"
+	json_get_vars name vid
+	echo "${vid} ${ifname}-${name}" >> /var/run/hostapd-${ifname}.vlan
+	wireless_add_vlan "${vlan}" "${ifname}-${name}"
+}
+
+hostapd_set_vlan() {
+	local ifname="$1"
+
+	rm -f /var/run/hostapd-${ifname}.vlan
+	for_each_vlan hostapd_set_vlan_file ${ifname}
+}
+
+hostapd_set_psk_file() {
+	local ifname="$1"
+	local vlan="$2"
+	local vlan_id=""
+
+	json_get_vars mac vid key
+	set_default mac "00:00:00:00:00:00"
+	[ -n "$vid" ] && vlan_id="vlanid=$vid "
+	echo "${vlan_id} ${mac} ${key}" >> /var/run/hostapd-${ifname}.psk
+}
+
+hostapd_set_psk() {
+	local ifname="$1"
+
+	rm -f /var/run/hostapd-${ifname}.psk
+	for_each_station hostapd_set_psk_file ${ifname}
+}
+
+append_iw_roaming_consortium() {
+	[ -n "$1" ] && append bss_conf "roaming_consortium=$1" "$N"
+}
+
+append_iw_domain_name() {
+	if [ -z "$iw_domain_name_conf" ]; then
+		iw_domain_name_conf="$1"
+	else
+		iw_domain_name_conf="$iw_domain_name_conf,$1"
+	fi
+}
+
+append_iw_anqp_3gpp_cell_net() {
+	if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then
+		iw_anqp_3gpp_cell_net_conf="$1"
+	else
+		iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf:$1"
+	fi
+}
+
+append_iw_anqp_elem() {
+	[ -n "$1" ] && append bss_conf "anqp_elem=$1" "$N"
+}
+
+append_iw_nai_realm() {
+	[ -n "$1" ] && append bss_conf "nai_realm=$1" "$N"
+}
+
+append_iw_venue_name() {
+	append bss_conf "venue_name=$1" "$N"
+}
+
+append_iw_venue_url() {
+	append bss_conf "venue_url=$1" "$N"
+}
+
+append_hs20_oper_friendly_name() {
+	append bss_conf "hs20_oper_friendly_name=$1" "$N"
+}
+
+append_osu_provider_friendly_name() {
+	append bss_conf "osu_friendly_name=$1" "$N"
+}
+
+append_osu_provider_service_desc() {
+	append bss_conf "osu_service_desc=$1" "$N"
+}
+
+append_hs20_icon() {
+	local width height lang type path
+	config_get width "$1" width
+	config_get height "$1" height
+	config_get lang "$1" lang
+	config_get type "$1" type
+	config_get path "$1" path
+
+	append bss_conf "hs20_icon=$width:$height:$lang:$type:$1:$path" "$N"
+}
+
+append_hs20_icons() {
+	config_load wireless
+	config_foreach append_hs20_icon hs20-icon
+}
+
+append_operator_icon() {
+	append bss_conf "operator_icon=$1" "$N"
+}
+
+append_osu_icon() {
+	append bss_conf "osu_icon=$1" "$N"
+}
+
+append_osu_provider() {
+	local cfgtype osu_server_uri osu_friendly_name osu_nai osu_nai2 osu_method_list
+
+	config_load wireless
+	config_get cfgtype "$1" TYPE
+	[ "$cfgtype" != "osu-provider" ] && return
+
+	append bss_conf "# provider $1" "$N"
+	config_get osu_server_uri "$1" osu_server_uri
+	config_get osu_nai "$1" osu_nai
+	config_get osu_nai2 "$1" osu_nai2
+	config_get osu_method_list "$1" osu_method
+
+	append bss_conf "osu_server_uri=$osu_server_uri" "$N"
+	append bss_conf "osu_nai=$osu_nai" "$N"
+	append bss_conf "osu_nai2=$osu_nai2" "$N"
+	append bss_conf "osu_method_list=$osu_method_list" "$N"
+
+	config_list_foreach "$1" osu_service_desc append_osu_provider_service_desc
+	config_list_foreach "$1" osu_friendly_name append_osu_friendly_name
+	config_list_foreach "$1" osu_icon append_osu_icon
+
+	append bss_conf "$N"
+}
+
+append_hs20_conn_capab() {
+	[ -n "$1" ] && append bss_conf "hs20_conn_capab=$1" "$N"
+}
+
+append_radius_acct_req_attr() {
+	[ -n "$1" ] && append bss_conf "radius_acct_req_attr=$1" "$N"
+}
+
+append_radius_auth_req_attr() {
+	[ -n "$1" ] && append bss_conf "radius_auth_req_attr=$1" "$N"
+}
+
+append_airtime_sta_weight() {
+	[ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
+}
+
+append_auth_server() {
+	[ -n "$1" ] || return
+	append bss_conf "auth_server_addr=$1" "$N"
+	append bss_conf "auth_server_port=$auth_port" "$N"
+	[ -n "$auth_secret" ] && append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
+}
+
+append_acct_server() {
+	[ -n "$1" ] || return
+	append bss_conf "acct_server_addr=$1" "$N"
+	append bss_conf "acct_server_port=$acct_port" "$N"
+	[ -n "$acct_secret" ] && append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
+}
+
+hostapd_set_bss_options() {
+	local var="$1"
+	local phy="$2"
+	local vif="$3"
+
+	wireless_vif_parse_encryption
+
+	local bss_conf bss_md5sum ft_key
+	local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt
+
+	json_get_vars \
+		wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_strict_rekey \
+		wpa_disable_eapol_key_retries tdls_prohibit \
+		maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
+		wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
+		wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
+		macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
+		iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
+		acct_secret acct_port acct_interval \
+		bss_load_update_period chan_util_avg_period sae_require_mfp sae_pwe \
+		multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key skip_inactivity_poll \
+		ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
+		multicast_to_unicast_all proxy_arp per_sta_vif \
+		eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
+		vendor_elements fils ocv \
+		beacon_int
+
+	set_default fils 0
+	set_default isolate 0
+	set_default maxassoc 0
+	set_default max_inactivity 0
+	set_default short_preamble 1
+	set_default disassoc_low_ack 1
+	set_default skip_inactivity_poll 0
+	set_default hidden 0
+	set_default wmm 1
+	set_default uapsd 1
+	set_default wpa_disable_eapol_key_retries 0
+	set_default tdls_prohibit 0
+	set_default eapol_version $((wpa & 1))
+	set_default acct_port 1813
+	set_default bss_load_update_period 60
+	set_default chan_util_avg_period 600
+	set_default utf8_ssid 1
+	set_default multi_ap 0
+	set_default ppsk 0
+	set_default airtime_bss_weight 0
+	set_default airtime_bss_limit 0
+	set_default eap_server 0
+	set_default beacon_int 100
+
+	/usr/sbin/hostapd -vfils || fils=0
+
+	append bss_conf "ctrl_interface=/var/run/hostapd"
+	if [ "$isolate" -gt 0 ]; then
+		append bss_conf "ap_isolate=$isolate" "$N"
+	fi
+	if [ "$maxassoc" -gt 0 ]; then
+		append bss_conf "max_num_sta=$maxassoc" "$N"
+	fi
+	if [ "$max_inactivity" -gt 0 ]; then
+		append bss_conf "ap_max_inactivity=$max_inactivity" "$N"
+	fi
+
+	[ "$airtime_bss_weight" -gt 0 ] && append bss_conf "airtime_bss_weight=$airtime_bss_weight" "$N"
+	[ "$airtime_bss_limit" -gt 0 ] && append bss_conf "airtime_bss_limit=$airtime_bss_limit" "$N"
+	json_for_each_item append_airtime_sta_weight airtime_sta_weight
+
+	append bss_conf "bss_load_update_period=$bss_load_update_period" "$N"
+	append bss_conf "chan_util_avg_period=$chan_util_avg_period" "$N"
+	append bss_conf "disassoc_low_ack=$disassoc_low_ack" "$N"
+	append bss_conf "skip_inactivity_poll=$skip_inactivity_poll" "$N"
+	append bss_conf "preamble=$short_preamble" "$N"
+	append bss_conf "wmm_enabled=$wmm" "$N"
+	append bss_conf "ignore_broadcast_ssid=$hidden" "$N"
+	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
+	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
+	append bss_conf "multi_ap=$multi_ap" "$N"
+	append bss_conf "beacon_int=$beacon_int" "$N"
+	[ -n "$vendor_elements" ] && append bss_conf "vendor_elements=$vendor_elements" "$N"
+
+	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
+
+	[ "$wpa" -gt 0 ] && {
+		[ -n "$wpa_group_rekey"  ] && append bss_conf "wpa_group_rekey=$wpa_group_rekey" "$N"
+		[ -n "$wpa_pair_rekey"   ] && append bss_conf "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
+		[ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
+		[ -n "$wpa_strict_rekey" ] && append bss_conf "wpa_strict_rekey=$wpa_strict_rekey" "$N"
+	}
+
+	[ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
+
+	[ -n "$acct_interval" ] && \
+		append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
+	json_for_each_item append_acct_server acct_server
+	json_for_each_item append_radius_acct_req_attr radius_acct_req_attr
+
+	[ -n "$ocv" ] && append bss_conf "ocv=$ocv" "$N"
+
+	case "$auth_type" in
+		sae|owe|eap2|eap192)
+			set_default ieee80211w 2
+			set_default sae_require_mfp 1
+			set_default sae_pwe 2
+		;;
+		psk-sae|eap-eap2)
+			set_default ieee80211w 1
+			set_default sae_require_mfp 1
+			set_default sae_pwe 2
+		;;
+	esac
+	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
+	[ -n "$sae_pwe" ] && append bss_conf "sae_pwe=$sae_pwe" "$N"
+
+	local vlan_possible=""
+
+	case "$auth_type" in
+		none|owe)
+			json_get_vars owe_transition_bssid owe_transition_ssid owe_transition_ifname
+
+			[ -n "$owe_transition_ssid" ] && append bss_conf "owe_transition_ssid=\"$owe_transition_ssid\"" "$N"
+			[ -n "$owe_transition_bssid" ] && append bss_conf "owe_transition_bssid=$owe_transition_bssid" "$N"
+			[ -n "$owe_transition_ifname" ] && append bss_conf "owe_transition_ifname=$owe_transition_ifname" "$N"
+
+			wps_possible=1
+			# Here we make the assumption that if we're in open mode
+			# with WPS enabled, we got to be in unconfigured state.
+			wps_not_configured=1
+		;;
+		psk|sae|psk-sae)
+			json_get_vars key wpa_psk_file
+			if [ "$auth_type" = "psk" ] && [ "$ppsk" -ne 0 ] ; then
+				json_get_vars auth_secret auth_port
+				set_default auth_port 1812
+				json_for_each_item append_auth_server auth_server
+				append bss_conf "macaddr_acl=2" "$N"
+				append bss_conf "wpa_psk_radius=2" "$N"
+			elif [ ${#key} -eq 64 ]; then
+				append bss_conf "wpa_psk=$key" "$N"
+			elif [ ${#key} -ge 8 ] && [ ${#key} -le 63 ]; then
+				append bss_conf "wpa_passphrase=$key" "$N"
+			elif [ -n "$key" ] || [ -z "$wpa_psk_file" ]; then
+				wireless_setup_vif_failed INVALID_WPA_PSK
+				return 1
+			fi
+			[ -z "$wpa_psk_file" ] && set_default wpa_psk_file /var/run/hostapd-$ifname.psk
+			[ -n "$wpa_psk_file" ] && {
+				[ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
+				append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
+			}
+			[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
+
+			set_default dynamic_vlan 0
+			vlan_possible=1
+			wps_possible=1
+		;;
+		eap|eap2|eap-eap2|eap192)
+			json_get_vars \
+				auth_server auth_secret auth_port \
+				dae_client dae_secret dae_port \
+				dynamic_ownip ownip radius_client_addr \
+				eap_reauth_period request_cui \
+				erp_domain mobility_domain \
+				fils_realm fils_dhcp
+
+			# radius can provide VLAN ID for clients
+			vlan_possible=1
+
+			set_default dynamic_ownip 1
+
+			# legacy compatibility
+			[ -n "$auth_server" ] || json_get_var auth_server server
+			[ -n "$auth_port" ] || json_get_var auth_port port
+			[ -n "$auth_secret" ] || json_get_var auth_secret key
+
+			[ "$fils" -gt 0 ] && {
+				set_default erp_domain "$mobility_domain"
+				set_default erp_domain "$(echo "$ssid" | md5sum | head -c 8)"
+				set_default fils_realm "$erp_domain"
+
+				append bss_conf "erp_send_reauth_start=1" "$N"
+				append bss_conf "erp_domain=$erp_domain" "$N"
+				append bss_conf "fils_realm=$fils_realm" "$N"
+				append bss_conf "fils_cache_id=$(echo "$fils_realm" | md5sum | head -c 4)" "$N"
+
+				[ "$fils_dhcp" = "*" ] && {
+					json_get_values network network
+					fils_dhcp=
+					for net in $network; do
+						fils_dhcp="$(ifstatus "$net" | jsonfilter -e '@.data.dhcpserver')"
+						[ -n "$fils_dhcp" ] && break
+					done
+
+					[ -z "$fils_dhcp" -a -n "$network_bridge" -a -n "$network_ifname" ] && \
+						fils_dhcp="$(udhcpc -B -n -q -s /lib/netifd/dhcp-get-server.sh -t 1 -i "$network_ifname" 2>/dev/null)"
+				}
+				[ -n "$fils_dhcp" ] && append bss_conf "dhcp_server=$fils_dhcp" "$N"
+			}
+
+			set_default auth_port 1812
+			set_default dae_port 3799
+			set_default request_cui 0
+
+			[ "$eap_server" -eq 0 ] && json_for_each_item append_auth_server auth_server
+			[ "$request_cui" -gt 0 ] && append bss_conf "radius_request_cui=$request_cui" "$N"
+			[ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
+
+			[ -n "$dae_client" -a -n "$dae_secret" ] && {
+				append bss_conf "radius_das_port=$dae_port" "$N"
+				append bss_conf "radius_das_client=$dae_client $dae_secret" "$N"
+			}
+			json_for_each_item append_radius_auth_req_attr radius_auth_req_attr
+
+			if [ -n "$ownip" ]; then
+				append bss_conf "own_ip_addr=$ownip" "$N"
+			elif [ "$dynamic_ownip" -gt 0 ]; then
+				append bss_conf "dynamic_own_ip_addr=$dynamic_ownip" "$N"
+			fi
+
+			[ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
+			append bss_conf "eapol_key_index_workaround=1" "$N"
+			append bss_conf "ieee8021x=1" "$N"
+
+			[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
+		;;
+		wep)
+			local wep_keyidx=0
+			json_get_vars key
+			hostapd_append_wep_key bss_conf
+			append bss_conf "wep_default_key=$wep_keyidx" "$N"
+			[ -n "$wep_rekey" ] && append bss_conf "wep_rekey_period=$wep_rekey" "$N"
+		;;
+	esac
+
+	case "$auth_type" in
+		none|owe|psk|sae|psk-sae|wep)
+			json_get_vars \
+			auth_server auth_port auth_secret \
+			ownip radius_client_addr
+
+			[ -n "$auth_server" ] &&  {
+				set_default auth_port 1812
+
+				json_for_each_item append_auth_server auth_server
+				[ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
+				[ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
+				append bss_conf "macaddr_acl=2" "$N"
+			}
+		;;
+	esac
+
+	local auth_algs="$((($auth_mode_shared << 1) | $auth_mode_open))"
+	append bss_conf "auth_algs=${auth_algs:-1}" "$N"
+	append bss_conf "wpa=$wpa" "$N"
+	[ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
+
+	set_default wps_pushbutton 0
+	set_default wps_label 0
+	set_default wps_pbc_in_m1 0
+
+	config_methods=
+	[ "$wps_pushbutton" -gt 0 ] && append config_methods push_button
+	[ "$wps_label" -gt 0 ] && append config_methods label
+
+	# WPS not possible on Multi-AP backhaul-only SSID
+	[ "$multi_ap" = 1 ] && wps_possible=
+
+	[ -n "$wps_possible" -a -n "$config_methods" ] && {
+		set_default ext_registrar 0
+		set_default wps_device_type "6-0050F204-1"
+		set_default wps_device_name "OpenWrt AP"
+		set_default wps_manufacturer "www.openwrt.org"
+		set_default wps_independent 1
+
+		wps_state=2
+		[ -n "$wps_not_configured" ] && wps_state=1
+
+		[ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N"
+
+		append bss_conf "eap_server=1" "$N"
+		[ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N"
+		append bss_conf "wps_state=$wps_state" "$N"
+		append bss_conf "device_type=$wps_device_type" "$N"
+		append bss_conf "device_name=$wps_device_name" "$N"
+		append bss_conf "manufacturer=$wps_manufacturer" "$N"
+		append bss_conf "config_methods=$config_methods" "$N"
+		append bss_conf "wps_independent=$wps_independent" "$N"
+		[ -n "$wps_ap_setup_locked" ] && append bss_conf "ap_setup_locked=$wps_ap_setup_locked" "$N"
+		[ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N"
+		[ "$multi_ap" -gt 0 ] && [ -n "$multi_ap_backhaul_ssid" ] && {
+			append bss_conf "multi_ap_backhaul_ssid=\"$multi_ap_backhaul_ssid\"" "$N"
+			if [ -z "$multi_ap_backhaul_key" ]; then
+				:
+			elif [ ${#multi_ap_backhaul_key} -lt 8 ]; then
+				wireless_setup_vif_failed INVALID_WPA_PSK
+				return 1
+			elif [ ${#multi_ap_backhaul_key} -eq 64 ]; then
+				append bss_conf "multi_ap_backhaul_wpa_psk=$multi_ap_backhaul_key" "$N"
+			else
+				append bss_conf "multi_ap_backhaul_wpa_passphrase=$multi_ap_backhaul_key" "$N"
+			fi
+		}
+	}
+
+	append bss_conf "ssid=$ssid" "$N"
+	[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=" "$N"
+	[ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
+	[ -n "$iapp_interface" ] && {
+		local ifname
+		network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
+		append bss_conf "iapp_interface=$ifname" "$N"
+	}
+
+	json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition mbo
+	set_default bss_transition 0
+	set_default wnm_sleep_mode 0
+	set_default wnm_sleep_mode_no_keys 0
+	set_default mbo 0
+
+	[ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
+	[ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
+	if [ "$wnm_sleep_mode" -eq "1" ]; then
+		append bss_conf "wnm_sleep_mode=1" "$N"
+		[ "$wnm_sleep_mode_no_keys" -eq "1" ] && append bss_conf "wnm_sleep_mode_no_keys=1" "$N"
+	fi
+	[ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"
+	[ "$mbo" -eq 1 ] && append bss_conf "mbo=1" "$N"
+
+	json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report rnr
+	set_default ieee80211k 0
+	set_default rnr 0
+	if [ "$ieee80211k" -eq "1" ]; then
+		set_default rrm_neighbor_report 1
+		set_default rrm_beacon_report 1
+	else
+		set_default rrm_neighbor_report 0
+		set_default rrm_beacon_report 0
+	fi
+
+	[ "$rrm_neighbor_report" -eq "1" ] && append bss_conf "rrm_neighbor_report=1" "$N"
+	[ "$rrm_beacon_report" -eq "1" ] && append bss_conf "rrm_beacon_report=1" "$N"
+	[ "$rnr" -eq "1" ] && append bss_conf "rnr=1" "$N"
+
+	json_get_vars ftm_responder stationary_ap lci civic
+	set_default ftm_responder 0
+	if [ "$ftm_responder" -eq "1" ]; then
+		set_default stationary_ap 0
+		iw phy "$phy" info | grep -q "ENABLE_FTM_RESPONDER" && {
+			append bss_conf "ftm_responder=1" "$N"
+			[ "$stationary_ap" -eq "1" ] && append bss_conf "stationary_ap=1" "$N"
+			[ -n "$lci" ] && append bss_conf "lci=$lci" "$N"
+			[ -n "$civic" ] && append bss_conf "civic=$civic" "$N"
+		}
+	fi
+
+	json_get_vars ieee80211r
+	set_default ieee80211r 0
+	if [ "$wpa" -ge "1" ]; then
+		if [ "$fils" -gt 0 ]; then
+			json_get_vars fils_realm
+			set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
+		fi
+
+		append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
+
+		hostapd_append_wpa_key_mgmt
+		[ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
+	fi
+
+	if [ "$wpa" -ge "2" ]; then
+		if [ "$ieee80211r" -gt "0" ]; then
+			json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
+
+			set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)"
+			set_default ft_over_ds 0
+			set_default reassociation_deadline 1000
+
+			case "$auth_type" in
+				psk)
+					set_default ft_psk_generate_local 1
+				;;
+				*)
+					set_default ft_psk_generate_local 0
+				;;
+			esac
+
+			[ -n "$network_ifname" ] && append bss_conf "ft_iface=$network_ifname" "$N"
+			append bss_conf "mobility_domain=$mobility_domain" "$N"
+			append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
+			append bss_conf "ft_over_ds=$ft_over_ds" "$N"
+			append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
+
+			if [ "$ft_psk_generate_local" -eq "0" ]; then
+				json_get_vars r0_key_lifetime r1_key_holder pmk_r1_push
+				json_get_values r0kh r0kh
+				json_get_values r1kh r1kh
+
+				set_default r0_key_lifetime 10000
+				set_default pmk_r1_push 0
+
+				[ -n "$r0kh" -a -n "$r1kh" ] || {
+					ft_key=`echo -n "$mobility_domain/${auth_secret:-${key}}" | md5sum | awk '{print $1}'`
+
+					set_default r0kh "ff:ff:ff:ff:ff:ff,*,$ft_key"
+					set_default r1kh "00:00:00:00:00:00,00:00:00:00:00:00,$ft_key"
+				}
+
+				[ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
+				append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
+				append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
+
+				for kh in $r0kh; do
+					append bss_conf "r0kh=${kh//,/ }" "$N"
+				done
+				for kh in $r1kh; do
+					append bss_conf "r1kh=${kh//,/ }" "$N"
+				done
+			fi
+		fi
+
+		if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
+			set_default auth_cache 1
+			append bss_conf "rsn_preauth=1" "$N"
+			append bss_conf "rsn_preauth_interfaces=$network_bridge" "$N"
+		else
+			case "$auth_type" in
+			sae|psk-sae|owe)
+				set_default auth_cache 1
+			;;
+			*)
+				set_default auth_cache 0
+			;;
+			esac
+		fi
+
+		append bss_conf "okc=$auth_cache" "$N"
+		[ "$auth_cache" = 0 -a "$fils" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
+
+		# RSN -> allow management frame protection
+		case "$ieee80211w" in
+			[012])
+				json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout
+				append bss_conf "ieee80211w=$ieee80211w" "$N"
+				[ "$ieee80211w" -gt "0" ] && {
+					if [ "$auth_type" = "eap192" ]; then
+						append bss_conf "group_mgmt_cipher=BIP-GMAC-256" "$N"
+					else
+						append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N"
+					fi
+					[ -n "$ieee80211w_max_timeout" ] && \
+						append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+					[ -n "$ieee80211w_retry_timeout" ] && \
+						append bss_conf "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+				}
+			;;
+		esac
+	fi
+
+	_macfile="/var/run/hostapd-$ifname.maclist"
+	case "$macfilter" in
+		allow)
+			append bss_conf "macaddr_acl=1" "$N"
+			append bss_conf "accept_mac_file=$_macfile" "$N"
+			# accept_mac_file can be used to set MAC to VLAN ID mapping
+			vlan_possible=1
+		;;
+		deny)
+			append bss_conf "macaddr_acl=0" "$N"
+			append bss_conf "deny_mac_file=$_macfile" "$N"
+		;;
+		*)
+			_macfile=""
+		;;
+	esac
+
+	[ -n "$_macfile" ] && {
+		json_get_vars macfile
+		json_get_values maclist maclist
+
+		rm -f "$_macfile"
+		(
+			for mac in $maclist; do
+				echo "$mac"
+			done
+			[ -n "$macfile" -a -f "$macfile" ] && cat "$macfile"
+		) > "$_macfile"
+	}
+
+	[ -n "$vlan_possible" -a -n "$dynamic_vlan" ] && {
+		json_get_vars vlan_naming vlan_tagged_interface vlan_bridge vlan_file vlan_no_bridge
+		set_default vlan_naming 1
+		[ -z "$vlan_file" ] && set_default vlan_file /var/run/hostapd-$ifname.vlan
+		append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
+		append bss_conf "vlan_naming=$vlan_naming" "$N"
+		if [ -n "$vlan_bridge" ]; then
+			append bss_conf "vlan_bridge=$vlan_bridge" "$N"
+		else
+			set_default vlan_no_bridge 1
+		fi
+		append bss_conf "vlan_no_bridge=$vlan_no_bridge" "$N"
+		[ -n "$vlan_tagged_interface" ] && \
+			append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
+		[ -n "$vlan_file" ] && {
+			[ -e "$vlan_file" ] || touch "$vlan_file"
+			append bss_conf "vlan_file=$vlan_file" "$N"
+		}
+	}
+
+	json_get_vars iw_enabled iw_internet iw_asra iw_esr iw_uesa iw_access_network_type
+	json_get_vars iw_hessid iw_venue_group iw_venue_type iw_network_auth_type
+	json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
+	json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
+	json_get_vars iw_venue_name iw_venue_url
+
+	set_default iw_enabled 0
+	if [ "$iw_enabled" = "1" ]; then
+		append bss_conf "interworking=1" "$N"
+		set_default iw_internet 1
+		set_default iw_asra 0
+		set_default iw_esr 0
+		set_default iw_uesa 0
+
+		append bss_conf "internet=$iw_internet" "$N"
+		append bss_conf "asra=$iw_asra" "$N"
+		append bss_conf "esr=$iw_esr" "$N"
+		append bss_conf "uesa=$iw_uesa" "$N"
+
+		[ -n "$iw_access_network_type" ] && \
+			append bss_conf "access_network_type=$iw_access_network_type" "$N"
+		[ -n "$iw_hessid" ] && append bss_conf "hessid=$iw_hessid" "$N"
+		[ -n "$iw_venue_group" ] && \
+			append bss_conf "venue_group=$iw_venue_group" "$N"
+		[ -n "$iw_venue_type" ] && append bss_conf "venue_type=$iw_venue_type" "$N"
+		[ -n "$iw_network_auth_type" ] && \
+			append bss_conf "network_auth_type=$iw_network_auth_type" "$N"
+		[ -n "$iw_gas_address3" ] && append bss_conf "gas_address3=$iw_gas_address3" "$N"
+
+		json_for_each_item append_iw_roaming_consortium iw_roaming_consortium
+		json_for_each_item append_iw_anqp_elem iw_anqp_elem
+		json_for_each_item append_iw_nai_realm iw_nai_realm
+		json_for_each_item append_iw_venue_name iw_venue_name
+		json_for_each_item append_iw_venue_url iw_venue_url
+
+		iw_domain_name_conf=
+		json_for_each_item append_iw_domain_name iw_domain_name
+		[ -n "$iw_domain_name_conf" ] && \
+			append bss_conf "domain_name=$iw_domain_name_conf" "$N"
+
+		iw_anqp_3gpp_cell_net_conf=
+		json_for_each_item append_iw_anqp_3gpp_cell_net iw_anqp_3gpp_cell_net
+		[ -n "$iw_anqp_3gpp_cell_net_conf" ] && \
+			append bss_conf "anqp_3gpp_cell_net=$iw_anqp_3gpp_cell_net_conf" "$N"
+	fi
+
+	set_default iw_qos_map_set 0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56
+	case "$iw_qos_map_set" in
+		*,*);;
+		*) iw_qos_map_set="";;
+	esac
+	[ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N"
+
+	local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
+		osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
+		hs20_t_c_server_url
+	json_get_vars hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
+		osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
+		hs20_t_c_server_url
+
+	set_default hs20 0
+	set_default disable_dgaf $hs20
+	set_default osen 0
+	set_default anqp_domain_id 0
+	set_default hs20_deauth_req_timeout 60
+	if [ "$hs20" = "1" ]; then
+		append bss_conf "hs20=1" "$N"
+		append_hs20_icons
+		append bss_conf "disable_dgaf=$disable_dgaf" "$N"
+		append bss_conf "osen=$osen" "$N"
+		append bss_conf "anqp_domain_id=$anqp_domain_id" "$N"
+		append bss_conf "hs20_deauth_req_timeout=$hs20_deauth_req_timeout" "$N"
+		[ -n "$osu_ssid" ] && append bss_conf "osu_ssid=$osu_ssid" "$N"
+		[ -n "$hs20_wan_metrics" ] && append bss_conf "hs20_wan_metrics=$hs20_wan_metrics" "$N"
+		[ -n "$hs20_operating_class" ] && append bss_conf "hs20_operating_class=$hs20_operating_class" "$N"
+		[ -n "$hs20_t_c_filename" ] && append bss_conf "hs20_t_c_filename=$hs20_t_c_filename" "$N"
+		[ -n "$hs20_t_c_timestamp" ] && append bss_conf "hs20_t_c_timestamp=$hs20_t_c_timestamp" "$N"
+		[ -n "$hs20_t_c_server_url" ] && append bss_conf "hs20_t_c_server_url=$hs20_t_c_server_url" "$N"
+		json_for_each_item append_hs20_oper_friendly_name hs20_oper_friendly_name
+		json_for_each_item append_hs20_conn_capab hs20_conn_capab
+		json_for_each_item append_osu_provider osu_provider
+		json_for_each_item append_operator_icon operator_icon
+	fi
+
+	if [ "$eap_server" = "1" ]; then
+		append bss_conf "eap_server=1" "$N"
+		append bss_conf "eap_server_erp=1" "$N"
+		[ -n "$eap_user_file" ] && append bss_conf "eap_user_file=$eap_user_file" "$N"
+		[ -n "$ca_cert" ] && append bss_conf "ca_cert=$ca_cert" "$N"
+		[ -n "$server_cert" ] && append bss_conf "server_cert=$server_cert" "$N"
+		[ -n "$private_key" ] && append bss_conf "private_key=$private_key" "$N"
+		[ -n "$private_key_passwd" ] && append bss_conf "private_key_passwd=$private_key_passwd" "$N"
+		[ -n "$server_id" ] && append bss_conf "server_id=$server_id" "$N"
+	fi
+
+	set_default multicast_to_unicast_all 0
+	if [ "$multicast_to_unicast_all" -gt 0 ]; then
+		append bss_conf "multicast_to_unicast=$multicast_to_unicast_all" "$N"
+	fi
+	set_default proxy_arp 0
+	if [ "$proxy_arp" -gt 0 ]; then
+		append bss_conf "proxy_arp=$proxy_arp" "$N"
+	fi
+
+	set_default per_sta_vif 0
+	if [ "$per_sta_vif" -gt 0 ]; then
+		append bss_conf "per_sta_vif=$per_sta_vif" "$N"
+	fi
+
+	json_get_values opts hostapd_bss_options
+	for val in $opts; do
+		append bss_conf "$val" "$N"
+	done
+
+	append "$var" "$bss_conf" "$N"
+	return 0
+}
+
+hostapd_set_log_options() {
+	local var="$1"
+
+	local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
+	json_get_vars log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
+
+	set_default log_level 2
+	set_default log_80211  1
+	set_default log_8021x  1
+	set_default log_radius 1
+	set_default log_wpa    1
+	set_default log_driver 1
+	set_default log_iapp   1
+	set_default log_mlme   1
+
+	local log_mask="$(( \
+		($log_80211  << 0) | \
+		($log_8021x  << 1) | \
+		($log_radius << 2) | \
+		($log_wpa    << 3) | \
+		($log_driver << 4) | \
+		($log_iapp   << 5) | \
+		($log_mlme   << 6)   \
+	))"
+
+	append "$var" "logger_syslog=$log_mask" "$N"
+	append "$var" "logger_syslog_level=$log_level" "$N"
+	append "$var" "logger_stdout=$log_mask" "$N"
+	append "$var" "logger_stdout_level=$log_level" "$N"
+
+	return 0
+}
+
+_wpa_supplicant_common() {
+	local ifname="$1"
+
+	_rpath="/var/run/wpa_supplicant"
+	_config="${_rpath}-$ifname.conf"
+}
+
+wpa_supplicant_teardown_interface() {
+	_wpa_supplicant_common "$1"
+	rm -rf "$_rpath/$1" "$_config"
+}
+
+wpa_supplicant_prepare_interface() {
+	local ifname="$1"
+	_w_driver="$2"
+
+	_wpa_supplicant_common "$1"
+
+	json_get_vars mode wds multi_ap
+
+	[ -n "$network_bridge" ] && {
+		fail=
+		case "$mode" in
+			adhoc)
+				fail=1
+			;;
+			sta)
+				[ "$wds" = 1 -o "$multi_ap" = 1 ] || fail=1
+			;;
+		esac
+
+		[ -n "$fail" ] && {
+			wireless_setup_vif_failed BRIDGE_NOT_ALLOWED
+			return 1
+		}
+	}
+
+	local ap_scan=
+
+	_w_mode="$mode"
+
+	[ "$mode" = adhoc ] && {
+		ap_scan="ap_scan=2"
+	}
+
+	local country_str=
+	[ -n "$country" ] && {
+		country_str="country=$country"
+	}
+
+	multiap_flag_file="${_config}.is_multiap"
+	if [ "$multi_ap" = "1" ]; then
+		touch "$multiap_flag_file"
+	else
+		[ -e "$multiap_flag_file" ] && rm "$multiap_flag_file"
+	fi
+	wpa_supplicant_teardown_interface "$ifname"
+	cat > "$_config" <<EOF
+${scan_list:+freq_list=$scan_list}
+$ap_scan
+$country_str
+EOF
+	return 0
+}
+
+wpa_supplicant_set_fixed_freq() {
+	local freq="$1"
+	local htmode="$2"
+
+	append network_data "fixed_freq=1" "$N$T"
+	append network_data "frequency=$freq" "$N$T"
+	case "$htmode" in
+		NOHT) append network_data "disable_ht=1" "$N$T";;
+		HE20|HT20|VHT20) append network_data "disable_ht40=1" "$N$T";;
+		HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160) append network_data "ht40=1" "$N$T";;
+	esac
+	case "$htmode" in
+		VHT*) append network_data "vht=1" "$N$T";;
+	esac
+	case "$htmode" in
+		HE80|VHT80) append network_data "max_oper_chwidth=1" "$N$T";;
+		HE160|VHT160) append network_data "max_oper_chwidth=2" "$N$T";;
+		HE20|HE40|VHT20|VHT40) append network_data "max_oper_chwidth=0" "$N$T";;
+		*) append network_data "disable_vht=1" "$N$T";;
+	esac
+}
+
+wpa_supplicant_add_network() {
+	local ifname="$1"
+	local freq="$2"
+	local htmode="$3"
+	local noscan="$4"
+
+	_wpa_supplicant_common "$1"
+	wireless_vif_parse_encryption
+
+	json_get_vars \
+		ssid bssid key \
+		basic_rate mcast_rate \
+		ieee80211w ieee80211r fils ocv \
+		multi_ap \
+		default_disabled \
+		beacon_int
+
+	case "$auth_type" in
+		sae|owe|eap2|eap192)
+			set_default ieee80211w 2
+		;;
+		psk-sae)
+			set_default ieee80211w 1
+		;;
+	esac
+
+	set_default ieee80211r 0
+	set_default multi_ap 0
+	set_default default_disabled 0
+	set_default beacon_int 100
+
+	local key_mgmt='NONE'
+	local network_data=
+	local T="	"
+
+	local scan_ssid="scan_ssid=1"
+	local freq wpa_key_mgmt
+
+	[ "$_w_mode" = "adhoc" ] && {
+		append network_data "mode=1" "$N$T"
+		[ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+		[ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
+
+		scan_ssid="scan_ssid=0"
+
+		[ "$_w_driver" = "nl80211" ] ||	append wpa_key_mgmt "WPA-NONE"
+	}
+
+	[ "$_w_mode" = "mesh" ] && {
+		json_get_vars mesh_id mesh_fwding mesh_rssi_threshold encryption
+		[ -n "$mesh_id" ] && ssid="${mesh_id}"
+
+		append network_data "mode=5" "$N$T"
+		[ -n "$mesh_fwding" ] && append network_data "mesh_fwding=${mesh_fwding}" "$N$T"
+		[ -n "$mesh_rssi_threshold" ] && append network_data "mesh_rssi_threshold=${mesh_rssi_threshold}" "$N$T"
+		[ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+		[ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
+		[ "$encryption" = "none" -o -z "$encryption" ] || append wpa_key_mgmt "SAE"
+		scan_ssid=""
+	}
+
+	[ "$_w_mode" = "sta" ] && {
+		[ "$multi_ap" = 1 ] && append network_data "multi_ap_backhaul_sta=1" "$N$T"
+		[ "$default_disabled" = 1 ] && append network_data "disabled=1" "$N$T"
+	}
+
+	[ -n "$ocv" ] && append network_data "ocv=$ocv" "$N$T"
+
+	case "$auth_type" in
+		none) ;;
+		owe)
+			hostapd_append_wpa_key_mgmt
+			key_mgmt="$wpa_key_mgmt"
+		;;
+		wep)
+			local wep_keyidx=0
+			hostapd_append_wep_key network_data
+			append network_data "wep_tx_keyidx=$wep_keyidx" "$N$T"
+		;;
+		wps)
+			key_mgmt='WPS'
+		;;
+		psk|sae|psk-sae)
+			local passphrase
+
+			if [ "$_w_mode" != "mesh" ]; then
+				hostapd_append_wpa_key_mgmt
+			fi
+
+			key_mgmt="$wpa_key_mgmt"
+
+			if [ "$_w_mode" = "mesh" ] || [ "$auth_type" = "sae" ]; then
+				passphrase="sae_password=\"${key}\""
+			else
+				if [ ${#key} -eq 64 ]; then
+					passphrase="psk=${key}"
+				else
+					passphrase="psk=\"${key}\""
+				fi
+			fi
+			append network_data "$passphrase" "$N$T"
+		;;
+		eap|eap2|eap192)
+			hostapd_append_wpa_key_mgmt
+			key_mgmt="$wpa_key_mgmt"
+
+			json_get_vars eap_type identity anonymous_identity ca_cert ca_cert_usesystem
+
+			[ "$fils" -gt 0 ] && append network_data "erp=1" "$N$T"
+			if [ "$ca_cert_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then
+				append network_data "ca_cert=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T"
+			else
+				[ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"
+			fi
+			[ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T"
+			[ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T"
+			case "$eap_type" in
+				tls)
+					json_get_vars client_cert priv_key priv_key_pwd
+					append network_data "client_cert=\"$client_cert\"" "$N$T"
+					append network_data "private_key=\"$priv_key\"" "$N$T"
+					append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T"
+
+					json_get_vars subject_match
+					[ -n "$subject_match" ] && append network_data "subject_match=\"$subject_match\"" "$N$T"
+
+					json_get_values altsubject_match altsubject_match
+					if [ -n "$altsubject_match" ]; then
+						local list=
+						for x in $altsubject_match; do
+							append list "$x" ";"
+						done
+						append network_data "altsubject_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_match domain_match
+					if [ -n "$domain_match" ]; then
+						local list=
+						for x in $domain_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_suffix_match domain_suffix_match
+					if [ -n "$domain_suffix_match" ]; then
+						local list=
+						for x in $domain_suffix_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_suffix_match=\"$list\"" "$N$T"
+					fi
+				;;
+				fast|peap|ttls)
+					json_get_vars auth password ca_cert2 ca_cert2_usesystem client_cert2 priv_key2 priv_key2_pwd
+					set_default auth MSCHAPV2
+
+					if [ "$auth" = "EAP-TLS" ]; then
+						if [ "$ca_cert2_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then
+							append network_data "ca_cert2=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T"
+						else
+							[ -n "$ca_cert2" ] && append network_data "ca_cert2=\"$ca_cert2\"" "$N$T"
+						fi
+						append network_data "client_cert2=\"$client_cert2\"" "$N$T"
+						append network_data "private_key2=\"$priv_key2\"" "$N$T"
+						append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T"
+					else
+						append network_data "password=\"$password\"" "$N$T"
+					fi
+
+					json_get_vars subject_match
+					[ -n "$subject_match" ] && append network_data "subject_match=\"$subject_match\"" "$N$T"
+
+					json_get_values altsubject_match altsubject_match
+					if [ -n "$altsubject_match" ]; then
+						local list=
+						for x in $altsubject_match; do
+							append list "$x" ";"
+						done
+						append network_data "altsubject_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_match domain_match
+					if [ -n "$domain_match" ]; then
+						local list=
+						for x in $domain_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_match=\"$list\"" "$N$T"
+					fi
+
+					json_get_values domain_suffix_match domain_suffix_match
+					if [ -n "$domain_suffix_match" ]; then
+						local list=
+						for x in $domain_suffix_match; do
+							append list "$x" ";"
+						done
+						append network_data "domain_suffix_match=\"$list\"" "$N$T"
+					fi
+
+					phase2proto="auth="
+					case "$auth" in
+						"auth"*)
+							phase2proto=""
+						;;
+						"EAP-"*)
+							auth="$(echo $auth | cut -b 5- )"
+							[ "$eap_type" = "ttls" ] &&
+								phase2proto="autheap="
+							json_get_vars subject_match2
+							[ -n "$subject_match2" ] && append network_data "subject_match2=\"$subject_match2\"" "$N$T"
+
+							json_get_values altsubject_match2 altsubject_match2
+							if [ -n "$altsubject_match2" ]; then
+								local list=
+								for x in $altsubject_match2; do
+									append list "$x" ";"
+								done
+								append network_data "altsubject_match2=\"$list\"" "$N$T"
+							fi
+
+							json_get_values domain_match2 domain_match2
+							if [ -n "$domain_match2" ]; then
+								local list=
+								for x in $domain_match2; do
+									append list "$x" ";"
+								done
+								append network_data "domain_match2=\"$list\"" "$N$T"
+							fi
+
+							json_get_values domain_suffix_match2 domain_suffix_match2
+							if [ -n "$domain_suffix_match2" ]; then
+								local list=
+								for x in $domain_suffix_match2; do
+									append list "$x" ";"
+								done
+								append network_data "domain_suffix_match2=\"$list\"" "$N$T"
+							fi
+						;;
+					esac
+					append network_data "phase2=\"$phase2proto$auth\"" "$N$T"
+				;;
+			esac
+			append network_data "eap=$(echo $eap_type | tr 'a-z' 'A-Z')" "$N$T"
+		;;
+	esac
+
+	[ "$wpa_cipher" = GCMP ] && {
+		append network_data "pairwise=GCMP" "$N$T"
+		append network_data "group=GCMP" "$N$T"
+	}
+
+	[ "$mode" = mesh ] || {
+		case "$wpa" in
+			1)
+				append network_data "proto=WPA" "$N$T"
+			;;
+			2)
+				append network_data "proto=RSN" "$N$T"
+			;;
+		esac
+
+		case "$ieee80211w" in
+			[012])
+				[ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
+			;;
+		esac
+	}
+	[ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
+	[ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
+
+	local bssid_blacklist bssid_whitelist
+	json_get_values bssid_blacklist bssid_blacklist
+	json_get_values bssid_whitelist bssid_whitelist
+
+	[ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T"
+	[ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T"
+
+	[ -n "$basic_rate" ] && {
+		local br rate_list=
+		for br in $basic_rate; do
+			wpa_supplicant_add_rate rate_list "$br"
+		done
+		[ -n "$rate_list" ] && append network_data "rates=$rate_list" "$N$T"
+	}
+
+	[ -n "$mcast_rate" ] && {
+		local mc_rate=
+		wpa_supplicant_add_rate mc_rate "$mcast_rate"
+		append network_data "mcast_rate=$mc_rate" "$N$T"
+	}
+
+	if [ "$key_mgmt" = "WPS" ]; then
+		echo "wps_cred_processing=1" >> "$_config"
+	else
+		cat >> "$_config" <<EOF
+network={
+	$scan_ssid
+	ssid="$ssid"
+	key_mgmt=$key_mgmt
+	$network_data
+}
+EOF
+	fi
+	return 0
+}
+
+hostapd_common_cleanup() {
+	killall meshd-nl80211
+}
diff --git a/feeds/morse/utils/hostapd_s1g/patches/0001-APP-2573-Emit-a-DPP-PB_STATUS-event-when-push-button.patch b/feeds/morse/utils/hostapd_s1g/patches/0001-APP-2573-Emit-a-DPP-PB_STATUS-event-when-push-button.patch
new file mode 100644
index 000000000..998ba0a26
--- /dev/null
+++ b/feeds/morse/utils/hostapd_s1g/patches/0001-APP-2573-Emit-a-DPP-PB_STATUS-event-when-push-button.patch
@@ -0,0 +1,45 @@
+From 5433351ed5ab62c2d4fbd15a2c4d8c4aeacb93dc Mon Sep 17 00:00:00 2001
+From: Evan Benn <evan.benn@morsemicro.com>
+Date: Thu, 29 Feb 2024 11:09:38 +1100
+Subject: [PATCH] APP-2573: Emit a DPP PB_STATUS event when push button starts
+
+---
+ src/ap/dpp_hostapd.c            | 1 +
+ wpa_supplicant/dpp_supplicant.c | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
+index b7cca47c714b..3025eef204d2 100644
+--- a/src/ap/dpp_hostapd.c
++++ b/src/ap/dpp_hostapd.c
+@@ -3960,6 +3960,7 @@ int hostapd_dpp_push_button(struct hostapd_data *hapd, const char *cmd)
+ 	eloop_register_timeout(100, 0, hostapd_dpp_push_button_expire,
+ 			       hapd, NULL);
+ 
++	wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_PB_STATUS "started");
+ 	return 0;
+ }
+ 
+diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
+index ab06ff8d32c1..24e4bb3c444d 100644
+--- a/wpa_supplicant/dpp_supplicant.c
++++ b/wpa_supplicant/dpp_supplicant.c
+@@ -5676,6 +5676,7 @@ static int wpas_dpp_push_button_configurator(struct wpa_supplicant *wpa_s,
+ 	eloop_register_timeout(100, 0, wpas_dpp_push_button_expire,
+ 			       wpa_s, NULL);
+ 
++	wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_PB_STATUS "started");
+ 	return 0;
+ }
+ 
+@@ -5749,6 +5750,7 @@ int wpas_dpp_push_button(struct wpa_supplicant *wpa_s, const char *cmd)
+ 	wpa_supplicant_req_scan(wpa_s, 0, 0);
+ 
+ 	res = 0;
++	wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_PB_STATUS "started");
+ out:
+ 
+ 	/* If push button mode failed to start, restart the chirp forever timer */
+-- 
+2.42.0.530.g692be87cbba5
+
diff --git a/feeds/morse/utils/hostapd_s1g/patches/0002-SW-11943-dpp-does-not-associate-in-us-regd.patch b/feeds/morse/utils/hostapd_s1g/patches/0002-SW-11943-dpp-does-not-associate-in-us-regd.patch
new file mode 100644
index 000000000..8f4805edf
--- /dev/null
+++ b/feeds/morse/utils/hostapd_s1g/patches/0002-SW-11943-dpp-does-not-associate-in-us-regd.patch
@@ -0,0 +1,90 @@
+From 25631fa387af430b8d7f03302218c66dc161cc6f Mon Sep 17 00:00:00 2001
+From: Andrew Pope <andrew.pope@morsemicro.com>
+Date: Tue, 4 Jun 2024 23:12:37 +0000
+Subject: [PATCH] Merged in SW-11943-dpp-does-not-associate-in-us-regdom (pull
+ request #213)
+
+SW-11943: DPP does not associate in US regdom
+
+Two problems contributed to the originally reported issue:
+
+1. The DPP-PB state machine function will unconditionally cancel any pending off-channel actions - even if the DPP PB discovery phase is over. To fix this, avoid unconditionally completing offchannel actions from DPP-PB state machine function if DPP PB discovery phase is over.
+
+2. Logic around PKEX retries will manually attempt to complete the exchange on adjacent non-S1G channels. These retries inevitably fail, leading to a quicker collapse of the PKEX exchange attempts and eventual downgrade from v2 to v1 (bad). To fix this, remove non-S1G frequency hopping logic from DPP PB discovery and PKEX exchange phases.
+
+Approved-by: Neville Young
+Approved-by: Simon Wadsworth
+Approved-by: Ayman Grais
+Approved-by: James Herbert
+---
+ src/ap/dpp_hostapd.c            |  6 ++++++
+ wpa_supplicant/dpp_supplicant.c | 17 +++++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
+index b7cca47c7..282581fe5 100644
+--- a/src/ap/dpp_hostapd.c
++++ b/src/ap/dpp_hostapd.c
+@@ -260,6 +260,12 @@ static int hostapd_dpp_allow_ir(struct hostapd_data *hapd, unsigned int freq)
+ static int hostapd_dpp_pkex_next_channel(struct hostapd_data *hapd,
+ 					 struct dpp_pkex *pkex)
+ {
++	/* Following logic is not S1G compatible. Attempting PKEX on non-adjacent S1G channels
++	 * results in guaranteed failure.
++	 */
++	if (hapd->iconf->ieee80211ah)
++		return -1;
++
+ 	if (pkex->freq == 2437)
+ 		pkex->freq = 5745;
+ 	else if (pkex->freq == 5745)
+diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
+index ab06ff8d3..e90e4a163 100644
+--- a/wpa_supplicant/dpp_supplicant.c
++++ b/wpa_supplicant/dpp_supplicant.c
+@@ -2840,6 +2840,12 @@ static int wpas_dpp_allow_ir(struct wpa_supplicant *wpa_s, unsigned int freq)
+ static int wpas_dpp_pkex_next_channel(struct wpa_supplicant *wpa_s,
+ 				      struct dpp_pkex *pkex)
+ {
++#if defined(CONFIG_IEEE80211AH)
++	/* Following logic is not S1G compatible. Attempting PKEX on non-adjacent S1G channels
++	 * results in guaranteed failure.
++	 */
++	return -1;
++#endif
+ 	if (pkex->freq == 2437)
+ 		pkex->freq = 5745;
+ 	else if (pkex->freq == 5745)
+@@ -5113,10 +5119,16 @@ static int * wpas_dpp_presence_ann_channels(struct wpa_supplicant *wpa_s,
+ 
+ 			if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_RADAR))
+ 				continue;
++#if defined(CONFIG_IEEE80211AH)
++			/* Adding channels 44 and 149 at end of scan list is not required
++			 * for HaLow
++			 */
++#else
+ 			if (chan->freq == 5220)
+ 				chan44 = 1;
+ 			if (chan->freq == 5745)
+ 				chan149 = 1;
++#endif
+ 
+ 			/* Morse - All 5GHz channels that are mapped to 1 MHz and 2 MHz.
+ 			 * Channels that aren't relevant to a regulatory domain will be
+@@ -5573,9 +5585,10 @@ static void wpas_dpp_pb_next(void *eloop_ctx, void *timeout_ctx)
+ 	if (!wpa_s->dpp_pb_freqs)
+ 		return;
+ 
+-	os_get_reltime(&now);
+-	offchannel_send_action_done(wpa_s);
++	if (!wpa_s->dpp_pb_discovery_done)
++		offchannel_send_action_done(wpa_s);
+ 
++	os_get_reltime(&now);
+ 	if (os_reltime_expired(&now, &wpa_s->dpp_pb_time, 100)) {
+ 		wpa_printf(MSG_DEBUG, "DPP: Push button wait time expired");
+ 		wpas_dpp_push_button_stop(wpa_s);
+-- 
+2.25.1
+
diff --git a/feeds/morse/utils/hostapd_s1g/patches/0003-Hack-out-channel-50-and-typo-for-51.patch b/feeds/morse/utils/hostapd_s1g/patches/0003-Hack-out-channel-50-and-typo-for-51.patch
new file mode 100644
index 000000000..2e3bff16a
--- /dev/null
+++ b/feeds/morse/utils/hostapd_s1g/patches/0003-Hack-out-channel-50-and-typo-for-51.patch
@@ -0,0 +1,35 @@
+From 591ec24748525171d5647d2a35cd1da1445e7a0b Mon Sep 17 00:00:00 2001
+From: James Haggerty <james.haggerty@morsemicro.com>
+Date: Fri, 26 Jul 2024 09:55:03 +1000
+Subject: [PATCH] Hack out channel 50 (and typo for 51)
+
+If we use these channels on a board with those channels disabled,
+the DPP presence announcement fails.
+
+This is rubbish: see SW-12450
+---
+ wpa_supplicant/dpp_supplicant.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
+index 09f8ceb07..46e4add95 100644
+--- a/wpa_supplicant/dpp_supplicant.c
++++ b/wpa_supplicant/dpp_supplicant.c
+@@ -5199,12 +5199,12 @@ static int * wpas_dpp_presence_ann_channels(struct wpa_supplicant *wpa_s,
+ 			static const int s1g_chirp_channels[] = {
+ 				/* 2MHz channels */
+ 				5190, 5230, 5270, 5310, 5510, 5550,
+-				5630, 5670, 5755, 5795, 5835, 5875,
++				5630, 5670, 5755, 5795, 5835,
+ 				/* 1MHz channels */
+ 				5660, 5680, 5180, 5200, 5240, 5260,
+ 				5280, 5300, 5320, 5500, 5520, 5540,
+ 				5560, 5580, 5600, 5620, 5640, 5765,
+-				5785, 5805, 5825, 5845, 5865, 5855
++				5785, 5805, 5825, 5845, 5865
+ 			};
+ 
+ 			if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_RADAR))
+-- 
+2.25.1
+
diff --git a/feeds/morse/utils/morse_mesh11sd/Makefile b/feeds/morse/utils/morse_mesh11sd/Makefile
new file mode 100644
index 000000000..591a1ff22
--- /dev/null
+++ b/feeds/morse/utils/morse_mesh11sd/Makefile
@@ -0,0 +1,73 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+#The mesh11sd dameon is designed in such a way that all configuration done to 11s mesh can be directly set to the
+#mac80211 via iw utility and does not require any re-configuration of interfaces. Considering the MorseMicro design and
+#implementation of 802.11s mesh, most of the configuration needs to be applied to the wpa_supplicant.conf which requires
+#re-configuration of the interface.
+#Thus we need a reload_service section to mesh11sd that will re-configure wifi via wifi down and up.
+#
+#Openwrt provided Mesh11sd package is found in: https://github.com/openwrt/routing/tree/master/mesh11sd
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+# Copyright (C) 2022 BlueWave Projects and Services  <licence@blue-wave.net>
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=morse_mesh11sd
+PKG_VERSION:=1.2.0
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_MAINTAINER:=Rob White <rob@blue-wave.net>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/opennds/mesh11sd/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=b719eaacf63eb3684d0cd6a026f4357a4f400f2339f5d5a6cf74ba3744fe30d8
+PKG_BUILD_DIR:=$(BUILD_DIR)/mesh11sd-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/morse_mesh11sd
+  SUBMENU:=Captive Portals
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Dynamic 802.11s Mesh Configuration Daemon
+  PKGARCH:=all
+  URL:=https://github.com/opennds/mesh11sd
+  PROVIDES:=mesh11sd
+endef
+
+define Package/morse_mesh11sd/description
+  Mesh11sd is a dynamic parameter configuration daemon for 802.11s mesh networks.
+  It was originally designed to leverage 802.11s mesh networking at Captive Portal venues.
+  This is the open source version and it enables easy and automated mesh network operation with multiple mesh nodes.
+  It allows all mesh parameters supported by the wireless driver to be set in the uci config file.
+  Settings take effect immediately without having to restart the wireless network.
+  Default settings give rapid and reliable layer 2 mesh convergence.
+  Without mesh11sd, many mesh parameters cannot be set in the uci wireless config file as the mesh interface must be up before the parameters can be set.
+  Some of those that are supported, would fail to be implemented when the network is (re)started resulting in errors or dropped nodes.
+  The mesh11sd daemon dynamically checks configured parameters and sets them as required.
+  This version does not require a Captive Portal to be running.
+  The modified morse_mesh11sd would allow reconfiguring the wpa supplicant everytime there is 11sMesh config modification.
+endef
+
+define Package/morse_mesh11sd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mesh11sd $(1)/usr/sbin
+	$(INSTALL_CONF) ./files/etc/config/mesh11sd $(1)/etc/config/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux_openwrt/mesh11sd/files/etc/init.d/mesh11sd $(1)/etc/init.d/
+endef
+
+define Package/morse_mesh11sd/conffiles
+/etc/config/mesh11sd
+endef
+
+define Build/Compile
+endef
+
+$(eval $(call BuildPackage,morse_mesh11sd))
diff --git a/feeds/morse/utils/morse_mesh11sd/files/etc/config/mesh11sd b/feeds/morse/utils/morse_mesh11sd/files/etc/config/mesh11sd
new file mode 100644
index 000000000..6f678dfa9
--- /dev/null
+++ b/feeds/morse/utils/morse_mesh11sd/files/etc/config/mesh11sd
@@ -0,0 +1,28 @@
+config mesh11sd 'setup'
+        option debuglevel '1'
+        option checkinterval '10'
+        option interface_timeout '10'
+        option enabled '0'
+
+config mesh11sd 'mesh_params'
+        option mesh_fwding '1'
+        option mesh_max_peer_links '10'
+        option mesh_rssi_threshold '-85'
+        option mesh_ttl '31'
+        option mesh_hwmp_rootmode '0'
+        option mesh_gate_announcements '0'
+
+config mesh11sd 'mbca'
+        option mbca_config '1'
+        option mesh_beacon_timing_report_int '10'
+        option mbss_start_scan_duration_ms '2048'
+        option mbca_min_beacon_gap_ms '25'
+        option mbca_tbtt_adj_interval_sec '60'
+
+config mesh11sd 'mesh_beaconless'
+        option mesh_beacon_less_mode '0'
+
+config mesh11sd 'mesh_dynamic_peering'
+        option enabled '0'
+        option mesh_rssi_margin '5'
+        option mesh_blacklist_timeout '60'
diff --git a/feeds/morse/utils/morse_mesh11sd/patches/001-add_reload_service.patch b/feeds/morse/utils/morse_mesh11sd/patches/001-add_reload_service.patch
new file mode 100644
index 000000000..fe25e69c8
--- /dev/null
+++ b/feeds/morse/utils/morse_mesh11sd/patches/001-add_reload_service.patch
@@ -0,0 +1,16 @@
+Index: mesh11sd-1.2.0/linux_openwrt/mesh11sd/files/etc/init.d/mesh11sd
+===================================================================
+--- mesh11sd-1.2.0.orig/linux_openwrt/mesh11sd/files/etc/init.d/mesh11sd
++++ mesh11sd-1.2.0/linux_openwrt/mesh11sd/files/etc/init.d/mesh11sd
+@@ -11,3 +11,11 @@ start_service() {
+ 	procd_close_instance
+ }
+ 
++reload_service() {
++        wifi down
++        sleep 5
++        wifi up
++}
++service_triggers() {
++        procd_add_reload_trigger "mesh11sd"
++}
diff --git a/feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-setting.patch b/feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-setting.patch
new file mode 100644
index 000000000..37050c4e9
--- /dev/null
+++ b/feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-setting.patch
@@ -0,0 +1,107 @@
+# Description: The Mesh11sd daemon expects the mesh interface name to follow the format 'mesh<index>'. 
+# If it doesn't find this format, it attempts to set it in the UCI wireless configuration. 
+# However, when operating in other modes such as AP, STA, or Ad-Hoc, the script was patched to remove 
+# the mesh interface name from UCI. This process can lead to a race condition between the UI and Mesh11sd,
+# resulting in stale interface name values.
+# This patch resolves the issue by removing the setting of the interface name from the script, as it is 
+# now managed through the UI, ensuring consistency and eliminating the race condition.
+
+--- a/src/mesh11sd
++++ b/src/mesh11sd
+@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
+ 
+ 		if [ $mode -eq 5 ]; then
+ 			# startup=4, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 4 ]; then
+ 			# startup=4, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 3 ]; then
+ 			# startup=0, statusmode=2, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 2 ]; then
+ 			# startup=0, statusmode=2, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 1 ]; then
+ 			# startup=0, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 0 ]; then
+ 			# startup=0, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 		fi
+ 
+ 		if [ $mode -ne $lastmode ]; then
+@@ -441,26 +441,6 @@ elif [ "$1" = "daemon" ]; then
+ 			meshconfigs=$(uci show wireless 2> /dev/null | grep "mode='mesh'" | awk -F ".mode='mesh'" '{printf "%s " $1}')
+ 
+ 			if [ ! -z "$meshconfigs" ]; then
+-				for meshconfig in $meshconfigs; do
+-					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
+-
+-					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
+-						# No interface name in config, so add one
+-						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
+-						echo "$ucibatch" | uci batch
+-						changed=1
+-						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
+-						write_to_syslog
+-					fi
+-					meshindex=$(($meshindex+1))
+-				done
+-
+-				if [ "$changed" -eq 1 ]; then
+-					changed=0
+-					restart_mesh
+-					continue
+-				fi
+-
+ 				# get a list of interfaces
+ 				get_mesh_iflist
+ 
+@@ -482,13 +462,13 @@ elif [ "$1" = "daemon" ]; then
+ 						# this is not a mesh interface
+ 						continue
+ 					else
+-						# Check if this interface has a uci ifname
+-						uciname=$(uci show wireless | grep "ifname='$iface'" | awk -F "." '{printf "wireless.%s" $2}')
++						# Check if this interface mode is 'mesh'
++						uciname=$(uci show wireless | grep "mode='mesh'" | awk -F "." '{printf "wireless.%s" $2}')
+ 
+ 						if [ -z "$uciname" ]; then
+-							# Error - No interface name in config, we should have added one
++							# Error - No interface with mode as mesh
+ 							debugtype="err"
+-							syslogmessage="Error getting mesh interface name"
++							syslogmessage="Error getting mesh interface section"
+ 							write_to_syslog
+ 							continue
+ 						fi
diff --git a/feeds/morse/utils/morsecli/Makefile b/feeds/morse/utils/morsecli/Makefile
new file mode 100644
index 000000000..7a8059185
--- /dev/null
+++ b/feeds/morse/utils/morsecli/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright 2023 Morse Micro
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=morsecli
+PKG_RELEASE=5
+
+PKG_VERSION:=1.12.4
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=
+
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/MorseMicro/morse_cli.git
+PKG_HASH:=04c88a3aea99082a29eb1f84a9b62dcbb85980fa040e0e34901c1826f33ae74c
+PKG_SOURCE_PROTO:=git
+
+PKG_MAINTAINER:=Morse Micro <info@morsemicro.com>
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/morsecli
+  SECTION:=utils
+  CATEGORY:=Network
+  TITLE:=Morse Micro WIFI HaLow driver command line tool
+  DEPENDS:= +kmod-morse +libnl
+  FILES:=\
+	$(PKG_BUILD_DIR)/morse_cli
+  PROVIDES:=morsectrl
+endef
+
+MAKE_FLAGS += \
+    MORSECTRL_VERSION_STRING=$(PKG_VERSION) \
+    CONFIG_MORSE_TRANS_NL80211=1 \
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3
+
+define Package/morsecli/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/morse_cli $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,morsecli))
diff --git a/feeds/morse/utils/wpa_event_listener/Makefile b/feeds/morse/utils/wpa_event_listener/Makefile
new file mode 100644
index 000000000..9d3aae18f
--- /dev/null
+++ b/feeds/morse/utils/wpa_event_listener/Makefile
@@ -0,0 +1,33 @@
+#
+# Copyright 2023 Morse Micro
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wpa_event_listener
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wpa_event_listener
+  SECTION:=utils
+  CATEGORY:=Base system
+  TITLE:= WPA supplicant s1g event listener
+  MAINTAINER:=Morse Micro
+  DEPENDS:= wpa_supplicant_s1g +libwpa_client
+endef
+
+define Package/wpa_event_listener/description
+ A Daemon to listen to wpa supplicant s1g events.
+endef
+
+define Package/wpa_event_listener/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_event_listener 	$(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,wpa_event_listener))
\ No newline at end of file
diff --git a/feeds/morse/utils/wpa_event_listener/src/Makefile b/feeds/morse/utils/wpa_event_listener/src/Makefile
new file mode 100644
index 000000000..32f949fa2
--- /dev/null
+++ b/feeds/morse/utils/wpa_event_listener/src/Makefile
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2023-2024 Morse Micro Pty Ltd. All rights reserved
+#
+APP=wpa_event_listener
+
+LDFLAGS+=-lwpa_client -lubox
+
+ODIR=build
+
+_OBJ = wpa_event_listener.o
+OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
+
+
+$(ODIR)/%.o: %.c
+	mkdir $(ODIR) -p
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+$(APP): $(OBJ)
+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
+.PHONY: clean
+
+clean:
+	rm -rf $(ODIR) $(APP)
\ No newline at end of file
diff --git a/feeds/morse/utils/wpa_event_listener/src/wpa_event_listener.c b/feeds/morse/utils/wpa_event_listener/src/wpa_event_listener.c
new file mode 100644
index 000000000..c09337e46
--- /dev/null
+++ b/feeds/morse/utils/wpa_event_listener/src/wpa_event_listener.c
@@ -0,0 +1,401 @@
+/*
+ *  copyright (C) 2023-2024 Morse Micro Pty Ltd. All rights reserved.
+ */
+
+#include <dirent.h>
+#include <errno.h>
+#include <libubox/uloop.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <wpa_ctrl.h>
+
+#define CONFIG_CTRL_IFACE_DIR "/var/run/wpa_supplicant_s1g"
+#define wpa_el_version "V1.0.0"
+
+enum event_value_types {
+    TYPE_CONF_RECEIVED,
+    TYPE_ENCRYPTION,
+    TYPE_SSID,
+    TYPE_PSK,
+    TYPE_CONNECTOR,
+    TYPE_C_SIGN_KEY,
+    TYPE_PP_KEY,
+    TYPE_NET_ACCESS_KEY,
+    TYPE_CTRL_EVENT_TERMINATING,
+    TYPE_PB_RESULT,
+    TYPE_PB_STATUS,
+};
+
+struct event {
+    const char *const event_title;
+    const enum event_value_types event_type;
+};
+
+/* dpp connector, c-sign-key, pp-key and net access key will be received after
+ * qrcode provisionning but they are ignored by now.
+ */
+static struct event interresting_events[] = {
+    {"DPP-CONF-RECEIVED", TYPE_CONF_RECEIVED},
+    {"DPP-CONFOBJ-AKM", TYPE_ENCRYPTION},
+    {"DPP-CONFOBJ-SSID", TYPE_SSID},
+    {"DPP-CONFOBJ-PASS", TYPE_PSK},
+    // { "DPP-CONNECTOR"       , TYPE_CONNECTOR },
+    // { "DPP-C-SIGN-KEY"      , TYPE_C_SIGN_KEY },
+    // { "DPP-PP-KEY"          , TYPE_PP_KEY },
+    // { "DPP-NET-ACCESS-KEY"  , TYPE_NET_ACCESS_KEY },
+    {"DPP-PB-STATUS", TYPE_PB_STATUS},
+    {"DPP-PB-RESULT", TYPE_PB_RESULT},
+    {"CTRL-EVENT-TERMINATING", TYPE_CTRL_EVENT_TERMINATING},
+};
+
+static struct {
+    char *encryption;
+    char *ssid;
+    char *psk;
+    // char* connector;
+    // char* c_sign_key;
+    // char* pp_key;
+    // char* net_access_key;
+} cached_confs;
+
+static struct wpa_ctrl *ctrl_conn;
+static struct uloop_fd listener;
+
+static void led_timeout_cb(struct uloop_timeout*);
+static struct uloop_timeout led_timeout = {
+    .cb = led_timeout_cb,
+};
+static void led_failed_cb(struct uloop_timeout *);
+static struct uloop_timeout failed_timeout = {
+    .cb = led_failed_cb,
+};
+
+static char *ctrl_ifname = NULL;
+static char *action_script = NULL;
+static const char *ctrl_iface_dir = CONFIG_CTRL_IFACE_DIR;
+static const char *pid_file = NULL;
+static int exit_on_config_receive = 1;
+
+void cache_received_confs(char **config, const char *const value) {
+    // check if the config is already allocated.
+    if (*config)
+        free(*config);
+    *config = strdup(value);
+}
+
+void clean_pointer(char **ptr) {
+    if (*ptr) {
+        free(*ptr);
+        *ptr = NULL;
+    }
+}
+
+void clear_cached_confs() {
+    clean_pointer(&cached_confs.encryption);
+    clean_pointer(&cached_confs.ssid);
+    clean_pointer(&cached_confs.psk);
+}
+
+void clear_env() {
+    unsetenv("iface_name");
+    unsetenv("encryption");
+    unsetenv("ssid");
+    unsetenv("psk");
+}
+
+void apply_cached_confs() {
+    // make sure that all needed configs are cached.
+    if (!cached_confs.encryption || !cached_confs.ssid || !cached_confs.psk)
+        return;
+
+    printf("Configs: \n");
+    printf("    encryption: %s\n", cached_confs.encryption);
+    printf("    ssid: %s\n", cached_confs.ssid);
+    printf("    psk: %s\n", cached_confs.psk);
+
+    pid_t pid = 0;
+    // only fork if we don't want to exit after receiving configs.
+    if (exit_on_config_receive == 0) {
+        pid = fork();
+        if (pid == -1) {
+            printf("Unable to fork action script\n");
+            return;
+        }
+        // forked process will have pid=0.
+        if (pid > 0)
+            return;
+    }
+
+    setenv("iface_name", ctrl_ifname, 1);
+    setenv("encryption", cached_confs.encryption, 1);
+    setenv("ssid", cached_confs.ssid, 1);
+    setenv("psk", cached_confs.psk, 1);
+    if (execl(action_script, action_script, "config", (char *)NULL) == -1) {
+        perror("Could not execv");
+        clear_env();
+        return;
+    }
+    clear_env();
+}
+
+void call_action_script(const char *arg) {
+    pid_t pid = fork();
+    if (pid == -1) {
+        printf("Unable to fork action script");
+        return;
+    }
+    if (pid > 0) {
+        int status;
+        waitpid(pid, &status, 0);
+    } else if (execl(action_script, action_script, arg, (char *)NULL) == -1) {
+        perror("Could not execv");
+        exit(1);
+    }
+}
+
+static void led_timeout_cb(struct uloop_timeout *t) {
+    printf("led timeout\n");
+    call_action_script("finished");
+}
+
+static void led_finished() {
+    // Stop the blink.
+    printf("Stopping led blink\n");
+    uloop_timeout_cancel(&led_timeout);
+    call_action_script("finished");
+}
+
+static void led_failed_cb(struct uloop_timeout *t) {
+    // Start the fail blink with a short timeout.
+    printf("Starting led fail blink\n");
+    uloop_timeout_set(&led_timeout, 5000);
+    call_action_script("failed");
+}
+
+static void led_failed() {
+    // Issue the failed command after a small delay. This is because
+    // wpa_supplicant emits back to back failed and started events when a
+    // dpp_push_button occurs while another is still running, so save some time
+    // for led_started to cancel the failed_timeout.
+    uloop_timeout_set(&failed_timeout, 1000);
+}
+
+static void led_started() {
+    // Start the blink. Set a long timeout for the blink in case we don't see hostapd PB_RESULT event.
+    printf("Starting led blink\n");
+    uloop_timeout_cancel(&failed_timeout);
+    uloop_timeout_set(&led_timeout, 120000);
+    call_action_script("started");
+}
+
+static void message_process(char *const message) {
+    const int good_events_count = sizeof(interresting_events) / sizeof(struct event);
+
+    for (int i = 0; i < good_events_count; i++) {
+        char *ptr = strstr(message, interresting_events[i].event_title);
+        if (ptr) {
+            const char *const value = ptr + strlen(interresting_events[i].event_title) +
+                                      1; // 1 for the space between title and value
+            switch (interresting_events[i].event_type) {
+            case TYPE_CONF_RECEIVED:
+                clear_cached_confs();
+                break;
+            case TYPE_ENCRYPTION:
+                cache_received_confs(&cached_confs.encryption, value);
+                break;
+            case TYPE_SSID:
+                cache_received_confs(&cached_confs.ssid, value);
+                break;
+            case TYPE_PSK:
+                cache_received_confs(&cached_confs.psk, value);
+                break;
+            case TYPE_PB_RESULT:
+                // AP side we wont have confs, so apply_cached_confs does nothing.
+                if (strstr(value, "success")) {
+                    led_finished();
+                    apply_cached_confs();
+                    clear_cached_confs();
+                } else if (strstr(value, "failed")) {
+                    led_failed();
+                }
+                break;
+            case TYPE_PB_STATUS:
+                if (strcmp(value, "started") == 0) {
+                    led_started();
+                }
+                break;
+            case TYPE_CTRL_EVENT_TERMINATING:
+                printf("Connection to wpa_supplicant lost - exiting\n");
+                uloop_end();
+                break;
+            default:
+                break;
+            }
+            return;
+        }
+    }
+}
+
+static void listener_cb(struct uloop_fd *fd, unsigned int events) {
+    while (wpa_ctrl_pending(ctrl_conn) > 0) {
+        char buf[4096];
+        size_t len = sizeof(buf) - 1;
+        if (wpa_ctrl_recv(ctrl_conn, buf, &len) == 0) {
+            buf[len] = '\0';
+            printf("New Message:%s\n", buf);
+            message_process(buf);
+        } else {
+            printf("Could not read pending message.\n");
+            break;
+        }
+    }
+    if (wpa_ctrl_pending(ctrl_conn) < 0) {
+        printf("Connection to wpa_supplicant lost - exiting\n");
+        uloop_end();
+    }
+}
+
+static char *wpa_cli_get_default_ifname(void) {
+    char *ifname = NULL;
+
+    struct dirent *dent;
+    DIR *dir = opendir(ctrl_iface_dir);
+    if (!dir) {
+        return NULL;
+    }
+    while ((dent = readdir(dir))) {
+#ifdef _DIRENT_HAVE_D_TYPE
+        /*
+         * Skip the file if it is not a socket. Also accept
+         * DT_UNKNOWN (0) in case the C library or underlying
+         * file system does not support d_type.
+         */
+        if (dent->d_type != DT_SOCK && dent->d_type != DT_UNKNOWN)
+            continue;
+#endif /* _DIRENT_HAVE_D_TYPE */
+        /* Skip current/previous directory and special P2P Device
+         * interfaces. */
+        if (strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0 ||
+            strncmp(dent->d_name, "p2p-dev-", 8) == 0)
+            continue;
+        printf("Selected interface '%s'\n", dent->d_name);
+        ifname = strdup(dent->d_name);
+        break;
+    }
+    closedir(dir);
+
+    return ifname;
+}
+
+static void usage(void) {
+    printf("wpa_event_listener  [-p<path to ctrl socket dir>] -i<ifname> [-hvBN] "
+           "-a<action file> \\\n"
+           "                    [-P<pid file>] "
+           "\\\n"
+           "        "
+           "  -h = help (show this usage text)\n"
+           "  -v = shown version information\n"
+           "  -N = No Exit: don't exit after the configs are received.\n"
+           "  -a = run in daemon mode executing the action file based on "
+           "events from\n"
+           "  -B = run a daemon in the background\n"
+           "  default path: " CONFIG_CTRL_IFACE_DIR "\n"
+           "  default interface: first interface found in socket path\n");
+}
+
+int main(int argc, char *argv[]) {
+    int c;
+    int daemonize = 0;
+    for (;;) {
+        c = getopt(argc, argv, "a:Bg:G:hNi:p:P:rs:v");
+        if (c < 0)
+            break;
+        switch (c) {
+        case 'a':
+            action_script = optarg;
+            break;
+        case 'B':
+            daemonize = 1;
+            break;
+        case 'h':
+            usage();
+            return 0;
+        case 'v':
+            printf("%s\n", wpa_el_version);
+            return 0;
+        case 'i':
+            ctrl_ifname = strdup(optarg);
+            break;
+        case 'p':
+            ctrl_iface_dir = optarg;
+            break;
+        case 'P':
+            pid_file = optarg;
+            break;
+        case 'N':
+            printf("No exit after receive config.\n");
+            exit_on_config_receive = 0;
+            break;
+        default:
+            usage();
+            return -1;
+        }
+    }
+
+    if (ctrl_ifname == NULL)
+        ctrl_ifname = wpa_cli_get_default_ifname();
+    if (ctrl_ifname == NULL) {
+        printf("No WPA supplicant ctrl interface found.\n");
+        return -1;
+    }
+
+    if (daemonize) {
+        if (!action_script) {
+            printf("Daemonizing requires an action script.\n");
+            return -1;
+        }
+
+        if (daemon(0, 0)) {
+            perror("daemon");
+            return -1;
+        }
+        if (pid_file) {
+            FILE *f = fopen(pid_file, "w");
+            if (f) {
+                fprintf(f, "%u\n", getpid());
+                fclose(f);
+            }
+        }
+    }
+
+    char *path = malloc(strlen(ctrl_iface_dir) + strlen(ctrl_ifname) + 2);
+    sprintf(path, "%s/%s", ctrl_iface_dir, ctrl_ifname);
+
+    if (!(ctrl_conn = wpa_ctrl_open(path))) {
+        printf("unable to open control interface on %s.\n", path);
+        return -1;
+    }
+
+    uloop_init();
+
+    if (wpa_ctrl_attach(ctrl_conn) == 0) {
+        listener.cb = listener_cb;
+        listener.fd = wpa_ctrl_get_fd(ctrl_conn);
+        uloop_fd_add(&listener, ULOOP_READ);
+        listener_cb(NULL, 0);
+    } else {
+        printf("Failed to attach to wpa_supplicant.\n");
+        wpa_ctrl_close(ctrl_conn);
+        return -1;
+    }
+
+    uloop_run();
+    printf("Exiting\n");
+    if (pid_file)
+        remove(pid_file);
+
+    return 0;
+}
diff --git a/feeds/morse/utils/wpa_supplicant_s1g/Config.in b/feeds/morse/utils/wpa_supplicant_s1g/Config.in
new file mode 100644
index 000000000..d8b78317e
--- /dev/null
+++ b/feeds/morse/utils/wpa_supplicant_s1g/Config.in
@@ -0,0 +1,13 @@
+if PACKAGE_wpa_supplicant_s1g
+
+	config MORSE_WPA_SUPPLICANT_S1G_MESH_NETWORKING
+		bool
+		default n
+		prompt "Enable mesh networking support"
+
+	config MORSE_WPA_SUPPLICANT_S1G_EAP
+		bool
+		default n
+		prompt "Enable Extensible Authentication Protocol (EAP) support"
+
+endif
diff --git a/feeds/morse/utils/wpa_supplicant_s1g/Makefile b/feeds/morse/utils/wpa_supplicant_s1g/Makefile
new file mode 100644
index 000000000..d43e2ecc1
--- /dev/null
+++ b/feeds/morse/utils/wpa_supplicant_s1g/Makefile
@@ -0,0 +1,178 @@
+#
+# Copyright 2022 Morse Micro
+#
+# This is free software, licensed under the 3-Clause BSD License.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wpa_supplicant_s1g
+PKG_RELEASE=2
+
+PKG_VERSION:=1.12.4
+
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/MorseMicro/hostap.git
+PKG_HASH:=c342d1489d03363b79b5b4e185ccbceca53aab9e634daefb81180ad1012b77b7
+PKG_SOURCE_PROTO:=git
+
+PKG_MAINTAINER:=Morse Micro <info@morsemicro.com>
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_FLAGS += \
+	MORSEWPA_SUPPLICANT_VERSION_STRING=$(PKG_VERSION)
+
+# Add support for simple background scan
+MMWPA_SUPPLICANT_CONFIG_SET = \
+	CONFIG_UBUS
+
+
+MMWPA_SUPPLICANT_CONFIG_ENABLE = \
+	CONFIG_IEEE80211AC \
+	CONFIG_IEEE80211N \
+	CONFIG_IEEE80211R \
+	CONFIG_INTERNAL_LIBTOMMATH \
+	CONFIG_DEBUG_FILE \
+	CONFIG_MATCH_IFACE \
+	CONFIG_LIBNL32 \
+	CONFIG_DRIVER_WEXT \
+	CONFIG_DRIVER_NL80211 \
+	CONFIG_DRIVER_WIRED \
+	CONFIG_IEEE8021X_EAPOL \
+	CONFIG_WPS \
+	CONFIG_PKCS12 \
+	CONFIG_CTRL_IFACE \
+	CONFIG_READLINE \
+	CONFIG_IEEE80211W \
+	CONFIG_INTERNAL_LIBTOMMATH_FAST \
+	CONFIG_CTRL_IFACE_DBUS_INTRO \
+	CONFIG_DEBUG_SYSLOG \
+	CONFIG_INTERWORKING \
+	CONFIG_HS20 \
+	CONFIG_MATCH_IFACE \
+	CONFIG_AP \
+	CONFIG_P2P \
+	CONFIG_IBSS_RSN \
+	CONFIG_OWE \
+	CONFIG_DPP \
+	CONFIG_SAE \
+	CONFIG_TESTING_OPTIONS \
+	CONFIG_PMKSA_CACHE_EXTERNAL \
+	CONFIG_WNM
+
+MMWPA_SUPPLICANT_CONFIG_DISABLE = \
+	CONFIG_BGSCAN_SIMPLE \
+	CONFIG_SMARTCARD \
+	CONFIG_CTRL_IFACE_DBUS_NEW \
+	CONFIG_CTRL_IFACE_DBUS_INTRO \
+	CONFIG_READLINE
+
+MMWPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
+
+ifeq ($(CONFIG_MORSE_WPA_SUPPLICANT_S1G_MESH_NETWORKING),y)
+	MMWPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_MESH
+endif
+
+ifeq ($(CONFIG_MORSE_WPA_SUPPLICANT_S1G_EAP),y)
+	MMWPA_SUPPLICANT_CONFIG_ENABLE += \
+		CONFIG_EAP_PEAP \
+		CONFIG_EAP_MD5 \
+		CONFIG_EAP_MSCHAPV2 \
+		CONFIG_EAP_TLS \
+		CONFIG_EAP_TTLS \
+		CONFIG_EAP_GTC \
+		CONFIG_EAP_PWD
+endif
+
+define Package/wpa_supplicant_s1g
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=WirelessAPD
+  TITLE:=Morse Micro HaLow wpa_supplicant
+  DEPENDS:= +kmod-morse +libnl +libopenssl +libubus
+  USERID:=network=101:network=101
+  PROVIDES:=wpa_supplicant_s1g
+endef
+
+define Package/libwpa_client
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=WirelessAPD
+  TITLE:=libwpa_client
+  DEPENDS:=wpa_supplicant_s1g
+endef
+
+define Package/libwpa_client/description
+  wpa_supplicant_s1g client liberary
+endef
+
+define Package/wpa_supplicant_s1g/config
+    source "$(SOURCE)/Config.in"
+endef
+
+MMWPA_SUPPLICANT_CONFIG = $(PKG_BUILD_DIR)/wpa_supplicant/.config
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) $(PKG_BUILD_DIR)/wpa_supplicant/defconfig $(MMWPA_SUPPLICANT_CONFIG)
+	sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(MMWPA_SUPPLICANT_CONFIG_ENABLE)) \
+		$(patsubst %,-e 's/^\(%\)/#\1/',$(MMWPA_SUPPLICANT_CONFIG_DISABLE)) \
+		$(patsubst %,-e '1i%=y',$(MMWPA_SUPPLICANT_CONFIG_SET)) \
+		$(patsubst %,-e %,$(MMWPA_SUPPLICANT_CONFIG_EDITS)) \
+		$(MMWPA_SUPPLICANT_CONFIG)
+endef
+
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(PKG_BUILD_DIR)/src/crypto \
+	$(TARGET_CPPFLAGS) \
+	-DCONFIG_LIBNL20 \
+	-D_GNU_SOURCE
+
+TARGET_LDFLAGS += -lnl-3 -lnl-genl-3 -lnl-route-3
+TARGET_LDFLAGS += -lm -lpthread -lcrypto -lssl
+
+define Build/RunMake
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(DRIVER_MAKEOPTS) \
+		LIBS="$(TARGET_LDFLAGS)" \
+		LIBS_c="$(TARGET_LDFLAGS_C)" \
+		AR="$(TARGET_CROSS)gcc-ar" \
+		BCHECK= \
+		$(2)
+endef
+
+define Build/Compile
+	+$(call Build/RunMake,wpa_supplicant, \
+		wpa_supplicant_s1g wpa_cli_s1g \
+	)
+	+$(call Build/RunMake,wpa_supplicant, libwpa_client.so)
+endef
+
+define Package/wpa_supplicant_s1g/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_s1g $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli_s1g $(1)/sbin/
+endef
+
+define Package/libwpa_client/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/libwpa_client.so $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/wpa_supplicant/libwpa_client.so		$(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/src/common/wpa_ctrl.h				$(1)/usr/include/wpa_ctrl.h
+endef
+
+$(eval $(call BuildPackage,wpa_supplicant_s1g))
+$(eval $(call BuildPackage,libwpa_client))
diff --git a/feeds/morse/utils/wpa_supplicant_s1g/patches/0001-APP-2573-Emit-a-DPP-PB_STATUS-event-when-push-button.patch b/feeds/morse/utils/wpa_supplicant_s1g/patches/0001-APP-2573-Emit-a-DPP-PB_STATUS-event-when-push-button.patch
new file mode 100644
index 000000000..998ba0a26
--- /dev/null
+++ b/feeds/morse/utils/wpa_supplicant_s1g/patches/0001-APP-2573-Emit-a-DPP-PB_STATUS-event-when-push-button.patch
@@ -0,0 +1,45 @@
+From 5433351ed5ab62c2d4fbd15a2c4d8c4aeacb93dc Mon Sep 17 00:00:00 2001
+From: Evan Benn <evan.benn@morsemicro.com>
+Date: Thu, 29 Feb 2024 11:09:38 +1100
+Subject: [PATCH] APP-2573: Emit a DPP PB_STATUS event when push button starts
+
+---
+ src/ap/dpp_hostapd.c            | 1 +
+ wpa_supplicant/dpp_supplicant.c | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
+index b7cca47c714b..3025eef204d2 100644
+--- a/src/ap/dpp_hostapd.c
++++ b/src/ap/dpp_hostapd.c
+@@ -3960,6 +3960,7 @@ int hostapd_dpp_push_button(struct hostapd_data *hapd, const char *cmd)
+ 	eloop_register_timeout(100, 0, hostapd_dpp_push_button_expire,
+ 			       hapd, NULL);
+ 
++	wpa_msg(hapd->msg_ctx, MSG_INFO, DPP_EVENT_PB_STATUS "started");
+ 	return 0;
+ }
+ 
+diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
+index ab06ff8d32c1..24e4bb3c444d 100644
+--- a/wpa_supplicant/dpp_supplicant.c
++++ b/wpa_supplicant/dpp_supplicant.c
+@@ -5676,6 +5676,7 @@ static int wpas_dpp_push_button_configurator(struct wpa_supplicant *wpa_s,
+ 	eloop_register_timeout(100, 0, wpas_dpp_push_button_expire,
+ 			       wpa_s, NULL);
+ 
++	wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_PB_STATUS "started");
+ 	return 0;
+ }
+ 
+@@ -5749,6 +5750,7 @@ int wpas_dpp_push_button(struct wpa_supplicant *wpa_s, const char *cmd)
+ 	wpa_supplicant_req_scan(wpa_s, 0, 0);
+ 
+ 	res = 0;
++	wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_PB_STATUS "started");
+ out:
+ 
+ 	/* If push button mode failed to start, restart the chirp forever timer */
+-- 
+2.42.0.530.g692be87cbba5
+
diff --git a/feeds/morse/utils/wpa_supplicant_s1g/patches/0002-SW-11943-dpp-does-not-associate-in-us-regd.patch b/feeds/morse/utils/wpa_supplicant_s1g/patches/0002-SW-11943-dpp-does-not-associate-in-us-regd.patch
new file mode 100644
index 000000000..8f4805edf
--- /dev/null
+++ b/feeds/morse/utils/wpa_supplicant_s1g/patches/0002-SW-11943-dpp-does-not-associate-in-us-regd.patch
@@ -0,0 +1,90 @@
+From 25631fa387af430b8d7f03302218c66dc161cc6f Mon Sep 17 00:00:00 2001
+From: Andrew Pope <andrew.pope@morsemicro.com>
+Date: Tue, 4 Jun 2024 23:12:37 +0000
+Subject: [PATCH] Merged in SW-11943-dpp-does-not-associate-in-us-regdom (pull
+ request #213)
+
+SW-11943: DPP does not associate in US regdom
+
+Two problems contributed to the originally reported issue:
+
+1. The DPP-PB state machine function will unconditionally cancel any pending off-channel actions - even if the DPP PB discovery phase is over. To fix this, avoid unconditionally completing offchannel actions from DPP-PB state machine function if DPP PB discovery phase is over.
+
+2. Logic around PKEX retries will manually attempt to complete the exchange on adjacent non-S1G channels. These retries inevitably fail, leading to a quicker collapse of the PKEX exchange attempts and eventual downgrade from v2 to v1 (bad). To fix this, remove non-S1G frequency hopping logic from DPP PB discovery and PKEX exchange phases.
+
+Approved-by: Neville Young
+Approved-by: Simon Wadsworth
+Approved-by: Ayman Grais
+Approved-by: James Herbert
+---
+ src/ap/dpp_hostapd.c            |  6 ++++++
+ wpa_supplicant/dpp_supplicant.c | 17 +++++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
+index b7cca47c7..282581fe5 100644
+--- a/src/ap/dpp_hostapd.c
++++ b/src/ap/dpp_hostapd.c
+@@ -260,6 +260,12 @@ static int hostapd_dpp_allow_ir(struct hostapd_data *hapd, unsigned int freq)
+ static int hostapd_dpp_pkex_next_channel(struct hostapd_data *hapd,
+ 					 struct dpp_pkex *pkex)
+ {
++	/* Following logic is not S1G compatible. Attempting PKEX on non-adjacent S1G channels
++	 * results in guaranteed failure.
++	 */
++	if (hapd->iconf->ieee80211ah)
++		return -1;
++
+ 	if (pkex->freq == 2437)
+ 		pkex->freq = 5745;
+ 	else if (pkex->freq == 5745)
+diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
+index ab06ff8d3..e90e4a163 100644
+--- a/wpa_supplicant/dpp_supplicant.c
++++ b/wpa_supplicant/dpp_supplicant.c
+@@ -2840,6 +2840,12 @@ static int wpas_dpp_allow_ir(struct wpa_supplicant *wpa_s, unsigned int freq)
+ static int wpas_dpp_pkex_next_channel(struct wpa_supplicant *wpa_s,
+ 				      struct dpp_pkex *pkex)
+ {
++#if defined(CONFIG_IEEE80211AH)
++	/* Following logic is not S1G compatible. Attempting PKEX on non-adjacent S1G channels
++	 * results in guaranteed failure.
++	 */
++	return -1;
++#endif
+ 	if (pkex->freq == 2437)
+ 		pkex->freq = 5745;
+ 	else if (pkex->freq == 5745)
+@@ -5113,10 +5119,16 @@ static int * wpas_dpp_presence_ann_channels(struct wpa_supplicant *wpa_s,
+ 
+ 			if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_RADAR))
+ 				continue;
++#if defined(CONFIG_IEEE80211AH)
++			/* Adding channels 44 and 149 at end of scan list is not required
++			 * for HaLow
++			 */
++#else
+ 			if (chan->freq == 5220)
+ 				chan44 = 1;
+ 			if (chan->freq == 5745)
+ 				chan149 = 1;
++#endif
+ 
+ 			/* Morse - All 5GHz channels that are mapped to 1 MHz and 2 MHz.
+ 			 * Channels that aren't relevant to a regulatory domain will be
+@@ -5573,9 +5585,10 @@ static void wpas_dpp_pb_next(void *eloop_ctx, void *timeout_ctx)
+ 	if (!wpa_s->dpp_pb_freqs)
+ 		return;
+ 
+-	os_get_reltime(&now);
+-	offchannel_send_action_done(wpa_s);
++	if (!wpa_s->dpp_pb_discovery_done)
++		offchannel_send_action_done(wpa_s);
+ 
++	os_get_reltime(&now);
+ 	if (os_reltime_expired(&now, &wpa_s->dpp_pb_time, 100)) {
+ 		wpa_printf(MSG_DEBUG, "DPP: Push button wait time expired");
+ 		wpas_dpp_push_button_stop(wpa_s);
+-- 
+2.25.1
+
diff --git a/feeds/morse/utils/wpa_supplicant_s1g/patches/0003-Hack-out-channel-50-and-typo-for-51.patch b/feeds/morse/utils/wpa_supplicant_s1g/patches/0003-Hack-out-channel-50-and-typo-for-51.patch
new file mode 100644
index 000000000..2e3bff16a
--- /dev/null
+++ b/feeds/morse/utils/wpa_supplicant_s1g/patches/0003-Hack-out-channel-50-and-typo-for-51.patch
@@ -0,0 +1,35 @@
+From 591ec24748525171d5647d2a35cd1da1445e7a0b Mon Sep 17 00:00:00 2001
+From: James Haggerty <james.haggerty@morsemicro.com>
+Date: Fri, 26 Jul 2024 09:55:03 +1000
+Subject: [PATCH] Hack out channel 50 (and typo for 51)
+
+If we use these channels on a board with those channels disabled,
+the DPP presence announcement fails.
+
+This is rubbish: see SW-12450
+---
+ wpa_supplicant/dpp_supplicant.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
+index 09f8ceb07..46e4add95 100644
+--- a/wpa_supplicant/dpp_supplicant.c
++++ b/wpa_supplicant/dpp_supplicant.c
+@@ -5199,12 +5199,12 @@ static int * wpas_dpp_presence_ann_channels(struct wpa_supplicant *wpa_s,
+ 			static const int s1g_chirp_channels[] = {
+ 				/* 2MHz channels */
+ 				5190, 5230, 5270, 5310, 5510, 5550,
+-				5630, 5670, 5755, 5795, 5835, 5875,
++				5630, 5670, 5755, 5795, 5835,
+ 				/* 1MHz channels */
+ 				5660, 5680, 5180, 5200, 5240, 5260,
+ 				5280, 5300, 5320, 5500, 5520, 5540,
+ 				5560, 5580, 5600, 5620, 5640, 5765,
+-				5785, 5805, 5825, 5845, 5865, 5855
++				5785, 5805, 5825, 5845, 5865
+ 			};
+ 
+ 			if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_RADAR))
+-- 
+2.25.1
+
diff --git a/feeds/qca-wifi-7/ath12k-wifi/Makefile b/feeds/qca-wifi-7/ath12k-wifi/Makefile
index ea7e68ed3..1fa8f7dcd 100755
--- a/feeds/qca-wifi-7/ath12k-wifi/Makefile
+++ b/feeds/qca-wifi-7/ath12k-wifi/Makefile
@@ -48,6 +48,11 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP7710c_341x
 endef
 
+define Package/ath12k-wifi-sonicfi-rap750e-h
+$(call Package/ath12k-wifi-default)
+    TITLE:=board-2.bin for RAP750e_h
+endef
+
 define Package/ath12k-wifi-sonicfi-rap750w-311a
 $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP750W_311a
@@ -78,6 +83,11 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for WF672
 endef
 
+define Package/ath12k-wifi-zyxel-nwa130be
+$(call Package/ath12k-wifi-default)
+    TITLE:=board-2.bin for NWA130BE
+endef
+
 define Package/ath12k-wifi-cig-wf189/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
@@ -99,6 +109,15 @@ define Package/ath12k-wifi-sonicfi-rap7110c-341x/install
 	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
+define Package/ath12k-wifi-sonicfi-rap750e-h/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
+	$(INSTALL_DATA) ./board-2.bin.rap750e_h.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap750e_h.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+#	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/regdb.bin
+	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
+endef
+
 define Package/ath12k-wifi-sonicfi-rap750w-311a/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
@@ -139,6 +158,7 @@ define Package/ath12k-wifi-sercomm-ap72tip-v4/install
 	$(INSTALL_DATA) ./board-2.bin.ap72tip-v4.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
+
 define Package/ath12k-wifi-cig-wf672/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
@@ -146,12 +166,21 @@ define Package/ath12k-wifi-cig-wf672/install
 	$(INSTALL_DATA) ./board-2.bin.wf672.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
+define Package/ath12k-wifi-zyxel-nwa130be/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
+	$(INSTALL_DATA) ./board-2.bin.nwa130be.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.nwa130be.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+endef
+
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
+$(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-h))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750w-311a))
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189w))
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189h))
 $(eval $(call BuildPackage,ath12k-wifi-sercomm-ap72tip))
 $(eval $(call BuildPackage,ath12k-wifi-sercomm-ap72tip-v4))
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf672))
+$(eval $(call BuildPackage,ath12k-wifi-zyxel-nwa130be))
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa130be.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa130be.IPQ5332
new file mode 100644
index 000000000..fd8f77566
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa130be.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa130be.QCN92XX b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa130be.QCN92XX
new file mode 100644
index 000000000..051c6a289
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.nwa130be.QCN92XX differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750e_h.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750e_h.IPQ5332
new file mode 100755
index 000000000..3a02dc3c0
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750e_h.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750e_h.QCN6432 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750e_h.QCN6432
new file mode 100755
index 000000000..f0b746187
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750e_h.QCN6432 differ
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds
index e2c35f2ab..3736ff40d 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds
@@ -14,9 +14,19 @@ sercomm,ap72tip)
 	ucidef_set_led_netdev "wan_act" "wan_act" "yellow:phy" "eth0" "rx tx"
 	;;
 sonicfi,rap7110c-341x|\
+sonicfi,rap750e-h|\
 sonicfi,rap750w-311a)
 	ucidef_set_led_default "power" "POWER" "pwm:blue" "on"
 	;;
+zyxel,nwa130be)
+	#eth0: APPE: phyaddr 4  green:2.5G  orange:others
+	ssdk_sh debug phy set 4 0x40078074 0x670
+	ssdk_sh debug phy set 4 0x40078078 0x8600
+
+	#eth1:  MHT: phyaddr 3  green:2.5G orange:others
+	ssdk_sh debug phy set 3 0x40078074 0x670
+	ssdk_sh debug phy set 3 0x40078078 0x8600
+	;;
 esac
 
 board_config_flush
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network
index be8efa9e1..513668418 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network
@@ -19,7 +19,8 @@ ipq53xx_setup_interfaces()
 	sonicfi,rap750w-311a)
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
-	sonicfi,rap7110c-341x)
+	sonicfi,rap7110c-341x|\
+	sonicfi,rap750e-h)
 		ucidef_set_interfaces_lan_wan "" "eth0"
 		;;
 	cig,wf189w)
@@ -33,6 +34,9 @@ ipq53xx_setup_interfaces()
 	sercomm,ap72tip-v4)
 		ucidef_set_interface_wan "eth0"
 		;;	
+	zyxel,nwa130be)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		;;
 	esac
 }
 
@@ -81,11 +85,13 @@ qcom_setup_macs()
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
-        sonicfi,rap7110c-341x)
+        sonicfi,rap7110c-341x|\
+        sonicfi,rap750e-h)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 2)
-                ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 3)
+                [ "$board" = "sonicfi,rap7110c-34x" ] &&
+                    ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 3)
                 ;;
         sonicfi,rap750w-311a)
                 wan_mac=$(cat /sys/class/net/eth0/address)
@@ -99,6 +105,19 @@ qcom_setup_macs()
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 2)
                 ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 3)
                 ;;
+	zyxel,nwa130be)
+		wan_mac=$(cat /proc/cmdline)
+		wan_mac="${wan_mac##*hwaddr=}"
+		wan_mac="${wan_mac%% *}"
+		wan_mac="$(echo ${wan_mac} | sed 's/\(..\)/\1:/g;s/:$//')"
+		lan_mac=$(macaddr_add "$wan_mac" 1)
+		ucidef_set_network_device_mac eth0 $wan_mac
+		ucidef_set_network_device_mac eth1 $lan_mac
+		ucidef_set_label_macaddr $wan_mac
+		ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
+		ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
+		ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 4)
+		;;
         *)
                 wan_mac=$(cat /sys/class/net/eth1/address)
                 lan_mac=$(macaddr_add "$wan_mac" 1)
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata b/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata
index ca03bcda5..3442e780d 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata
@@ -65,7 +65,8 @@ ath12k/IPQ5332/hw1.0/caldata.bin)
 	cig,wf189|\
 	edgecore,eap105|\
 	sercomm,ap72tip-v4|\
-	sercomm,ap72tip)
+	sercomm,ap72tip|\
+	zyxel,nwa130be)
 		caldata_extract "0:ART" 0x1000 0x20000 
 		;;
 	cig,wf672)
@@ -74,8 +75,9 @@ ath12k/IPQ5332/hw1.0/caldata.bin)
 	sonicfi,rap7110c-341x)
 		caldata_extract_mmc "0:ART" 0x1000 0xF800
 		;;
+	sonicfi,rap750e-h|\
 	sonicfi,rap750w-311a)
-		caldata_extract "0:ART" 0x1000 0xf800 
+		caldata_extract "0:ART" 0x1000 0xf800
 		;;
 	esac
 	;;
@@ -84,7 +86,8 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 	cig,wf189|\
 	edgecore,eap105|\
 	sercomm,ap72tip-v4|\
-	sercomm,ap72tip)
+	sercomm,ap72tip|\
+	zyxel,nwa130be)
 		caldata_extract "0:ART" 0x58800 0x2d000
 		;;
 	cig,wf672)
@@ -97,6 +100,7 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 	;;
 ath12k/QCN6432/hw1.0/caldata_1.bin)
 	case "$board" in
+	sonicfi,rap750e-h|\
 	sonicfi,rap750w-311a)
 		caldata_extract "0:ART" 0x12800 0x18800
 		;;
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh b/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh
index be993771b..8305293a2 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh
@@ -163,8 +163,9 @@ platform_do_upgrade() {
 		;;
 	sonicfi,rap7110c-341x)
 		sonicfi_dualimage_check
-		emmc_do_upgrade $1 $1
+		emmc_do_upgrade "$1"
 		;;
+	sonicfi,rap750e-h|\
 	sonicfi,rap750w-311a)
 		sonicfi_dualimage_check
 		nand_upgrade_tar "$1"
@@ -173,5 +174,8 @@ platform_do_upgrade() {
 	sercomm,ap72tip)
 		nand_upgrade_tar "$1"
 		;;
+	zyxel,nwa130be)
+		nand_upgrade_tar "$1"
+		;;
 	esac
 }
diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189.dts
index 13538363f..872a599b4 100644
--- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189.dts
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189.dts
@@ -18,6 +18,21 @@
 	model = "CIG WF189";
 	compatible = "cig,wf189", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332-rdp468", "qcom,ipq5332";
 
+    reserved-memory {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        ranges;
+
+       ramoops@49c00000 {
+           compatible = "ramoops";
+           no-map;
+           reg = <0x0 0x49c00000 0x0 0x50000>;
+           record-size = <0x20000>;
+           console-size = <0x8000>;
+           pmsg-size = <0x8000>;
+       };
+    };
+
 	aliases {
 		serial0 = &blsp1_uart0;
 		serial1 = &blsp1_uart1;
diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-h.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-h.dts
new file mode 100755
index 000000000..2efeb664e
--- /dev/null
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-h.dts
@@ -0,0 +1,687 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * IPQ5332 RDP477 board device tree source
+ *
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "ipq5332.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include "ipq5332-default-memory.dtsi"
+
+/ {
+	model = "SONICFI RAP750E-H";
+	compatible = "sonicfi,rap750e-h","qcom,ipq5332-ap-mi01.3-c2", "qcom,ipq5332";
+
+#ifdef __IPQ_MEM_PROFILE_512_MB__
+       /*	512M Memory Layout for IPQ5332 + QCN6432
+	* +==========+==============+========================+
+	* |         |              |                         |
+	* |  Region | Start Offset |          Size           |
+	* |         |              |                         |
+	* +---------+--------------+-------------------------+
+	* |   Q6    |              |                         |
+	* |  code/  |  0x4A900000  |          20MB           |
+	* |  data   |              |                         |
+	* +---------+--------------+-------------------------+
+	* | IPQ5332 |              |                         |
+	* |  data   |  0x4BD00000  |          17MB           |
+	* +---------+--------------+-------------------------+
+	* | IPQ5332 |              |                         |
+	* | M3 Dump |  0x4CE00000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* | IPQ5332 |              |                         |
+	* |  QDSS   |  0x4CF00000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* |IPQ5332  |              |                         |
+	* |  CALDB  |  0x4D000000  |           3MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |  data   |  0x4D300000  |          16MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* | M3 Dump |  0x4E300000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |  QDSS   |  0x4E400000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |  CALDB  |  0x4E500000  |           5MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |MEM_HOLE |  0x4EA00000  |           5MB           |
+	* +---------+--------------+-------------------------+
+	* |         |              |                         |
+	* |   MLO   |  0x4EF00000  |          17MB           |
+	* +==================================================+
+	* |                                                  |
+	* |                                                  |
+	* |                                                  |
+	* |             Rest of memory for Linux             |
+	* |                                                  |
+	* |                                                  |
+	* |                                                  |
+	* +==================================================+
+	*/
+
+	reserved-memory {
+
+		/delete-node/ m3_dump@4cc00000;
+		/delete-node/ q6_etr_dump@1;
+		/delete-node/ mlo_global_mem_0@0x4db00000;
+		/delete-node/ wcnss@4a900000;
+		/delete-node/ q6_caldb_region@4ce00000;
+
+		q6_mem_regions: q6_mem_regions@4A900000  {
+			no-map;
+			reg = <0x0 0x4A900000 0x0 0x4600000>;
+		};
+
+		q6_code_data: q6_code_data@4A900000 {
+			no-map;
+			reg = <0x0 0x4A900000 0x0 0x1400000>;
+		};
+
+		q6_ipq5332_data: q6_ipq5332_data@4BD00000 {
+			no-map;
+			reg = <0x0 0x4BD00000 0x0 0x1100000>;
+		};
+
+		m3_dump: m3_dump@4CE00000 {
+			no-map;
+			reg = <0x0 0x4CE00000 0x0 0x100000>;
+		};
+
+		q6_etr_region: q6_etr_dump@4CF00000 {
+			no-map;
+			reg = <0x0 0x4CF00000 0x0 0x100000>;
+		};
+
+		q6_ipq5332_caldb: q6_ipq5332_caldb@4D000000 {
+			no-map;
+			reg = <0x0 0x4D000000 0x0 0x300000>;
+		};
+
+		q6_qcn6432_data_1: q6_qcn6432_data_1@4D300000 {
+			no-map;
+			reg = <0x0 0x4D300000 0x0 0x1000000>;
+		};
+
+		m3_dump_qcn6432_1: m3_dump_qcn6432_1@4E300000 {
+			no-map;
+			reg = <0x0 0x4E300000 0x0 0x100000>;
+                };
+
+		q6_qcn6432_etr_1: q6_qcn6432_etr_1@4E400000 {
+			no-map;
+			reg = <0x0 0x4E400000 0x0 0x100000>;
+		};
+
+		q6_qcn6432_caldb_1: q6_qcn6432_caldb_1@4E500000 {
+			no-map;
+			reg = <0x0 0x4E500000 0x0 0x500000>;
+		};
+
+		mlo_global_mem0: mlo_global_mem_0@4EF00000 {
+			no-map;
+			reg = <0x0 0x4EF00000 0x0 0x1100000>;
+		};
+	};
+#else
+       /*      1G Memory Layout for IPQ5332 + QCN6432
+	* +==========+==============+========================+
+	* |         |              |                         |
+	* |  Region | Start Offset |          Size           |
+	* |         |              |                         |
+	* +---------+--------------+-------------------------+
+	* |   Q6    |              |                         |
+	* |  code/  |  0x4A900000  |          20MB           |
+	* |  data   |              |                         |
+	* +---------+--------------+-------------------------+
+	* | IPQ5332 |              |                         |
+	* |  data   |  0x4BD00000  |          21MB           |
+	* +---------+--------------+-------------------------+
+	* | IPQ5332 |              |                         |
+	* | M3 Dump |  0x4D200000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* | IPQ5332 |              |                         |
+	* |  QDSS   |  0x4D300000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* |IPQ5332  |              |                         |
+	* |  CALDB  |  0x4D400000  |           5MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |  data   |  0x4D900000  |          21MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* | M3 Dump |  0x4EE00000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |  QDSS   |  0x4EF00000  |           1MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |  CALDB  |  0x4F000000  |           5MB           |
+	* +---------+--------------+-------------------------+
+	* |QCN6432_1|              |                         |
+	* |MEM_HOLE |  0x4F500000  |           5MB           |
+	* +---------+--------------+-------------------------+
+	* |         |              |                         |
+	* |   MLO   |  0x4FA00000  |          17MB           |
+	* +==================================================+
+	* |                                                  |
+	* |                                                  |
+	* |                                                  |
+	* |             Rest of memory for Linux             |
+	* |                                                  |
+	* |                                                  |
+	* |                                                  |
+	* +==================================================+
+	*/
+	reserved-memory {
+
+		/delete-node/ m3_dump@4cc00000;
+		/delete-node/ q6_etr_dump@1;
+		/delete-node/ mlo_global_mem_0@0x4db00000;
+		/delete-node/ wcnss@4a900000;
+		/delete-node/ q6_caldb_region@4ce00000;
+
+		q6_mem_regions: q6_mem_regions@4A900000  {
+		        no-map;
+		        reg = <0x0 0x4A900000 0x0 0x5100000>;
+		};
+		q6_code_data: q6_code_data@4A900000 {
+		        no-map;
+		        reg = <0x0 0x4A900000 0x0 0x1400000>;
+		};
+		q6_ipq5332_data: q6_ipq5332_data@4BD00000 {
+		        no-map;
+		        reg = <0x0 0x4BD00000 0x0 0x1500000>;
+		};
+		m3_dump: m3_dump@4D200000 {
+		        no-map;
+		        reg = <0x0 0x4D200000 0x0 0x100000>;
+		};
+		q6_etr_region: q6_etr_dump@4D300000 {
+		        no-map;
+		        reg = <0x0 0x4D300000 0x0 0x100000>;
+		};
+		q6_ipq5332_caldb: q6_ipq5332_caldb@4D400000 {
+		        no-map;
+		        reg = <0x0 0x4D400000 0x0 0x500000>;
+		};
+		q6_qcn6432_data_1: q6_qcn6432_data_1@4D900000 {
+		        no-map;
+		        reg = <0x0 0x4D900000 0x0 0x1500000>;
+		};
+		m3_dump_qcn6432_1: m3_dump_qcn6432_1@4EE00000 {
+		        no-map;
+		        reg = <0x0 0x4EE00000 0x0 0x100000>;
+		};
+		q6_qcn6432_etr_1: q6_qcn6432_etr_1@4EF00000 {
+		        no-map;
+		        reg = <0x0 0x4EF00000 0x0 0x100000>;
+		};
+		q6_qcn6432_caldb_1: q6_qcn6432_caldb_1@4F000000 {
+		        no-map;
+		        reg = <0x0 0x4F000000 0x0 0x500000>;
+		};
+		mlo_global_mem0: mlo_global_mem_0@4FA00000 {
+		        no-map;
+		        reg = <0x0 0x4FA00000 0x0 0x1100000>;
+		};
+	};
+
+#endif
+	aliases {
+		serial0 = &blsp1_uart0;
+		serial1 = &blsp1_uart1;
+		ethernet0 = "/soc/dp1";
+		//ethernet1 = "/soc/dp2";
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	soc@0 {
+		mdio:mdio@90000 {
+			pinctrl-0 = <&mdio1_pins>;
+			pinctrl-names = "default";
+			/*gpio26 for manhattan reset*/
+			phy-reset-gpio = <&tlmm 26 GPIO_ACTIVE_LOW>;
+			status = "okay";
+
+			phy0: ethernet-phy@0 {
+				reg = <16>;
+			};
+		};
+
+
+		gpio_keys {
+			compatible = "gpio-keys";
+			pinctrl-0 = <&button_pins>;
+			pinctrl-names = "default";
+			status = "okay";
+
+			button@1 {
+				label = "reset";
+				linux,code = <KEY_RESTART>;
+				gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+				linux,input-type = <1>;
+				debounce-interval = <60>;
+			};
+		};
+
+		pwmleds {
+			compatible = "pwm-leds";
+
+			red {
+				label = "pwm:red";
+				pwms = <&pwm 2 1250000>;
+				max-brightness = <255>;
+				linux,default-trigger = "none";
+			};
+		
+			green {
+				label = "pwm:green";
+				pwms = <&pwm 3 1250000>;
+				max-brightness = <255>;
+				linux,default-trigger = "none";
+			};
+		
+			led_power: blue {
+				label = "pwm:blue";
+				pwms = <&pwm 1 1250000>;
+				max-brightness = <255>;
+				linux,default-trigger = "none";
+			};
+
+			white {
+				label = "pwm:white";
+				pwms = <&pwm 0 1250000>;
+				max-brightness = <255>;
+				linux,default-trigger = "none";
+			};			
+		};
+
+		ess-instance {
+			num_devices = <0x1>;
+
+			ess-switch@3a000000 {
+				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+				switch_lan_bmp = <0x4>; /* lan port bitmap */
+				switch_wan_bmp = <0x0>; /* wan port bitmap */
+				switch_mac_mode = <0xff>; /* mac mode for uniphy instance0*/
+				switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/
+				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
+
+				qcom,port_phyinfo {
+					port@1 {
+						port_id = <2>;
+						phy_address = <16>;
+					};
+				};
+			};
+		};
+
+		dp1 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			qcom,id = <2>;
+			reg = <0x3a504000 0x4000>;
+			qcom,mactype = <1>;
+			local-mac-address = [000000000000];
+			mdio-bus = <&mdio>;
+			qcom,phy-mdio-addr = <16>;
+			qcom,link-poll = <1>;
+			phy-mode = "sgmii";
+		};
+
+		/* EDMA host driver configuration for the board */
+		edma@3ab00000 {
+			qcom,txdesc-ring-start = <4>;		/* Tx desc ring start ID */
+			qcom,txdesc-rings = <12>;		/* Total number of Tx desc rings to be provisioned */
+			qcom,mht-txdesc-rings = <8>;            /* Extra Tx desc rings to be provisioned for MHT SW ports */
+			qcom,txcmpl-ring-start = <4>;		/* Tx complete ring start ID */
+			qcom,txcmpl-rings = <12>;		/* Total number of Tx complete rings to be provisioned */
+			qcom,mht-txcmpl-rings = <8>;            /* Extra Tx complete rings to be provisioned for mht sw ports. */
+			qcom,rxfill-ring-start = <4>;		/* Rx fill ring start ID */
+			qcom,rxfill-rings = <4>;		/* Total number of Rx fill rings to be provisioned */
+			qcom,rxdesc-ring-start = <12>;		/* Rx desc ring start ID */
+			qcom,rxdesc-rings = <4>;		/* Total number of Rx desc rings to be provisioned */
+			qcom,rx-page-mode = <0>;		/* Rx fill ring page mode */
+			qcom,tx-map-priority-level = <1>;	/* Tx priority level per port */
+			qcom,rx-map-priority-level = <1>;	/* Rx priority level per core */
+			qcom,ppeds-num = <2>;			/* Number of PPEDS nodes */
+			/* PPE-DS node format: <Rx-fill Tx-cmpl Rx Tx Queue-base Queue-count> */
+			qcom,ppeds-map = <1 1 1 1 32 8>,	/* PPEDS Node#0 ring and queue map */
+					<2 2 2 2 40 8>;		/* PPEDS Node#1 ring and queue map */
+			qcom,txdesc-map = <8 9 10 11>,		/* Port0 per-core Tx ring map */
+					  <12 13 14 15>,        /* MHT-Port1 per-core Tx ring map */
+					  <4 5 6 7>,            /* MHT-Port2 per-core Tx ring map/packets from  vp*/
+					  <16 17 18 19>,        /* MHT-Port3 per-core Tx ring map */
+					  <20 21 22 23>;        /* MHT-Port4 per-core Tx ring map */
+			qcom,txdesc-fc-grp-map = <1 2 3 4 5>;   /* Per GMAC flow control group map */
+			qcom,rxfill-map = <4 5 6 7>;		/* Per-core Rx fill ring map */
+			qcom,rxdesc-map = <12 13 14 15>;	/* Per-core Rx desc ring map */
+			qcom,rx-queue-start = <0>;		/* Rx queue start */
+			qcom,rx-ring-queue-map = <0 8 16 24>,	/* Priority 0 queues per-core Rx ring map */
+						<1 9 17 25>,	/* Priority 1 queues per-core Rx ring map */
+						<2 10 18 26>,	/* Priority 2 queues per-core Rx ring map */
+						<3 11 19 27>,	/* Priority 3 queues per-core Rx ring map */
+						<4 12 20 28>,	/* Priority 4 queues per-core Rx ring map */
+						<5 13 21 29>,	/* Priority 5 queues per-core Rx ring map */
+						<6 14 22 30>,	/* Priority 6 queues per-core Rx ring map */
+						<7 15 23 31>;	/* Priority 7 queues per-core Rx ring map */
+			interrupts = <0 163 4>,			/* Tx complete ring id #4 IRQ info */
+				   <0 164 4>,			/* Tx complete ring id #5 IRQ info */
+				   <0 165 4>,			/* Tx complete ring id #6 IRQ info */
+				   <0 166 4>,			/* Tx complete ring id #7 IRQ info */
+				   <0 167 4>,			/* Tx complete ring id #8 IRQ info */
+				   <0 168 4>,			/* Tx complete ring id #9 IRQ info */
+				   <0 169 4>,			/* Tx complete ring id #10 IRQ info */
+				   <0 170 4>,			/* Tx complete ring id #11 IRQ info */
+				   <0 171 4>,			/* Tx complete ring id #12 IRQ info */
+				   <0 172 4>,			/* Tx complete ring id #13 IRQ info */
+				   <0 173 4>,			/* Tx complete ring id #14 IRQ info */
+				   <0 174 4>,			/* Tx complete ring id #15 IRQ info */
+				   <0 139 4>,			/* Rx desc ring id #12 IRQ info */
+				   <0 140 4>,			/* Rx desc ring id #13 IRQ info */
+				   <0 141 4>,			/* Rx desc ring id #14 IRQ info */
+				   <0 142 4>,			/* Rx desc ring id #15 IRQ info */
+				   <0 191 4>,			/* Misc error IRQ info */
+				<0 160 4>,			/* PPEDS Node #1(TxComp ring id #1) TxComplete IRQ info */
+				<0 128 4>,			/* PPEDS Node #1(Rx Desc ring id #1) Rx Desc IRQ info */
+				<0 152 4>,			/* PPEDS Node #1(RxFill Desc ring id #1) Rx Fill IRQ info */
+				<0 161 4>,			/* PPEDS Node #2(TxComp ring id #2) TxComplete IRQ info */
+				<0 129 4>,			/* PPEDS Node #2(Rx Desc ring id #2) Rx Desc IRQ info */
+				<0 153 4>,                      /* PPEDS Node #2(RxFill Desc ring id #2) Rx Fill IRQ info */
+				<0 175 4>,                   /* MHT port Tx complete ring id #16 IRQ info */
+				<0 176 4>,                   /* MHT port Tx complete ring id #17 IRQ info */
+				<0 177 4>,                   /* MHT port Tx complete ring id #18 IRQ info */
+				<0 178 4>,                   /* MHT port Tx complete ring id #19 IRQ info */
+				<0 179 4>,                   /* MHT port Tx complete ring id #20 IRQ info */
+				<0 180 4>,                   /* MHT port Tx complete ring id #21 IRQ info */
+				<0 181 4>,                   /* MHT port Tx complete ring id #22 IRQ info */
+				<0 182 4>;                   /* MHT port Tx complete ring id #23 IRQ info */
+		};
+
+		wsi: wsi {
+			id = <0>;
+			num_chip = <2>;
+			status = "okay";
+			chip_info = <0 1 1>,
+				<1 1 0>;
+		};
+
+		q6v5_wcss: remoteproc@d100000 {
+			boot-args = <0x1 0x4 0x3 0x0 0x26 0x2>;
+			memory-region = <&q6_mem_regions>;
+
+			q6_wcss_pd1: remoteproc_pd1 {
+				status = "okay";
+			};
+
+			q6_wcss_pd2: remoteproc_pd2 {
+				compatible = "qcom,ipq5332-wcss-pcie-mpd";
+				firmware = "IPQ5332/q6_fw2.mdt";
+				m3_firmware = "qcn6432/iu_fw.mdt";
+				interrupts-extended = <&wcss_smp2p_in 16 0>,
+						<&wcss_smp2p_in 17 0>,
+						<&wcss_smp2p_in 20 0>,
+						<&wcss_smp2p_in 19 0>;
+				interrupt-names = "fatal",
+						"ready",
+						"spawn-ack",
+						"stop-ack";
+				qcom,smem-states = <&wcss_smp2p_out 16>,
+						<&wcss_smp2p_out 17>,
+						<&wcss_smp2p_out 18>;
+				qcom,smem-state-names = "shutdown",
+							"stop",
+							"spawn";
+				status = "okay";
+			};
+		};
+	};
+};
+
+&blsp1_uart0 {
+	pinctrl-0 = <&serial_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+/*
+&blsp1_uart1 {
+        pinctrl-0 = <&serial_1_pins>;
+        pinctrl-names = "default";
+        status = "disabled";
+};
+*/
+&blsp1_i2c1 {
+	clock-frequency  = <400000>;
+	pinctrl-0 = <&i2c_1_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&blsp1_spi0 {
+	status = "disabled";
+};
+
+&sdhc {
+	bus-width = <4>;
+	max-frequency = <192000000>;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+	non-removable;
+	pinctrl-0 = <&sdc_default_state>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&sleep_clk {
+	clock-frequency = <32000>;
+};
+
+&xo {
+	clock-frequency = <24000000>;
+};
+
+&qpic_bam {
+	status = "okay";
+};
+
+&qpic_nand {
+	pinctrl-0 = <&qspi_default_state>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	nandcs@0 {
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		nand-ecc-strength = <8>;
+		nand-ecc-step-size = <512>;
+		nand-bus-width = <8>;
+	};
+};
+
+/* PINCTRL */
+
+&tlmm {
+	qspi_default_state: qspi-default-state {
+		qspi_clock {
+			pins = "gpio13";
+			function = "qspi_clk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		qspi_cs {
+			pins = "gpio12";
+			function = "qspi_cs";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		qspi_data {
+			pins = "gpio8", "gpio9", "gpio10", "gpio11";
+			function = "qspi_data";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+	pwm_pins: pwm_pinmux {
+			/* PWM LED GREEN */
+			mux_1 {
+				pins = "gpio43";
+				function = "pwm0";
+				drive-strength = <8>;
+			};
+			/* PWM LED BLUE */
+			mux_2 {
+				pins = "gpio45";
+				function = "pwm0";
+				drive-strength = <8>;
+			};
+			/* PWM LED RED */
+			mux_3 {
+				pins = "gpio44";
+				function = "pwm0";
+				drive-strength = <8>;
+			};
+			/* PWM LED WHITE */
+			mux_4 {
+				pins = "gpio46";
+				function = "pwm0";
+				drive-strength = <8>;
+			};
+	};
+/*
+	serial_1_pins: serial1-pinmux {
+		pins = "gpio33", "gpio34", "gpio35", "gpio36";
+		function = "blsp1_uart2";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+*/
+	i2c_1_pins: i2c-1-state {
+		pins = "gpio29", "gpio30";
+		function = "blsp1_i2c0";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+/*
+	gpio_leds_default: gpio-leds-default-state {
+		pins = "gpio36";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-down;
+	}; 
+*/
+	button_pins: button-state {
+		pins = "gpio24";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+	sdc_default_state: sdc-default-state {
+		clk-pins {
+			pins = "gpio13";
+			function = "sdc_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		cmd-pins {
+			pins = "gpio12";
+			function = "sdc_cmd";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		data-pins {
+			pins = "gpio8", "gpio9", "gpio10", "gpio11";
+			function = "sdc_data";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+};
+
+&license_manager {
+	status = "okay";
+};
+
+&usb3 {
+	qcom,select-utmi-as-pipe-clk;
+	status = "disabled";
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_pins>;
+	used-pwm-indices = <1>, <1>, <1>, <1>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&hs_m31phy_0 {
+	status = "okay";
+};
+
+&wifi0 {
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd1>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+	qcom,bdf-addr = <0x4BD00000 0x4BD00000 0x0 0x0 0x0 0x0>;
+	qcom,caldb-addr = <0x4D400000 0x4D000000 0x0 0x0 0x0 0x0>;
+#ifdef __IPQ_MEM_PROFILE_512_MB__
+	qcom,tgt-mem-mode = <1>;
+	qcom,caldb-size = <0x300000>;
+#else
+	qcom,tgt-mem-mode = <0>;
+	qcom,caldb-size = <0x500000>;
+#endif
+	qcom,board_id = <0x1b>;
+	memory-region = <&q6_ipq5332_data>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <0>;
+	status = "okay";
+};
+
+&wifi1 {
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd2>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
+	qcom,bdf-addr = <0x4D900000 0x4D300000 0x0 0x0 0x0 0x0>;
+	qcom,caldb-addr = <0x4F000000 0x4E500000 0x0 0x0 0x0 0x0>;
+	qcom,umac-irq-reset-addr = <0x20000884>;
+	qcom,caldb-size = <0x500000>;
+#ifdef __IPQ_MEM_PROFILE_512_MB__
+	qcom,tgt-mem-mode = <1>;
+#else
+	qcom,tgt-mem-mode = <0>;
+#endif
+	qcom,board_id = <0x060>;
+	memory-region = <&q6_qcn6432_data_1>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <1>;
+	status = "okay";
+	interrupts = <GIC_SPI 33 IRQ_TYPE_EDGE_RISING>;
+	interrupt-names = "umac_reset";
+};
diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-zyxel-nwa130be.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-zyxel-nwa130be.dts
new file mode 100755
index 000000000..6adb86d64
--- /dev/null
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-zyxel-nwa130be.dts
@@ -0,0 +1,592 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * IPQ5332 RDP468 board device tree source
+ *
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include "ipq5332.dtsi"
+#include "ipq5332-default-memory.dtsi"
+
+/ {
+	model = "Zyxel NWA130BE";
+	compatible = "zyxel,nwa130be", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332-rdp468", "qcom,ipq5332";
+
+	aliases {
+		serial0 = &blsp1_uart0;
+		serial1 = &blsp1_uart1;
+		ethernet0 = "/soc/dp1";
+		ethernet1 = "/soc/dp2";
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	soc@0 {
+		mdio:mdio@90000 {
+			pinctrl-0 = <&mdio1_pins &mdio0_pins>;
+			pinctrl-names = "default";
+			/*gpio51 for manhattan reset*/
+			phy-reset-gpio = <&tlmm 51 GPIO_ACTIVE_LOW>;
+			phyaddr_fixup = <0xC90F018>;
+			uniphyaddr_fixup = <0xC90F014>;
+			mdio_clk_fixup; /* MDIO clock sequence fix up flag */
+			status = "okay";
+
+			phy0: ethernet-phy@0 {
+				reg = <1>;
+				fixup;
+			};
+			phy1: ethernet-phy@1 {
+				reg = <2>;
+				fixup;
+			};
+			phy2: ethernet-phy@2 {
+				reg = <3>;
+				fixup;
+			};
+			phy3: ethernet-phy@3 {
+				reg = <4>;
+				fixup;
+			};
+
+			switch0@10 {
+				compatible = "qca,qca8386";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x10>;
+
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					port@0 {
+						reg = <0>;
+						label = "cpu";
+						ethernet = <&gmac2>;
+						dsa-tag-protocol = "qca_4b";
+					};
+
+					port@1 {
+						reg = <1>;
+						label = "lan1";
+						phy-handle = <&phy0>;
+						phy-mode = "usxgmii";
+					};
+
+					port@2 {
+						reg = <2>;
+						label = "lan2";
+						phy-handle = <&phy1>;
+						phy-mode = "usxgmii";
+					};
+
+					port@3 {
+						reg = <3>;
+						label = "lan3";
+						phy-handle = <&phy2>;
+						phy-mode = "usxgmii";
+					};
+				};
+			};
+		};
+
+		ess-instance {
+			num_devices = <0x2>;
+
+			ess-switch@3a000000 {
+				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+				switch_lan_bmp = <0x2>; /* lan port bitmap */
+				switch_wan_bmp = <0x4>; /* wan port bitmap */
+				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0*/
+				switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/
+				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
+
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <1>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
+					};
+					port@1 {
+						port_id = <2>;
+						phy_address = <4>;
+					};
+				};
+
+				led_source@5 {
+					source = <5>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+			};
+
+			ess-switch1@1 {
+				compatible = "qcom,ess-switch-qca8386";
+				device_id = <1>;
+				switch_access_mode = "mdio";
+				mdio-bus = <&mdio>;
+				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0 */
+				switch_mac_mode1 = <0xff>; /* mac mode1 for uniphy instance1 */
+				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+				switch_lan_bmp = <0xe>; /* lan port bitmap */
+				switch_wan_bmp = <0x0>;  /* wan port bitmap */
+				link-polling-required = <0>;
+				fdb_sync = "interrupt";
+				link-intr-gpio = <&tlmm 23 GPIO_ACTIVE_HIGH>;
+
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <0>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
+					};
+					port@1 {
+						port_id = <1>;
+						phy_address = <1>;
+					};
+					port@2 {
+						port_id = <2>;
+						phy_address = <2>;
+					};
+					port@3 {
+						port_id = <3>;
+						phy_address = <3>;
+					};
+				};
+
+				led_source@2 {
+					source = <2>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@5 {
+					source = <5>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@8 {
+					source = <8>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+			};
+		};
+
+		dp1 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			qcom,id = <2>;
+			reg = <0x3a504000 0x4000>;
+			qcom,mactype = <1>;
+			local-mac-address = [000000000000];
+			mdio-bus = <&mdio>;
+			qcom,phy-mdio-addr = <4>;
+			qcom,link-poll = <1>;
+			phy-mode = "sgmii";
+		};
+
+		gmac2:dp2 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			qcom,id = <1>;
+			reg = <0x3a500000 0x4000>;
+			qcom,mactype = <1>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+			qcom,mht-dev = <1>;
+			qcom,is_switch_connected = <1>;
+			qcom,ppe-offload-disabled = <1>;
+		};
+
+		/* EDMA host driver configuration for the board */
+		edma@3ab00000 {
+			qcom,txdesc-ring-start = <4>;		/* Tx desc ring start ID */
+			qcom,txdesc-rings = <12>;		/* Total number of Tx desc rings to be provisioned */
+			qcom,mht-txdesc-rings = <8>;            /* Extra Tx desc rings to be provisioned for MHT SW ports */
+			qcom,txcmpl-ring-start = <4>;		/* Tx complete ring start ID */
+			qcom,txcmpl-rings = <12>;		/* Total number of Tx complete rings to be provisioned */
+			qcom,mht-txcmpl-rings = <8>;            /* Extra Tx complete rings to be provisioned for mht sw ports. */
+			qcom,rxfill-ring-start = <4>;		/* Rx fill ring start ID */
+			qcom,rxfill-rings = <4>;		/* Total number of Rx fill rings to be provisioned */
+			qcom,rxdesc-ring-start = <12>;		/* Rx desc ring start ID */
+			qcom,rxdesc-rings = <4>;		/* Total number of Rx desc rings to be provisioned */
+			qcom,rx-page-mode = <0>;		/* Rx fill ring page mode */
+			qcom,tx-map-priority-level = <1>;	/* Tx priority level per port */
+			qcom,rx-map-priority-level = <1>;	/* Rx priority level per core */
+			qcom,ppeds-num = <2>;			/* Number of PPEDS nodes */
+			/* PPE-DS node format: <Rx-fill Tx-cmpl Rx Tx Queue-base Queue-count> */
+			qcom,ppeds-map = <1 1 1 1 32 8>,	/* PPEDS Node#0 ring and queue map */
+					<2 2 2 2 40 8>;		/* PPEDS Node#1 ring and queue map */
+			qcom,txdesc-map = <8 9 10 11>,		/* Port0 per-core Tx ring map */
+					<12 13 14 15>,        /* MHT-Port1 per-core Tx ring map */
+					<4 5 6 7>,            /* MHT-Port2 per-core Tx ring map/packets from  vp*/
+					<16 17 18 19>,        /* MHT-Port3 per-core Tx ring map */
+					<20 21 22 23>;        /* MHT-Port4 per-core Tx ring map */
+			qcom,txdesc-fc-grp-map = <1 2 3 4 5>;   /* Per GMAC flow control group map */
+			qcom,rxfill-map = <4 5 6 7>;		/* Per-core Rx fill ring map */
+			qcom,rxdesc-map = <12 13 14 15>;	/* Per-core Rx desc ring map */
+			qcom,rx-queue-start = <0>;		/* Rx queue start */
+			qcom,rx-ring-queue-map = <0 8 16 24>,	/* Priority 0 queues per-core Rx ring map */
+						<1 9 17 25>,	/* Priority 1 queues per-core Rx ring map */
+						<2 10 18 26>,	/* Priority 2 queues per-core Rx ring map */
+						<3 11 19 27>,	/* Priority 3 queues per-core Rx ring map */
+						<4 12 20 28>,	/* Priority 4 queues per-core Rx ring map */
+						<5 13 21 29>,	/* Priority 5 queues per-core Rx ring map */
+						<6 14 22 30>,	/* Priority 6 queues per-core Rx ring map */
+						<7 15 23 31>;	/* Priority 7 queues per-core Rx ring map */
+			interrupts = <0 163 4>,			/* Tx complete ring id #4 IRQ info */
+				   <0 164 4>,			/* Tx complete ring id #5 IRQ info */
+				   <0 165 4>,			/* Tx complete ring id #6 IRQ info */
+				   <0 166 4>,			/* Tx complete ring id #7 IRQ info */
+				   <0 167 4>,			/* Tx complete ring id #8 IRQ info */
+				   <0 168 4>,			/* Tx complete ring id #9 IRQ info */
+				   <0 169 4>,			/* Tx complete ring id #10 IRQ info */
+				   <0 170 4>,			/* Tx complete ring id #11 IRQ info */
+				   <0 171 4>,			/* Tx complete ring id #12 IRQ info */
+				   <0 172 4>,			/* Tx complete ring id #13 IRQ info */
+				   <0 173 4>,			/* Tx complete ring id #14 IRQ info */
+				   <0 174 4>,			/* Tx complete ring id #15 IRQ info */
+				   <0 139 4>,			/* Rx desc ring id #12 IRQ info */
+				   <0 140 4>,			/* Rx desc ring id #13 IRQ info */
+				   <0 141 4>,			/* Rx desc ring id #14 IRQ info */
+				   <0 142 4>,			/* Rx desc ring id #15 IRQ info */
+				   <0 191 4>,			/* Misc error IRQ info */
+				<0 160 4>,			/* PPEDS Node #1(TxComp ring id #1) TxComplete IRQ info */
+				<0 128 4>,			/* PPEDS Node #1(Rx Desc ring id #1) Rx Desc IRQ info */
+				<0 152 4>,			/* PPEDS Node #1(RxFill Desc ring id #1) Rx Fill IRQ info */
+				<0 161 4>,			/* PPEDS Node #2(TxComp ring id #2) TxComplete IRQ info */
+				<0 129 4>,			/* PPEDS Node #2(Rx Desc ring id #2) Rx Desc IRQ info */
+				<0 153 4>,                      /* PPEDS Node #2(RxFill Desc ring id #2) Rx Fill IRQ info */
+				<0 175 4>,                   /* MHT port Tx complete ring id #16 IRQ info */
+				<0 176 4>,                   /* MHT port Tx complete ring id #17 IRQ info */
+				<0 177 4>,                   /* MHT port Tx complete ring id #18 IRQ info */
+				<0 178 4>,                   /* MHT port Tx complete ring id #19 IRQ info */
+				<0 179 4>,                   /* MHT port Tx complete ring id #20 IRQ info */
+				<0 180 4>,                   /* MHT port Tx complete ring id #21 IRQ info */
+				<0 181 4>,                   /* MHT port Tx complete ring id #22 IRQ info */
+				<0 182 4>;                   /* MHT port Tx complete ring id #23 IRQ info */
+		};
+
+		leds {
+			compatible = "gpio-leds";
+			pinctrl-0 = <&led_pins>;
+			pinctrl-names = "default";
+			led_blue{
+				label = "led_blue";
+				gpio = <&tlmm 22 GPIO_ACTIVE_HIGH>;
+				linux,default-trigger = "led_blue";
+				default-state = "off";
+			};
+			led_green {
+				label = "led_green";
+				gpio = <&tlmm 31 GPIO_ACTIVE_HIGH>;
+				linux,default-trigger = "led_green";
+				default-state = "on";
+			};
+			led_white {
+				label = "led_white";
+				gpio = <&tlmm 32 GPIO_ACTIVE_HIGH>;
+				linux,default-trigger = "led_white";
+				default-state = "off";
+			};
+			led_red {
+				label = "led_red";
+				gpio = <&tlmm 44 GPIO_ACTIVE_HIGH>;
+				linux,default-trigger = "led_red";
+				default-state = "off";
+			};
+		};
+
+		gpio_keys {
+			compatible = "gpio-keys";
+			pinctrl-0 = <&button_pins>;
+			pinctrl-names = "default";
+			button@1 {
+				label = "reset";
+				linux,code = <KEY_RESTART>;
+				gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
+				linux,input-type = <1>;
+				debounce-interval = <60>;
+			};
+		};
+
+		wsi: wsi {
+			id = <0>;
+			num_chip = <2>;
+			status = "okay";
+			chip_info = <0 1 1>,
+				    <1 1 0>;
+		};
+	};
+};
+
+&wifi0 {
+	led-gpio = <&tlmm 36 GPIO_ACTIVE_HIGH>;
+	qcom,rproc = <&q6_wcss_pd1>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+	memory-region = <&q6_region>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <0>;
+	qcom,board_id = <0x12>;
+	status = "okay";
+};
+
+&qcn9224_pcie1 {
+	status = "okay";
+};
+
+&blsp1_uart0 {
+	pinctrl-0 = <&serial_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&blsp1_uart1 {
+	pinctrl-0 = <&serial_1_pins>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&blsp1_spi0 {
+	pinctrl-0 = <&spi_0_data_clk_pins &spi_0_cs_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	flash@0 {
+		compatible = "n25q128a11", "micron,n25q128a11", "jedec,spi-nor";
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		spi-max-frequency = <50000000>;
+	};
+};
+
+&sdhc {
+	bus-width = <4>;
+	max-frequency = <192000000>;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+	non-removable;
+	pinctrl-0 = <&sdc_default_state>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&sleep_clk {
+	clock-frequency = <32000>;
+};
+
+&xo {
+	clock-frequency = <24000000>;
+};
+
+&qpic_bam {
+	status = "okay";
+};
+
+&qpic_nand {
+	pinctrl-0 = <&qspi_default_state>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	nandcs@0 {
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		nand-ecc-strength = <8>;
+		nand-ecc-step-size = <512>;
+		nand-bus-width = <8>;
+	};
+};
+
+&pcie1_phy_x2 {
+	status = "okay";
+};
+
+&pcie1 {
+	pinctrl-0 = <&pcie1_default_state>;
+	pinctrl-names = "default";
+	perst-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
+	status = "okay";
+
+	pcie1_rp {
+		reg = <0 0 0 0 0>;
+
+		qcom,mhi@1 {
+			reg = <0 0 0 0 0>;
+			boot-args = <0x2 0x4 0x34 0x3 0x0 0x0     /* MX Rail, GPIO52, Drive strength 0x3 */
+					0x4 0x4 0x18 0x3 0x0 0x0  /* RFA1p2 Rail, GPIO24, Drive strength 0x3 */
+					0x0 0x4 0x0 0x0 0x0 0x0>; /* End of arguments */
+			memory-region = <&qcn9224_pcie1>;
+			qcom,wsi = <&wsi>;
+			qcom,wsi_index = <1>;
+			qcom,board_id = <0x1019>;
+		};
+	};
+};
+
+/* PINCTRL */
+
+&tlmm {
+
+	led_pins: led_pins {
+		led_blue {
+			pins = "gpio22";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		led_green {
+			pins = "gpio31";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		led_white {
+			pins = "gpio32";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		led_red {
+			pins = "gpio44";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+
+	sdc_default_state: sdc-default-state {
+		clk-pins {
+			pins = "gpio13";
+			function = "sdc_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		cmd-pins {
+			pins = "gpio12";
+			function = "sdc_cmd";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		data-pins {
+			pins = "gpio8", "gpio9", "gpio10", "gpio11";
+			function = "sdc_data";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	spi_0_data_clk_pins: spi-0-data-clk-state {
+		pins = "gpio14", "gpio15", "gpio16";
+		function = "blsp0_spi";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+
+	spi_0_cs_pins: spi-0-cs-state {
+		pins = "gpio17";
+		function = "blsp0_spi";
+		drive-strength = <2>;
+		bias-pull-up;
+	};
+
+	qspi_default_state: qspi-default-state {
+		qspi_clock {
+			pins = "gpio13";
+			function = "qspi_clk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		qspi_cs {
+			pins = "gpio12";
+			function = "qspi_cs";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		qspi_data {
+			pins = "gpio8", "gpio9", "gpio10", "gpio11";
+			function = "qspi_data";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+	serial_1_pins: serial1-pinmux {
+		pins = "gpio33", "gpio34", "gpio35", "gpio36";
+		function = "blsp1_uart2";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+	button_pins: button-state {
+		pins = "gpio30";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+	pwm_pins: pwm-state {
+		pins = "gpio46";
+		function = "pwm0";
+		drive-strength = <8>;
+	};
+
+	pcie1_default_state: pcie1-default-state {
+		pins = "gpio47";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+		output-low;
+	};
+};
+
+&license_manager {
+	status = "okay";
+};
+
+&usb3 {
+	qcom,multiplexed-phy;
+	status = "okay";
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&hs_m31phy_0 {
+	status = "okay";
+};
+
+&ssuniphy_0 {
+	status = "okay";
+};
diff --git a/feeds/qca-wifi-7/ipq53xx/generic/config-default b/feeds/qca-wifi-7/ipq53xx/generic/config-default
index 559bf95ba..b6e3e9f59 100644
--- a/feeds/qca-wifi-7/ipq53xx/generic/config-default
+++ b/feeds/qca-wifi-7/ipq53xx/generic/config-default
@@ -1,72 +1,27 @@
 # CONFIG_32BIT is not set
 CONFIG_64BIT=y
 # CONFIG_ACPI is not set
-# CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_EXYNOS7 is not set
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-# CONFIG_ARCH_LAYERSCAPE is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-# CONFIG_ARCH_SEATTLE is not set
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-# CONFIG_ARCH_SPRD is not set
-# CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_THUNDER is not set
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-# CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZYNQMP is not set
-CONFIG_ARM64=y
-# CONFIG_ARM64_16K_PAGES is not set
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_CRYPTO is not set
-# CONFIG_ARM64_ERRATUM_819472 is not set
-# CONFIG_ARM64_ERRATUM_824069 is not set
-# CONFIG_ARM64_ERRATUM_826319 is not set
-# CONFIG_ARM64_ERRATUM_827319 is not set
-# CONFIG_ARM64_ERRATUM_832075 is not set
-# CONFIG_ARM64_ERRATUM_843419 is not set
-# CONFIG_ARM64_ERRATUM_845719 is not set
+CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_HW_AFDBM=y
-# CONFIG_ARM64_LSE_ATOMICS is not set
 CONFIG_ARM64_PAN=y
 # CONFIG_ARM64_PTDUMP is not set
-# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
 CONFIG_ARM64_VA_BITS=39
 CONFIG_ARM64_VA_BITS_39=y
-# CONFIG_ARM64_VA_BITS_48 is not set
 # CONFIG_ARMV8_DEPRECATED is not set
-# CONFIG_CAVIUM_ERRATUM_22375 is not set
-# CONFIG_CAVIUM_ERRATUM_23154 is not set
-# CONFIG_CAVIUM_ERRATUM_27456 is not set
 # CONFIG_COMMON_CLK_VERSATILE is not set
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-# CONFIG_DEBUG_ALIGN_RODATA is not set
-CONFIG_FRAME_WARN=2048
-# CONFIG_GPIO_XGENE is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_KASAN is not set
+CONFIG_CRYPTO_AES_ARM64_CE=y
+# CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 # CONFIG_KVM is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_PCI_HISI is not set
 CONFIG_PHYS_ADDR_T_64BIT=y
-# CONFIG_PHY_XGENE is not set
-# CONFIG_POWER_RESET_XGENE is not set
 CONFIG_QCOM_SCM_64=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_RTC_DRV_EFI is not set
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_VIRTUALIZATION=y
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
diff --git a/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk b/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk
index 162462e7d..403d7ed3e 100755
--- a/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk
+++ b/feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk
@@ -65,6 +65,20 @@ define Device/sonicfi_rap7110c_341x
 endef
 TARGET_DEVICES += sonicfi_rap7110c_341x
 
+define Device/sonicfi_rap750e_h
+  DEVICE_TITLE := SONICFI RAP750E-H
+  DEVICE_DTS := ipq5332-sonicfi-rap750e-h
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_CONFIG := config@mi01.3-c2
+  SUPPORTED_DEVICES := sonicfi,rap750e-h
+  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+  IMAGE/nand-factory.ubi := append-ubi
+  DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750e-h ath12k-firmware-ipq5332-peb -ath12k-firmware-qcn92xx
+endef
+TARGET_DEVICES += sonicfi_rap750e_h
+
 define Device/sonicfi_rap750w_311a
   DEVICE_TITLE := SONICFI RAP750W-311A
   DEVICE_DTS := ipq5332-sonicfi-rap750w-311a
@@ -117,3 +131,19 @@ define Device/cig_wf672
   DEVICE_PACKAGES := ath12k-wifi-cig-wf672 ath12k-firmware-ipq5332 ath12k-firmware-qcn92xx
 endef
 TARGET_DEVICES += cig_wf672
+
+define Device/zyxel_nwa130be
+  DEVICE_TITLE := Zyxel NWA130BE
+  DEVICE_DTS := ipq5332-zyxel-nwa130be
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_CONFIG := config@mi01.6
+  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+  BLOCKSIZE := 256k
+  PAGESIZE := 4096
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+  IMAGE/nand-factory.ubi := append-ubi
+  DEVICE_PACKAGES := ath12k-wifi-zyxel-nwa130be ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
+endef
+TARGET_DEVICES += zyxel_nwa130be
+
diff --git a/feeds/qca-wifi-7/mac80211/Makefile b/feeds/qca-wifi-7/mac80211/Makefile
index 2b61aeb22..78261face 100644
--- a/feeds/qca-wifi-7/mac80211/Makefile
+++ b/feeds/qca-wifi-7/mac80211/Makefile
@@ -262,6 +262,11 @@ define KernelPackage/mt7601u
   AUTOLOAD:=$(call AutoProbe,mt7601u)
 endef
 
+ifdef CONFIG_TARGET_PROFILE
+TARGET_PROFILE=$(subst ",,$(CONFIG_TARGET_PROFILE))
+PATCH_PROFILE_NAME=patches-$(subst DEVICE_,,$(TARGET_PROFILE))
+endif
+
 ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
   config-y += \
 	CFG80211_DEBUGFS \
@@ -362,6 +367,7 @@ define Build/Patch
 	$(call PatchDir,$(PKG_BUILD_DIR),$(EXTERNAL_PATCH_DIR)/ath12k,ath12k/)
 	$(call PatchDir,$(PKG_BUILD_DIR),$(EXTERNAL_PATCH_DIR)/pending,pending/)
 	$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_TIP_DIR)/pending,pending/)
+	$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_PROFILE_NAME)/ath12k,ath12k/)
 	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
diff --git a/feeds/qca-wifi-7/mac80211/patches-zyxel_nwa130be/0001-thermal-thermal-setting.patch b/feeds/qca-wifi-7/mac80211/patches-zyxel_nwa130be/0001-thermal-thermal-setting.patch
new file mode 100644
index 000000000..1e6d53afd
--- /dev/null
+++ b/feeds/qca-wifi-7/mac80211/patches-zyxel_nwa130be/0001-thermal-thermal-setting.patch
@@ -0,0 +1,59 @@
+From 1a46aa106a50a06bfa4b669d87a8143c3d59f2f4 Mon Sep 17 00:00:00 2001
+From: YenLin Pan <yenlin.pan@zyxel.com.tw>
+Date: Wed, 14 May 2025 14:14:22 +0800
+Subject: [PATCH] thermal: thermal setting
+
+lv0 -100 -hi0 105 -off0 0
+lv1 95   -hi1 110 -off1 75
+lv2 100  -hi2 115 -off2 98
+lv3 105  -hi3 120 -off3 100
+
+Signed-off-by: YenLin Pan <YenLin.Pan@zyxel.com.tw>
+---
+ drivers/net/wireless/ath/ath12k/thermal.h | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/wireless/ath/ath12k/thermal.h b/drivers/net/wireless/ath/ath12k/thermal.h
+index 5c91906..a493cd5 100644
+--- a/drivers/net/wireless/ath/ath12k/thermal.h
++++ b/drivers/net/wireless/ath/ath12k/thermal.h
+@@ -13,28 +13,28 @@
+ 
+ /* Below temperatures are in celsius */
+ #define ATH12K_THERMAL_LVL0_TEMP_LOW_MARK -100
+-#define ATH12K_THERMAL_LVL0_TEMP_HIGH_MARK 100
++#define ATH12K_THERMAL_LVL0_TEMP_HIGH_MARK 105
+ #define ATH12K_THERMAL_LVL1_TEMP_LOW_MARK 95
+-#define ATH12K_THERMAL_LVL1_TEMP_HIGH_MARK 105
++#define ATH12K_THERMAL_LVL1_TEMP_HIGH_MARK 110
+ #define ATH12K_THERMAL_LVL2_TEMP_LOW_MARK 100
+-#define ATH12K_THERMAL_LVL2_TEMP_HIGH_MARK 110
++#define ATH12K_THERMAL_LVL2_TEMP_HIGH_MARK 115
+ #define ATH12K_THERMAL_LVL3_TEMP_LOW_MARK 105
+ #define ATH12K_THERMAL_LVL3_TEMP_HIGH_MARK 120
+ 
+ #define ATH12K_THERMAL_LVL0_V2_TEMP_LOW_MARK -100
+-#define ATH12K_THERMAL_LVL0_V2_TEMP_HIGH_MARK 95
++#define ATH12K_THERMAL_LVL0_V2_TEMP_HIGH_MARK 105
+ #define ATH12K_THERMAL_LVL1_V2_TEMP_LOW_MARK 90
+-#define ATH12K_THERMAL_LVL1_V2_TEMP_HIGH_MARK 100
++#define ATH12K_THERMAL_LVL1_V2_TEMP_HIGH_MARK 110
+ #define ATH12K_THERMAL_LVL2_V2_TEMP_LOW_MARK 95
+ #define ATH12K_THERMAL_LVL2_V2_TEMP_HIGH_MARK 105
+ #define ATH12K_THERMAL_LVL3_V2_TEMP_LOW_MARK 100
+-#define ATH12K_THERMAL_LVL3_V2_TEMP_HIGH_MARK 110
++#define ATH12K_THERMAL_LVL3_V2_TEMP_HIGH_MARK 115
+ #define ATH12K_THERMAL_LVL4_V2_TEMP_LOW_MARK 105
+ #define ATH12K_THERMAL_LVL4_V2_TEMP_HIGH_MARK 120
+ 
+ #define ATH12K_THERMAL_LVL0_DUTY_CYCLE 0
+-#define ATH12K_THERMAL_LVL1_DUTY_CYCLE 50
+-#define ATH12K_THERMAL_LVL2_DUTY_CYCLE 90
++#define ATH12K_THERMAL_LVL1_DUTY_CYCLE 75
++#define ATH12K_THERMAL_LVL2_DUTY_CYCLE 98
+ #define ATH12K_THERMAL_LVL3_DUTY_CYCLE 100
+ 
+ #define ATH12K_THERMAL_LVL0_V2_DUTY_CYCLE ATH12K_THERMAL_LVL0_DUTY_CYCLE
+-- 
+2.34.1
+
diff --git a/feeds/qca-wifi-7/qca-ssdk-qca/Makefile b/feeds/qca-wifi-7/qca-ssdk-qca/Makefile
index 35b4a3d5b..a285e9ccf 100644
--- a/feeds/qca-wifi-7/qca-ssdk-qca/Makefile
+++ b/feeds/qca-wifi-7/qca-ssdk-qca/Makefile
@@ -97,6 +97,11 @@ else ifneq ($(CONFIG_ARCH),)
 			      TARGET_NAME=$(subst ",,$(CONFIG_ARCH))-openwrt-linux$(if $(CONFIG_TARGET_SUFFIX),-$(subst ",,$(CONFIG_TARGET_SUFFIX)))
 endif
 
+ifdef CONFIG_TARGET_PROFILE
+TARGET_PROFILE=$(subst ",,$(CONFIG_TARGET_PROFILE))
+PATCH_PROFILE_NAME=patches-$(subst DEVICE_,,$(TARGET_PROFILE))
+endif
+
 QCASSDK_CONFIG_OPTS+= TOOL_PATH=$(TOOLCHAIN_BIN_PATH) \
                 SYS_PATH=$(LINUX_DIR) \
                 TOOLPREFIX=$(TARGET_CROSS) \
@@ -193,5 +198,10 @@ define KernelPackage/qca-ssdk-qca-hnat/install
 	$(INSTALL_BIN) ./files/qca-ssdk $(1)/etc/init.d/qca-ssdk
 endef
 
+define patch_profile
+	$(call PatchDir/Default,$(PKG_BUILD_DIR),./$(PATCH_PROFILE_NAME))
+endef
+
+Hooks/Prepare/Post += patch_profile
 $(eval $(call KernelPackage,qca-ssdk-qca-nohnat))
 $(eval $(call KernelPackage,qca-ssdk-qca-hnat))
diff --git a/feeds/qca-wifi-7/qca-ssdk-qca/patches-zyxel_nwa130be/0001-pinctrl-make-the-switch-LED-works.patch b/feeds/qca-wifi-7/qca-ssdk-qca/patches-zyxel_nwa130be/0001-pinctrl-make-the-switch-LED-works.patch
new file mode 100644
index 000000000..0fd4afc5b
--- /dev/null
+++ b/feeds/qca-wifi-7/qca-ssdk-qca/patches-zyxel_nwa130be/0001-pinctrl-make-the-switch-LED-works.patch
@@ -0,0 +1,47 @@
+From 7fa9e9b683f1c573c58a14755347988919bc7d06 Mon Sep 17 00:00:00 2001
+From: YenLin Pan <yenlin.pan@zyxel.com.tw>
+Date: Wed, 14 May 2025 13:47:06 +0800
+Subject: [PATCH] pinctrl: make the switch LED works
+
+Enable switch LED pin definition for LED0/LED1/LED2 control
+
+Signed-off-by: YenLin Pan <YenLin.Pan@zyxel.com.tw>
+---
+ src/init/ssdk_mht_pinctrl.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/init/ssdk_mht_pinctrl.c b/src/init/ssdk_mht_pinctrl.c
+index 2debe59..1ae0002 100755
+--- a/src/init/ssdk_mht_pinctrl.c
++++ b/src/init/ssdk_mht_pinctrl.c
+@@ -33,11 +33,17 @@ static struct mht_pinctrl_setting mht_pin_settings[] = {
+     /*PINs default MUX Setting*/
+     MHT_PIN_SETTING_MUX(0,  MHT_PIN_FUNC_INTN_WOL),
+     MHT_PIN_SETTING_MUX(1,  MHT_PIN_FUNC_INTN),
+-#if 0
++#if 1
+     MHT_PIN_SETTING_MUX(2,  MHT_PIN_FUNC_P0_LED_0),
+     MHT_PIN_SETTING_MUX(3,  MHT_PIN_FUNC_P1_LED_0),
+     MHT_PIN_SETTING_MUX(4,  MHT_PIN_FUNC_P2_LED_0),
+     MHT_PIN_SETTING_MUX(5,  MHT_PIN_FUNC_P3_LED_0),
++    MHT_PIN_SETTING_MUX(6,  MHT_PIN_FUNC_P0_LED_2),
++    MHT_PIN_SETTING_MUX(7,  MHT_PIN_FUNC_P1_LED_2),
++    MHT_PIN_SETTING_MUX(8,  MHT_PIN_FUNC_P2_LED_2),
++    MHT_PIN_SETTING_MUX(9,  MHT_PIN_FUNC_P3_LED_2),
++#endif
++#if 0
+     MHT_PIN_SETTING_MUX(6,  MHT_PIN_FUNC_PPS_IN),
+     MHT_PIN_SETTING_MUX(7,  MHT_PIN_FUNC_TOD_IN),
+     MHT_PIN_SETTING_MUX(8,  MHT_PIN_FUNC_RTC_REFCLK_IN),
+@@ -49,7 +55,7 @@ static struct mht_pinctrl_setting mht_pin_settings[] = {
+     MHT_PIN_SETTING_MUX(13, MHT_PIN_FUNC_P0_TOD_OUT),
+     MHT_PIN_SETTING_MUX(14, MHT_PIN_FUNC_P0_CLK125_TDI),
+     MHT_PIN_SETTING_MUX(15, MHT_PIN_FUNC_P0_SYNC_CLKO_PTP),
+-#if 0
++#if 1
+     MHT_PIN_SETTING_MUX(16, MHT_PIN_FUNC_P0_LED_1),
+     MHT_PIN_SETTING_MUX(17, MHT_PIN_FUNC_P1_LED_1),
+     MHT_PIN_SETTING_MUX(18, MHT_PIN_FUNC_P2_LED_1),
+-- 
+2.34.1
+
diff --git a/feeds/tip/certificates/files/usr/bin/mount_certs b/feeds/tip/certificates/files/usr/bin/mount_certs
index 8e15fc3a4..e0ea1d632 100755
--- a/feeds/tip/certificates/files/usr/bin/mount_certs
+++ b/feeds/tip/certificates/files/usr/bin/mount_certs
@@ -92,6 +92,7 @@ yuncore,fap655)
 	;;
 senao,iap2300m|\
 senao,iap4300m|\
+emplus,wap588m|\
 senao,jeap6500)
 	PART_NAME=ubi
 	;;
diff --git a/feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc
index f2549c207..0afbe0519 100644
--- a/feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc
+++ b/feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc
@@ -19,6 +19,7 @@ switch(board_name) {
 case 'edgecore,eap105':
 case 'edgecore,oap101-6e':
 case 'edgecore,oap101e-6e':
+case 'zyxel,nwa130be':
     num_radios = 3;
     break;
 }
@@ -572,6 +573,7 @@ function channel_optimize() {
     let radio_iface = {};
     let htmode = {};
     let radio_band = {};
+    let radio_disabled = {};
     let acs_exclude_dfs = {};
     let channel_config = {};
     let selected_channels = {};
@@ -604,11 +606,13 @@ function channel_optimize() {
 
         // get wireless interface uci config from "ubus call network.wireless status"
         let wireless_status = global.ubus.conn.call('network.wireless', 'status');
-        radio_iface[j] = wireless_status[radio_id].interfaces[0].ifname;
+        radio_disabled[j] = wireless_status[radio_id].disabled;
         radio_band[j] = wireless_status[radio_id].config.band;
 
-        if (radio_iface[j] == null) {
+        if (radio_disabled[j] == true) {
             radio_iface[j] = 'radio ' + radio_band[j];
+        } else {
+            radio_iface[j] = wireless_status[radio_id].interfaces[0].ifname;
         }
 
         // check wlan interface status
diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile
index 575932ccd..dc6e209a9 100644
--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/feeds/ucentral/ucentral-schema/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=280d87658fa36c1d5d6852dcb8203042eba6bbc9101ac317a2088e2dd68249da
+PKG_MIRROR_HASH:=cbb6508faa5e0b640e1990a806383f9f13fb5da75f38114f4f32e9c14b9845f1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2025-01-27
-PKG_SOURCE_VERSION:=52afdf8f1d1cb8445b6b56eba3768d0edffa63e1
+PKG_SOURCE_VERSION:=9710867e1a2c775fa424fd7780ba6132eaa6fd9c
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 
diff --git a/patches/0089-MorseMicro-iwinfo.patch b/patches/0089-MorseMicro-iwinfo.patch
new file mode 100644
index 000000000..8357b00ff
--- /dev/null
+++ b/patches/0089-MorseMicro-iwinfo.patch
@@ -0,0 +1,1995 @@
+From 67adfbc5b4831ecb62a169370c102e0939ae884e Mon Sep 17 00:00:00 2001
+From: ian77_chen <ian77_chen@accton.com>
+Date: Mon, 10 Mar 2025 15:21:57 +0800
+Subject: [PATCH] patch for Morse Micro iwinfo
+
+---
+ .../utils/iwinfo/patches/MMiwinfo.patch       | 1976 +++++++++++++++++
+ 1 file changed, 1976 insertions(+)
+ create mode 100644 package/network/utils/iwinfo/patches/MMiwinfo.patch
+
+diff --git a/package/network/utils/iwinfo/patches/MMiwinfo.patch b/package/network/utils/iwinfo/patches/MMiwinfo.patch
+new file mode 100644
+index 0000000000..c10d4bf881
+--- /dev/null
++++ b/package/network/utils/iwinfo/patches/MMiwinfo.patch
+@@ -0,0 +1,1976 @@
++diff --git a/.gitignore b/.gitignore
++new file mode 100644
++index 0000000..7f4922f
++--- /dev/null
+++++ b/.gitignore
++@@ -0,0 +1,17 @@
+++iwinfo_cli.o
+++iwinfo_lib.o
+++iwinfo_lua.o
+++iwinfo_nl80211.o
+++iwinfo_utils.o
+++iwinfo_wext_scan.o
+++iwinfo_wext.o
+++iwinfo.so
+++libiwinfo.so
+++libiwinfo.so.0
+++iwinfo
+++
+++*.so
+++*.so.*
+++*.o
+++
+++.vscode/
++diff --git a/Makefile b/Makefile
++index adb9e73..fac0abf 100644
++--- a/Makefile
+++++ b/Makefile
++@@ -37,6 +37,7 @@ ifneq ($(filter nl80211,$(IWINFO_BACKENDS)),)
++ 	IWINFO_CLI_LDFLAGS += -lnl-tiny
++ 	IWINFO_LIB_LDFLAGS += -lnl-tiny
++ 	IWINFO_LIB_OBJ     += iwinfo_nl80211.o
+++	IWINFO_LIB_OBJ     += iwinfo_morsecli.o dot11ah_channel.o
++ endif
++ 
++ 
++diff --git a/devices.txt b/devices.txt
++index eded184..397a1cf 100644
++--- a/devices.txt
+++++ b/devices.txt
++@@ -192,6 +192,9 @@
++ 0x02d0 0xa9a6 0x0000 0x0000    0      0  "Cypress"  "CYW43455"
++ 0x02d0 0x4345 0x0000 0x0000    0      0  "Cypress"  "CYW43455"
++ 0x1ae9 0x0310 0x1ae9 0x0000    0      0  "Wilocity" "Wil6210"
+++0x325B 0x0206 0x0000 0x0000    0      0  "Morse Micro" "HaLow WiFi"
+++0x325B 0x0306 0x0000 0x0000    0      0  "Morse Micro" "HaLow WiFi"
+++
++ 
++ # USB devices
++ # 0x0000 | 0x0000 | vendor id | product id | ...
++@@ -263,3 +266,4 @@
++ "ralink,rt3883-wmac"    0      0  "Ralink" "Rt3883"
++ "ralink,rt5350-wmac"    0      0  "Ralink" "Rt5350"
++ "ralink,rt7620-wmac"    0      0  "MediaTek" "MT7620"
+++"morse,mm610x-spi"      0      0  "Morse Micro" "HaLow WiFi"
++diff --git a/dot11ah_channel.c b/dot11ah_channel.c
++new file mode 100644
++index 0000000..24dfb0e
++--- /dev/null
+++++ b/dot11ah_channel.c
++@@ -0,0 +1,444 @@
+++/*
+++ * Copyright 2022 Morse Micro
+++ *
+++ * The iwinfo library is free software: you can redistribute it and/or
+++ * modify it under the terms of the GNU General Public License version 2
+++ * as published by the Free Software Foundation.
+++ *
+++ * The iwinfo library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+++ * See the GNU General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU General Public License along
+++ * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
+++*/
+++
+++#include <stdio.h>
+++#include <string.h>
+++#include <stdlib.h>
+++
+++#include "dot11ah_channel.h"
+++
+++static const channel_to_halow_freq_t kNullAhValue = {0, 0, 0, 0};
+++
+++static const country_channel_map_t us_channel_map = {
+++	.country = "US",
+++	.num_mapped_channels = 48,
+++	.ah_vals = {
+++		/* 1Mhz */
+++		{132, 1, 902.5, 0},
+++		{136, 3, 903.5, 0},
+++		{36, 5, 904.5, 0},
+++		{40, 7, 905.5, 0},
+++		{44, 9, 906.5, 0},
+++		{48, 11, 907.5, 0},
+++		{52, 13, 908.5, 0},
+++		{56, 15, 909.5, 0},
+++		{60, 17, 910.5, 0},
+++		{64, 19, 911.5, 0},
+++		{100, 21, 912.5, 0},
+++		{104, 23, 913.5, 0},
+++		{108, 25, 914.5, 0},
+++		{112, 27, 915.5, 0},
+++		{116, 29, 916.5, 0},
+++		{120, 31, 917.5, 0},
+++		{124, 33, 918.5, 0},
+++		{128, 35, 919.5, 0},
+++		{149, 37, 920.5, 0},
+++		{153, 39, 921.5, 0},
+++		{157, 41, 922.5, 0},
+++		{161, 43, 923.5, 0},
+++		{165, 45, 924.5, 0},
+++		{169, 47, 925.5, 0},
+++		{173, 49, 926.5, 0},
+++		{177, 51, 927.5, 0},
+++		/* 2MHz */
+++		{134, 2, 903, 1},
+++		{38, 6, 905, 1},
+++		{46, 10, 907, 1},
+++		{54, 14, 909, 1},
+++		{62, 18, 911, 1},
+++		{102, 22, 913, 1},
+++		{110, 26, 915, 1},
+++		{118, 30, 917, 1},
+++		{126, 34, 919, 1},
+++		{151, 38, 921, 1},
+++		{159, 42, 923, 1},
+++		{167, 46, 925, 1},
+++		{175, 50, 927, 1},
+++		/* 4MHz */
+++		{42, 8, 906, 2},
+++		{58, 16, 910, 2},
+++		{106, 24, 914, 2},
+++		{122, 32, 918, 2},
+++		{155, 40, 922, 2},
+++		{171, 48, 926, 2},
+++		/* 8MHz */
+++		{50, 12, 908, 3},
+++		{114, 28, 916, 3},
+++		{163, 44, 924, 3},
+++	}
+++};
+++
+++static const country_channel_map_t au_channel_map = {
+++	.country = "AU",
+++	.num_mapped_channels = 23,
+++	.ah_vals = {
+++		/* 1Mhz */
+++		{112, 27, 915.5, 0},
+++		{116, 29, 916.5, 0},
+++		{120, 31, 917.5, 0},
+++		{124, 33, 918.5, 0},
+++		{128, 35, 919.5, 0},
+++		{149, 37, 920.5, 0},
+++		{153, 39, 921.5, 0},
+++		{157, 41, 922.5, 0},
+++		{161, 43, 923.5, 0},
+++		{165, 45, 924.5, 0},
+++		{169, 47, 925.5, 0},
+++		{173, 49, 926.5, 0},
+++		{177, 51, 927.5, 0},
+++		/* 2Mhz */
+++		{118, 30, 917, 1},
+++		{126, 34, 919, 1},
+++		{151, 38, 921, 1},
+++		{159, 42, 923, 1},
+++		{167, 46, 925, 1},
+++		{175, 50, 927, 1},
+++		/* 4 Mhz */
+++		{122, 32, 918, 2},
+++		{155, 40, 922, 2},
+++		{171, 48, 926, 2},
+++		/* 8 Mhz */
+++		{163, 44, 924, 3}
+++	}
+++};
+++
+++static const country_channel_map_t nz_channel_map = {
+++	.country = "NZ",
+++	.num_mapped_channels = 23,
+++	.ah_vals = {
+++		/* 1Mhz */
+++		{112, 27, 915.5, 0},
+++		{116, 29, 916.5, 0},
+++		{120, 31, 917.5, 0},
+++		{124, 33, 918.5, 0},
+++		{128, 35, 919.5, 0},
+++		{149, 37, 920.5, 0},
+++		{153, 39, 921.5, 0},
+++		{157, 41, 922.5, 0},
+++		{161, 43, 923.5, 0},
+++		{165, 45, 924.5, 0},
+++		{169, 47, 925.5, 0},
+++		{173, 49, 926.5, 0},
+++		{177, 51, 927.5, 0},
+++		/* 2Mhz */
+++		{118, 30, 917, 1},
+++		{126, 34, 919, 1},
+++		{151, 38, 921, 1},
+++		{159, 42, 923, 1},
+++		{167, 46, 925, 1},
+++		{175, 50, 927, 1},
+++		/* 4 Mhz */
+++		{122, 32, 918, 2},
+++		{155, 40, 922, 2},
+++		{171, 48, 926, 2},
+++		/* 8 Mhz */
+++		{163, 44, 924, 3}
+++	}
+++};
+++
+++static const country_channel_map_t eu_channel_map = {
+++	.country = "EU",
+++	.num_mapped_channels = 8,
+++	.ah_vals = {
+++		/* 1Mhz */
+++		{132, 1, 863.5, 0},
+++		{136, 3, 864.5, 0},
+++		{36, 5, 865.5, 0},
+++		{40, 7, 866.5, 0},
+++		{44, 9, 867.5, 0},
+++		{120, 31, 916.9, 0},
+++		{124, 33, 917.9, 0},
+++		{128, 35, 918.9, 0},
+++	}
+++};
+++
+++static const country_channel_map_t in_channel_map = {
+++	.country = "IN",
+++	.num_mapped_channels = 3,
+++	.ah_vals = {
+++		/* 1Mhz */
+++		{36, 5, 865.5, 0},
+++		{40, 7, 866.5, 0},
+++		{44, 9, 867.5, 0},
+++	}
+++};
+++
+++static const country_channel_map_t jp_channel_map = {
+++	.country = "JP",
+++	.num_mapped_channels = 11,
+++	.ah_vals = {
+++		/* 1 Mhz */
+++		{36, 13, 923, 0},
+++		{40, 15, 924, 0},
+++		{44, 17, 925, 0},
+++		{48, 19, 926, 0},
+++		{64, 21, 927, 0},
+++		/* 2Mhz */
+++		{38, 2, 923.5, 1},
+++		{46, 6, 925.5, 1},
+++		{54, 4, 924.5, 1},
+++		{62, 8, 926.5, 1},
+++		/* 4Mhz */
+++		{42, 36, 924.5, 2},
+++		{58, 38, 925.5, 2},
+++	}
+++};
+++
+++static const country_channel_map_t kr_channel_map = {
+++	.country = "KR",
+++	.num_mapped_channels = 10,
+++	.ah_vals = {
+++		/* 1 Mhz */
+++		{132, 1, 918, 0},
+++		{136, 3, 919, 0},
+++		{36, 5, 920, 0},
+++		{40, 7, 921, 0},
+++		{44, 9, 922, 0},
+++		{48, 11, 923, 0},
+++		/* 2Mhz */
+++		{134, 2, 918.5, 1},
+++		{38, 6, 920.5, 1},
+++		{46, 10, 922.5, 1},
+++		/* 4Mhz */
+++		{42, 8, 921.5, 2},
+++	}
+++};
+++
+++static const country_channel_map_t sg_channel_map = {
+++	.country = "SG",
+++	.num_mapped_channels = 12,
+++	.ah_vals = {
+++		/* 1 Mhz */
+++		{40, 7, 866.5, 0},
+++		{44, 9, 867.5, 0},
+++		{48, 11, 868.5, 0},
+++		{149, 37, 920.5, 0},
+++		{153, 39, 921.5, 0},
+++		{157, 41, 922.5, 0},
+++		{161, 43, 923.5, 0},
+++		{165, 45, 924.5, 0},
+++		/* 2Mhz */
+++		{46, 10, 868, 1},
+++		{151, 38, 921, 1},
+++		{159, 42, 923, 1},
+++		/* 4Mhz */
+++		{155, 40, 922, 2}
+++	}
+++};
+++
+++static const country_channel_map_t channel_map_terminate = {
+++	.country = {0,0,0},
+++	.num_mapped_channels = 0,
+++	.ah_vals = {}
+++};
+++
+++static const country_channel_map_t *mapped_channel[] = {
+++	&us_channel_map,
+++	&au_channel_map,
+++	&nz_channel_map,
+++	&eu_channel_map,
+++	&in_channel_map,
+++	&jp_channel_map,
+++	&kr_channel_map,
+++	&sg_channel_map,
+++	&channel_map_terminate
+++};
+++
+++#define CHANNEL_MAP_SIZE (sizeof(mapped_channel) / sizeof(*mapped_channel))
+++
+++static void morse_get_country(country_channel_map_t *halow_vals)
+++{
+++	FILE *country_parameter;
+++
+++	country_parameter = fopen("/sys/module/morse/parameters/country", "r");
+++	fscanf(country_parameter, "%2s", halow_vals->country);
+++	fclose(country_parameter);
+++}
+++
+++country_channel_map_t *set_s1g_channel_map(void)
+++{
+++	country_channel_map_t halow_vals;
+++
+++	morse_get_country(&halow_vals);
+++	if (strlen(halow_vals.country) != 0)
+++	{
+++		for (int i = 0; i < CHANNEL_MAP_SIZE; i++)
+++		{
+++			if (!strncmp(halow_vals.country, mapped_channel[i]->country, strlen(mapped_channel[i]->country)))
+++			{
+++				return mapped_channel[i];
+++			}
+++		}
+++	}
+++
+++	return NULL;
+++}
+++
+++
+++channel_to_halow_freq_t *get_s1g(country_channel_map_t *map, int channel)
+++{
+++	if(map == NULL)
+++		return &kNullAhValue;
+++
+++    for(int i=0;i<map->num_mapped_channels;i++)
+++    {
+++        if(map->ah_vals[i].channel==channel)
+++            return &map->ah_vals[i];
+++    }
+++    return &kNullAhValue;
+++}
+++
+++float get_freq(country_channel_map_t *map, int channel)
+++{
+++	if(map == NULL)
+++		return 0;
+++
+++	for(int i=0; i< map->num_mapped_channels; i++)
+++	{
+++		if(map->ah_vals[i].halow_channel==channel)
+++			return map->ah_vals[i].halow_freq;
+++	}
+++
+++	return 0;
+++
+++}
+++
+++int s1g_rate(int fiveG_rate, int frq_mhz)
+++{
+++    int sc_map_5g[][2] = {
+++        {20 , 52},
+++        {40 , 108},
+++        {80 , 234},
+++        {160 , 468}};
+++    int sc_map_s1g[][2] = {
+++        {20 , 24},
+++        {40 , 52},
+++        {80 , 108},
+++        {160 , 234}};
+++
+++    int index=-1;
+++    for (int i = 0; i < sizeof(sc_map_5g) / sizeof(int[2]); i++)
+++    {
+++        if(sc_map_5g[i][0] == frq_mhz)
+++        {
+++            index = i;
+++            break;
+++        }
+++    }
+++    int scale = 20; // for s1g we need to scale the reported shim layer values. if not exist approximate.
+++    if (index != -1)
+++    {
+++        scale = 10 * sc_map_5g[index][1] / sc_map_s1g[index][1];
+++    }
+++    return fiveG_rate / scale;
+++}
+++
+++int s1g_freq2channel(country_channel_map_t *map,int freq)//frq in khz
+++{
+++	if(map == NULL)
+++		return 0;
+++
+++	for(int i=0; i< map->num_mapped_channels; i++)
+++	{
+++		if ((int)(map->ah_vals[i].halow_freq * 1000) == freq)
+++			return map->ah_vals[i].halow_channel;
+++	}
+++
+++	return 0;
+++}
+++
+++int s1g_chan2bw(country_channel_map_t *map,int channel)//bw in MHz
+++{
+++	if(map == NULL)
+++		return 0;
+++
+++	for(int i=0; i< map->num_mapped_channels; i++)
+++	{
+++		if ((map->ah_vals[i].halow_channel) == channel)
+++			return map->ah_vals[i].bw;
+++	}
+++
+++	return 0;
+++}
+++
+++const country_channel_map_t** s1g_mapped_channel()
+++{
+++	return mapped_channel;
+++}
+++
+++void s1g_get_country(char *buf)
+++{
+++	country_channel_map_t halow_vals;
+++	morse_get_country(&halow_vals);
+++	memcpy(buf,halow_vals.country,2);
+++}
+++
+++
+++// returns true if this raw is the selected rate.
+++int mmrc_table_active_raw(const char* line)
+++{
+++    //check if it has MHz and MCS and GI keywords.
+++    if (strstr(line, "MCS") == NULL)
+++        return 0;
+++    if (strstr(line, "MHz") == NULL)
+++        return 0;
+++    if ((strstr(line, "SGI") == NULL) && (strstr(line, "LGI") == NULL))
+++        return 0;
+++    //start search from 17th character.
+++    if (strstr(line+17,"A"))
+++        return 1;
+++return 0;
+++
+++}
+++//returns the avg tp from the selected line.
+++int get_mmrc_table_raw_throughput_avg(const char* line)
+++{
+++    float tp_avg;
+++	sscanf(line + 55, "%f", &tp_avg);
+++	return tp_avg*1000;
+++}
+++
+++int get_mmrc_throughput(const char* phyname)
+++{
+++    FILE *file;
+++    char * line = NULL;
+++    size_t len = 0;
+++    ssize_t read;
+++    char table_path[64];
+++    int rate_kbps=-1;
+++
+++    sprintf (table_path,"/sys/kernel/debug/ieee80211/%s/morse/mmrc_table",phyname);
+++	file = fopen(table_path, "r");
+++    if (file == NULL)
+++    {
+++        return -1;
+++    }
+++
+++    while ((read = getline(&line, &len, file)) != -1) {
+++        if(mmrc_table_active_raw(line))
+++        {
+++            rate_kbps = get_mmrc_table_raw_throughput_avg(line);
+++			break;
+++        }
+++    }
+++	fclose(file);
+++    if (line)
+++        free(line);
+++
+++	if(rate_kbps == 0)
+++		rate_kbps+=1; //to make sure that assoc list doesn't show "unknown" when there's no traffic.
+++    return rate_kbps;
+++}
++\ No newline at end of file
++diff --git a/dot11ah_channel.h b/dot11ah_channel.h
++new file mode 100644
++index 0000000..676906d
++--- /dev/null
+++++ b/dot11ah_channel.h
++@@ -0,0 +1,105 @@
+++/*
+++ * Copyright 2022 Morse Micro
+++ *
+++ * The iwinfo library is free software: you can redistribute it and/or
+++ * modify it under the terms of the GNU General Public License version 2
+++ * as published by the Free Software Foundation.
+++ *
+++ * The iwinfo library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+++ * See the GNU General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU General Public License along
+++ * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
+++*/
+++
+++#ifndef __DOT11AH_CHANNELS__
+++#define __DOT11AH_CHANNELS__
+++
+++typedef struct {
+++	/*5G channel*/
+++	int channel;
+++	/*80211ah channel*/
+++	int halow_channel;
+++	/*80211ah freq*/
+++	float halow_freq;
+++	/*80211ah bandwidth*/
+++	int bw;
+++} channel_to_halow_freq_t;
+++
+++typedef struct {
+++	char country[3];
+++	int num_mapped_channels;
+++	channel_to_halow_freq_t ah_vals[];
+++} country_channel_map_t;
+++
+++
+++/**
+++ * @brief gets the channel 5g to s1g channel map for a given region.
+++ *        country setting is read from /sys/module/morse/parameters/country
+++ */
+++country_channel_map_t *set_s1g_channel_map(void);
+++
+++
+++/**
+++ * retrieves the map entry for a given 5g channel
+++ * @param map a map of 5g to s1g channels retrieved by set_s1g_channel_map
+++ * @param channel a 5g channel value
+++ * @return The entry in the map corresponding to the given 5g channel and configured region
+++ */
+++channel_to_halow_freq_t *get_s1g(country_channel_map_t *map, int channel);
+++
+++/**
+++ * retrieves the s1g frequency for a given s1g channel
+++ * @param map a map of 5g to s1g channels retrieved by set_s1g_channel_map
+++ * @param channel an s1g channel value
+++ * @return a floating point value corresponding to the s1g frequency, in mhz, for the given channel.
+++ */
+++float get_freq(country_channel_map_t *map, int channel);
+++
+++/**
+++ * a conversion helper for calculating the correct s1g mcs data rate for a given bandwidth and existing 5g mcs rate
+++ * @param fiveG_rate a 5g mcs data rate value
+++ * @param frq_mhz the 5g bandwidth corresponding to the 5g rate
+++ * @return the s1g mcs data rate
+++ */
+++int s1g_rate(int fiveG_rate, int frq_mhz);
+++
+++/**
+++ * converts s1g frequency to s1g channel
+++ * @param map a map of 5g to s1g channels retrieved by set_s1g_channel_map
+++ * @param freq s1g frequency in KHz
+++ * @return s1g channel
+++ */
+++int s1g_freq2channel(country_channel_map_t *map,int freq);
+++
+++/**
+++ * converts s1g channel to s1g bandwidth
+++ * @param map a map of 5g to s1g channels retrieved by set_s1g_channel_map
+++ * @param channel s1g channel
+++ * @return s1g channel
+++ */
+++int s1g_chan2bw(country_channel_map_t *map,int channel);
+++
+++/**
+++ * gives a pointer to the country separated channels map
+++ * @return a pointer to the country separated channels map.
+++ */
+++const country_channel_map_t** s1g_mapped_channel();
+++
+++
+++/**
+++ * returns the currently set country.
+++ * @param buf a pointer to the result buffer.
+++ */
+++void s1g_get_country(char *buf);
+++
+++/**
+++ * gets mmrc average throughput from the mmrc_table.
+++ * @param phyname phyname of the halow device.
+++ * @return average throughput in kbps
+++ */
+++int get_mmrc_throughput(const char* phyname);
+++
+++#endif /* __DOT11AH_CHANNELS__ */
++diff --git a/include/iwinfo.h b/include/iwinfo.h
++index b50de69..0a9f157 100644
++--- a/include/iwinfo.h
+++++ b/include/iwinfo.h
++@@ -31,6 +31,7 @@ enum iwinfo_80211 {
++ 	IWINFO_80211_AC,
++ 	IWINFO_80211_AD,
++ 	IWINFO_80211_AX,
+++	IWINFO_80211_AH,
++ 
++ 	/* keep last */
++ 	IWINFO_80211_COUNT
++@@ -43,6 +44,9 @@ enum iwinfo_80211 {
++ #define IWINFO_80211_AC      (1 << IWINFO_80211_AC)
++ #define IWINFO_80211_AD      (1 << IWINFO_80211_AD)
++ #define IWINFO_80211_AX      (1 << IWINFO_80211_AX)
+++#define IWINFO_80211_AH		 (1 << IWINFO_80211_AH)
+++
+++#define S1G_CHAN_WIDTH_OFFSET		(2)
++ 
++ extern const char * const IWINFO_80211_NAMES[IWINFO_80211_COUNT];
++ 
++@@ -52,7 +56,7 @@ enum iwinfo_band {
++ 	IWINFO_BAND_5,
++ 	IWINFO_BAND_6,
++ 	IWINFO_BAND_60,
++-
+++	IWINFO_BAND_900,
++ 	/* keep last */
++ 	IWINFO_BAND_COUNT
++ };
++@@ -61,6 +65,7 @@ enum iwinfo_band {
++ #define IWINFO_BAND_5        (1 << IWINFO_BAND_5)
++ #define IWINFO_BAND_6        (1 << IWINFO_BAND_6)
++ #define IWINFO_BAND_60       (1 << IWINFO_BAND_60)
+++#define IWINFO_BAND_900      (1 << IWINFO_BAND_900)
++ 
++ extern const char * const IWINFO_BAND_NAMES[IWINFO_BAND_COUNT];
++ 
++@@ -290,6 +295,15 @@ struct iwinfo_crypto_entry {
++ 	uint16_t pair_ciphers;
++ 	uint8_t auth_suites;
++ 	uint8_t auth_algs;
+++	
+++	/* RSNXE data */
+++	uint8_t prot_twt:1;
+++	uint8_t sae_h2e:1;
+++	uint8_t sae_pk:1;
+++	uint8_t secure_ltf:1;
+++	uint8_t secure_rtt:1;
+++	uint8_t prot_range_neg:1;
+++	uint8_t pad0:2;
++ };
++ 
++ struct iwinfo_scanlist_ht_chan_entry {
++@@ -304,6 +318,19 @@ struct iwinfo_scanlist_vht_chan_entry {
++ 	uint8_t center_chan_2;
++ };
++ 
+++struct iwinfo_scanlist_ah_chan_entry {
+++	uint8_t primary_chan;
+++	uint8_t chan_width;
+++};
+++
+++static uint16_t ah_chan_width[] = {
+++	1,  /* 1 MHz*/
+++	2,  /* 2 MHz*/
+++	4,  /* 4 MHz*/
+++	8,  /* 8 MHz*/
+++	16, /* 16 MHz*/
+++};
+++
++ extern const char * const ht_secondary_offset[4];
++ /* 0 = 20 MHz
++    1 = 40 MHz or higher (refer to vht if supported) */
++@@ -327,6 +354,7 @@ struct iwinfo_scanlist_entry {
++ 	struct iwinfo_crypto_entry crypto;
++ 	struct iwinfo_scanlist_ht_chan_entry ht_chan_info;
++ 	struct iwinfo_scanlist_vht_chan_entry vht_chan_info;
+++	struct iwinfo_scanlist_ah_chan_entry ah_chan_info;
++ };
++ 
++ struct iwinfo_country_entry {
++@@ -412,6 +440,7 @@ extern const struct iwinfo_ops wext_ops;
++ extern const struct iwinfo_ops madwifi_ops;
++ extern const struct iwinfo_ops nl80211_ops;
++ extern const struct iwinfo_ops wl_ops;
+++extern const struct iwinfo_ops dot11ah_ops;
++ 
++ #include "iwinfo/utils.h"
++ 
++diff --git a/include/iwinfo/utils.h b/include/iwinfo/utils.h
++index 7b8ceea..d2a2788 100644
++--- a/include/iwinfo/utils.h
+++++ b/include/iwinfo/utils.h
++@@ -66,6 +66,7 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id);
++ 
++ void iwinfo_parse_rsn(struct iwinfo_crypto_entry *c, uint8_t *data, uint8_t len,
++ 					  uint16_t defcipher, uint8_t defauth);
+++void iwinfo_parse_rsnxe(struct iwinfo_crypto_entry *c, uint8_t *data, uint8_t len);
++ 
++ struct uci_section *iwinfo_uci_get_radio(const char *name, const char *type);
++ void iwinfo_uci_free(void);
++diff --git a/iwinfo_cli.c b/iwinfo_cli.c
++index 5dcee9a..790803c 100644
++--- a/iwinfo_cli.c
+++++ b/iwinfo_cli.c
++@@ -69,12 +69,12 @@ static char * format_channel(int ch)
++ 
++ static char * format_frequency(int freq)
++ {
++-	static char buf[11];
+++	static char buf[15];
++ 
++ 	if (freq <= 0)
++ 		snprintf(buf, sizeof(buf), "unknown");
++ 	else
++-		snprintf(buf, sizeof(buf), "%.3f GHz", ((float)freq / 1000.0));
+++		snprintf(buf, sizeof(buf), "%.3f %s", ((float)freq / 1000.0), freq > 500000 ? "MHz" : "GHz");
++ 
++ 	return buf;
++ }
++@@ -351,6 +351,19 @@ static const char* format_chan_width(bool vht, uint8_t width)
++ 	return "unknown";
++ }
++ 
+++static const char* format_ah_chan_width(uint8_t width)
+++{
+++	if (width < ARRAY_SIZE(ah_chan_width))
+++		switch (ah_chan_width[width]) {
+++			case 1: return "1 MHz";
+++			case 2: return "2 MHz";
+++			case 4: return "4 MHz";
+++			case 8: return "8 MHz";
+++			case 16: return "16 MHz";
+++		}
+++
+++	return "unknown";
+++}
++ 
++ static const char * print_type(const struct iwinfo_ops *iw, const char *ifname)
++ {
++@@ -689,13 +702,16 @@ static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
++ 			format_quality_max(e->quality_max));
++ 		printf("          Encryption: %s\n",
++ 			format_encryption(&e->crypto));
++-		printf("          HT Operation:\n");
++-		printf("                    Primary Channel: %d\n",
++-			e->ht_chan_info.primary_chan);
++-		printf("                    Secondary Channel Offset: %s\n",
++-			ht_secondary_offset[e->ht_chan_info.secondary_chan_off]);
++-		printf("                    Channel Width: %s\n",
++-			format_chan_width(false, e->ht_chan_info.chan_width));
+++		
+++		if (e->ht_chan_info.primary_chan) {
+++			printf("          HT Operation:\n");
+++			printf("                    Primary Channel: %d\n",
+++				e->ht_chan_info.primary_chan);
+++			printf("                    Secondary Channel Offset: %s\n",
+++				ht_secondary_offset[e->ht_chan_info.secondary_chan_off]);
+++			printf("                    Channel Width: %s\n",
+++				format_chan_width(false, e->ht_chan_info.chan_width));
+++		}
++ 
++ 		if (e->vht_chan_info.center_chan_1) {
++ 			printf("          VHT Operation:\n");
++@@ -707,6 +723,14 @@ static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
++ 				format_chan_width(true, e->vht_chan_info.chan_width));
++ 		}
++ 
+++		if (e->ah_chan_info.primary_chan) {
+++			printf("          AH Operation:\n");
+++			printf("                    Channel Width: %s\n",
+++				format_ah_chan_width(e->ah_chan_info.chan_width));
+++			printf("                    Primary Channel: %d\n",
+++				 e->ah_chan_info.primary_chan);
+++		}
+++
++ 		printf("\n");
++ 	}
++ }
++@@ -912,7 +936,7 @@ int main(int argc, char **argv)
++ 	char *p;
++ 	const struct iwinfo_ops *iw;
++ 	glob_t globbuf;
++-
+++	
++ 	if (argc > 1 && argc < 3)
++ 	{
++ 		fprintf(stderr,
++@@ -1031,7 +1055,6 @@ int main(int argc, char **argv)
++ 			}
++ 		}
++ 	}
++-
++ 	iwinfo_finish();
++ 
++ 	return rv;
++diff --git a/iwinfo_lib.c b/iwinfo_lib.c
++index 579efc4..02fbd9c 100644
++--- a/iwinfo_lib.c
+++++ b/iwinfo_lib.c
++@@ -30,6 +30,7 @@ const char * const IWINFO_80211_NAMES[IWINFO_80211_COUNT] = {
++ 	"ac",
++ 	"ad",
++ 	"ax",
+++	"ah",
++ };
++ 
++ const char * const IWINFO_BAND_NAMES[IWINFO_BAND_COUNT] = {
++@@ -37,6 +38,7 @@ const char * const IWINFO_BAND_NAMES[IWINFO_BAND_COUNT] = {
++ 	"5 GHz",
++ 	"6 GHz",
++ 	"60 GHz",
+++	"900 MHz",
++ };
++ 
++ const char * const IWINFO_CIPHER_NAMES[IWINFO_CIPHER_COUNT] = {
++@@ -383,6 +385,7 @@ const struct iwinfo_iso3166_label IWINFO_ISO3166_NAMES[] = {
++ 
++ static const struct iwinfo_ops *backends[] = {
++ #ifdef USE_NL80211
+++	&dot11ah_ops,
++ 	&nl80211_ops,
++ #endif
++ #ifdef USE_MADWIFI
++diff --git a/iwinfo_lua.c b/iwinfo_lua.c
++index ecf257d..9def386 100644
++--- a/iwinfo_lua.c
+++++ b/iwinfo_lua.c
++@@ -554,6 +554,9 @@ static int iwinfo_L_hwmodelist(lua_State *L, int (*func)(const char *, int *))
++ 		lua_pushboolean(L, hwmodes & IWINFO_80211_AX);
++ 		lua_setfield(L, -2, "ax");
++ 
+++		lua_pushboolean(L, hwmodes & IWINFO_80211_AH);
+++		lua_setfield(L, -2, "ah");
+++
++ 		return 1;
++ 	}
++ 
++diff --git a/iwinfo_morsecli.c b/iwinfo_morsecli.c
++new file mode 100644
++index 0000000..7156bd8
++--- /dev/null
+++++ b/iwinfo_morsecli.c
++@@ -0,0 +1,122 @@
+++/*
+++ * iwinfo - Wireless Information Library - morsecli interface
+++ *
+++ *   Copyright (C) 2023 Morse Micro
+++ *
+++ * The iwinfo library is free software: you can redistribute it and/or
+++ * modify it under the terms of the GNU General Public License version 2
+++ * as published by the Free Software Foundation.
+++ *
+++ * The iwinfo library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+++ * See the GNU General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU General Public License along
+++ * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
+++ */
+++
+++#include <stdarg.h>
+++#include <stdlib.h>
+++#include <stdio.h>
+++#include <string.h>
+++#include <unistd.h>
+++
+++
+++/* popen using exec (rather than like system()).
+++ *
+++ * Since I have an irrational dislike of using /bin/sh unnecessarily,
+++ * and we're potentially calling this quite a lot :(
+++ */
+++static FILE *execvp_popen_read(const char *file, const char *const argv[]) 
+++{
+++	int pipefd[2];
+++
+++	if (pipe(pipefd)) return NULL;
+++
+++	switch (fork())
+++	{
+++	case 0: /* child */
+++		close(pipefd[0]);
+++		dup2(pipefd[1], STDOUT_FILENO);
+++		freopen("/dev/null", "w", stderr);  /* throw away stderr, to avoid noise in output */
+++		execvp(file, (char * const*)argv);
+++		exit(1);
+++		break;
+++	default: /* parent */
+++		close(pipefd[1]);
+++		return fdopen(pipefd[0], "r");
+++	case -1:
+++		close(pipefd[1]);
+++		return NULL;
+++	}
+++}
+++
+++/* Query particular stats from morse_cli.
+++ *
+++ * Style of function echos nl80211_hostapd_query.
+++ *
+++ * This is the YAGNI version of this, since hopefully
+++ * it will be replaced by netlink queries in time.
+++ *
+++ * I don't use morse_cli's filter, since it's hard to construct
+++ * a regex covering all the possible options (and filter
+++ * doesn't do anything smart and still queries all the stats,
+++ * so we may as well not use the regex engine at all).
+++ *
+++ * Notably:
+++ *  - uses the plain text output rather than JSON
+++ *    (which means it can't handle nested stats)
+++ *  - only handles integer stats
+++ */
+++int __morse_cli_stats_query(const char *ifname, ...)
+++{
+++	va_list ap, ap_cur;
+++	int *dest;
+++	char *search, *key, *val, buf[128];
+++	int found = 0;
+++	FILE *fp;
+++	/* For now, the only stat we want is noise,
+++	 * so restrict to PHY core.
+++	 */
+++	const char *const argv[] = {"morse_cli", "-i", ifname, "stats", "-u", NULL};
+++
+++	fp = execvp_popen_read("morse_cli", argv);
+++
+++	if (!fp)
+++		return 0;
+++
+++	va_start(ap, ifname);
+++
+++	/* iterate applicable lines and copy found values into dest buffers */
+++	while (fgets(buf, sizeof(buf), fp))
+++	{
+++		key = strtok(buf, ":\n");
+++		val = strtok(NULL, "\n");
+++
+++		if (!key || !val || !*key)
+++			continue;
+++
+++		va_copy(ap_cur, ap);
+++
+++		while ((search = va_arg(ap_cur, char *)) != NULL)
+++		{
+++			dest = va_arg(ap_cur, int *);
+++
+++			if (!strcmp(search, key))
+++			{
+++				*dest = atoi(val);
+++				found++;
+++				break;
+++			}
+++		}
+++
+++		va_end(ap_cur);
+++	}
+++
+++	va_end(ap);
+++
+++	fclose(fp);
+++
+++	return found;
+++}
++\ No newline at end of file
++diff --git a/iwinfo_morsecli.h b/iwinfo_morsecli.h
++new file mode 100644
++index 0000000..320f433
++--- /dev/null
+++++ b/iwinfo_morsecli.h
++@@ -0,0 +1,27 @@
+++/*
+++ * iwinfo - Wireless Information Library - morsecli headers
+++ *
+++ *   Copyright (C) 2023 Morse Micro
+++ *
+++ * The iwinfo library is free software: you can redistribute it and/or
+++ * modify it under the terms of the GNU General Public License version 2
+++ * as published by the Free Software Foundation.
+++ *
+++ * The iwinfo library is distributed in the hope that it will be useful,
+++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+++ * See the GNU General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU General Public License along
+++ * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
+++ */
+++
+++#ifndef __IWINFO_MORSECLI_H_
+++#define __IWINFO_MORSECLI_H_
+++
+++#define morse_cli_stats_query(ifname, ...) \
+++	__morse_cli_stats_query(ifname, ##__VA_ARGS__, NULL)
+++
+++int __morse_cli_stats_query(const char *ifname, ...);
+++
+++#endif
++\ No newline at end of file
++diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
++index 2200249..dcb29b3 100644
++--- a/iwinfo_nl80211.c
+++++ b/iwinfo_nl80211.c
++@@ -2,6 +2,7 @@
++  * iwinfo - Wireless Information Library - NL80211 Backend
++  *
++  *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+++ *   Copyright 2022 Morse Micro
++  *
++  * The iwinfo library is free software: you can redistribute it and/or
++  * modify it under the terms of the GNU General Public License version 2
++@@ -30,6 +31,7 @@
++ #include <stdlib.h>
++ 
++ #include "iwinfo_nl80211.h"
+++#include "iwinfo_morsecli.h"
++ 
++ #define min(x, y) ((x) < (y)) ? (x) : (y)
++ 
++@@ -408,8 +410,11 @@ static int nl80211_phy_idx_from_uci(const char *name)
++ 	int idx = -1;
++ 
++ 	s = iwinfo_uci_get_radio(name, "mac80211");
++-	if (!s)
++-		goto out;
+++	if (!s){
+++		s = iwinfo_uci_get_radio(name, "morse");
+++		if(!s)
+++			goto out;
+++	}
++ 
++ 	opt = uci_lookup_option_string(uci_ctx, s, "path");
++ 	idx = nl80211_phy_idx_from_path(opt);
++@@ -1331,15 +1336,16 @@ static int nl80211_get_bssid(const char *ifname, char *buf)
++ 
++ 	res = nl80211_phy2ifname(ifname);
++ 
++-	/* try to obtain mac address via NL80211_CMD_GET_INTERFACE */
++-	nl80211_request(res ? res : ifname, NL80211_CMD_GET_INTERFACE, 0,
++-	                nl80211_get_macaddr_cb, &sb);
+++	/* try to find bssid from scan dump results (for AP, this fails
+++	 * and it goes to NL80211_CMD_GET_INTERFACE)*/
+++	nl80211_request(res ? res : ifname,
+++					NL80211_CMD_GET_SCAN, NLM_F_DUMP,
+++					nl80211_get_ssid_bssid_cb, &sb);
++ 
++-	/* failed, try to find bssid from scan dump results */
+++	/* failed,  try to obtain mac address via NL80211_CMD_GET_INTERFACE */
++ 	if (sb.bssid[0] == 0)
++-		nl80211_request(res ? res : ifname,
++-		                NL80211_CMD_GET_SCAN, NLM_F_DUMP,
++-		                nl80211_get_ssid_bssid_cb, &sb);
+++		nl80211_request(res ? res : ifname, NL80211_CMD_GET_INTERFACE, 0,
+++						nl80211_get_macaddr_cb, &sb);
++ 
++ 	/* failed, try to find mac from hostapd info */
++ 	if ((sb.bssid[0] == 0) &&
++@@ -1771,7 +1777,8 @@ static const struct {
++ 	{ "EAP-SUITE-B-192", 4, IWINFO_KMGMT_8021x },
++ 	{ "EAP-SUITE-B",     4, IWINFO_KMGMT_8021x },
++ 	{ "EAP-SHA384",      4, IWINFO_KMGMT_8021x },
++-	{ "EAP-SHA256",      0, IWINFO_KMGMT_8021x },
+++	/* SHA256 counts as WPA3 as long as pmf is enabled; we check this below. */
+++	{ "EAP-SHA256",      4, IWINFO_KMGMT_8021x },
++ 	{ "PSK-SHA256",      0, IWINFO_KMGMT_PSK },
++ 	{ "NONE",            0, IWINFO_KMGMT_NONE },
++ 	{ "None",            0, IWINFO_KMGMT_NONE },
++@@ -1782,7 +1789,7 @@ static const struct {
++ };
++ 
++ static void parse_wpa_suites(const char *str, int defversion,
++-                             uint8_t *versions, uint8_t *suites)
+++                             uint8_t *versions, uint8_t *suites, int pmf)
++ {
++ 	size_t l;
++ 	int i, version;
++@@ -1817,6 +1824,35 @@ static void parse_wpa_suites(const char *str, int defversion,
++ 
++ 		p = q + strspn(q, sep);
++ 	}
+++
+++	/* Handle ieee80211w/pmf (management frame protection).
+++	 *
+++	 * Strictly:
+++	 *  ieee80211w=2 && wpa_key_mgmt=WPA-EAP-SHA256
+++	 *    => WPA3-Enterprise
+++	 *  ieee80211w=1 && wpa_key_mgmt=WPA-EAP WPA-EAP-SHA256
+++	 *    => WPA3-Enterprise transition
+++	 *
+++	 * Here we just try to aggressively downgrade (i.e. if no pmf,
+++	 * not WPA3-Enterprise, and if not required then WPA2/WPA3).
+++	 * This _will_ allow some invalid configurations through
+++	 * and count certain undefined configurations as WPA2/WPA3
+++	 * (e.g. WPA-EAP-SHA256 only and ieee80211=1).
+++	 */
+++	if ((*suites & IWINFO_KMGMT_8021x) && (*versions & 4))
+++		switch(pmf)
+++		{
+++		case 0: /* if disabled, it's not WPA3 */
+++			*versions &= ~4;
+++			*versions |= defversion;
+++			break;
+++		case 1: /* if not required, not only WPA3 */
+++			*versions |= defversion;
+++			break;
+++		case 2: /* pmf required */
+++		default: /* if no pmf info - e.g. from scan */
+++			break;
+++		}
++ }
++ 
++ static const struct {
++@@ -1871,6 +1907,7 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
++ 	uint8_t wpa_version = 0;
++ 	char wpa[2], wpa_key_mgmt[64], wpa_pairwise[16], wpa_groupwise[16];
++ 	char auth_algs[2], wep_key0[27], wep_key1[27], wep_key2[27], wep_key3[27];
+++	char ieee80211w[2], pmf[2];
++ 	char mode[16];
++ 
++ 	struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
++@@ -1880,6 +1917,7 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
++ 			"pairwise_cipher", wpa_pairwise,  sizeof(wpa_pairwise),
++ 			"group_cipher",    wpa_groupwise, sizeof(wpa_groupwise),
++ 			"key_mgmt",        wpa_key_mgmt,  sizeof(wpa_key_mgmt),
+++			"pmf",             pmf,           sizeof(pmf),
++ 			"mode",            mode,          sizeof(mode)))
++ 	{
++ 		/* WEP or Open */
++@@ -1928,7 +1966,7 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
++ 				wpa_version = 1;
++ 			}
++ 
++-			parse_wpa_suites(p, wpa_version, &c->wpa_version, &c->auth_suites);
+++			parse_wpa_suites(p, wpa_version, &c->wpa_version, &c->auth_suites, atoi(pmf));
++ 
++ 			c->enabled = !!(c->wpa_version && c->auth_suites);
++ 		}
++@@ -1941,6 +1979,7 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
++ 				"wpa",          wpa,          sizeof(wpa),
++ 				"wpa_key_mgmt", wpa_key_mgmt, sizeof(wpa_key_mgmt),
++ 				"wpa_pairwise", wpa_pairwise, sizeof(wpa_pairwise),
+++				"ieee80211w",   ieee80211w,   sizeof(ieee80211w),
++ 				"auth_algs",    auth_algs,    sizeof(auth_algs),
++ 				"wep_key0",     wep_key0,     sizeof(wep_key0),
++ 				"wep_key1",     wep_key1,     sizeof(wep_key1),
++@@ -1959,7 +1998,7 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
++ 				if (!strncmp(p, "FT-", 3))
++ 					p += 3;
++ 
++-				parse_wpa_suites(p, atoi(wpa), &c->wpa_version, &c->auth_suites);
+++				parse_wpa_suites(p, atoi(wpa), &c->wpa_version, &c->auth_suites, atoi(ieee80211w));
++ 			}
++ 
++ 			c->enabled = c->wpa_version ? 1 : 0;
++@@ -2531,7 +2570,7 @@ static void nl80211_get_scancrypto(char *spec, struct iwinfo_crypto_entry *c)
++ 
++ 		c->enabled = 1;
++ 
++-		parse_wpa_suites(suites, wpa_version, &c->wpa_version, &c->auth_suites);
+++		parse_wpa_suites(suites, wpa_version, &c->wpa_version, &c->auth_suites, -1);
++ 		parse_wpa_ciphers(suites, &c->pair_ciphers);
++ 	}
++ }
++@@ -2588,6 +2627,9 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss,
++ 				e->vht_chan_info.center_chan_2 = ie[4];
++ 			}
++ 			break;
+++		case 244: /* RSNXE */
+++			iwinfo_parse_rsnxe(&e->crypto, ie + 2, ie[1]);
+++			break;
++ 		}
++ 
++ 		ielen -= ie[1] + 2;
++@@ -3634,7 +3676,7 @@ const struct iwinfo_ops nl80211_ops = {
++ 	.mbssid_support   = nl80211_get_mbssid_support,
++ 	.hwmodelist       = nl80211_get_hwmodelist,
++ 	.htmodelist       = nl80211_get_htmodelist,
++-	.htmode		  = nl80211_get_htmode,
+++	.htmode           = nl80211_get_htmode,
++ 	.mode             = nl80211_get_mode,
++ 	.ssid             = nl80211_get_ssid,
++ 	.bssid            = nl80211_get_bssid,
++@@ -3653,3 +3695,723 @@ const struct iwinfo_ops nl80211_ops = {
++ 	.phy_path         = nl80211_phy_path,
++ 	.close            = nl80211_close
++ };
+++
+++
+++/*
+++ * Morse Micro Shim Layer
+++ *
+++ */
+++
+++#include "dot11ah_channel.h"
+++
+++country_channel_map_t *g_map = NULL;
+++
+++static bool nl80211_is_halow(const char *ifname)
+++{
+++	const struct iwinfo_hardware_entry *e = nl80211_get_hardware_entry(ifname);
+++	if (!e)
+++		return false;
+++
+++	if (strcmp(e->device_name, "HaLow WiFi"))
+++		return false;
+++
+++	return true;
+++}
+++
+++static inline void _sanitise_rate_entry(struct iwinfo_rate_entry *re){
+++	if(re == NULL)
+++		return;
+++	re->rate = s1g_rate(re->rate, re->mhz);
+++	re->mhz /= 20;
+++	re->is_vht = 0;
+++	re->is_ht = 1;
+++}
+++
+++
+++/*
+++ * These fill_signal handlers need to be modified for s1g as they work per station.
+++ *  And it's more correct to handle the per station values in the per station handler
+++ */
+++
+++static uint8_t nl80211_get_bandwidth(struct nlattr **ri, uint32_t size){
+++	if ((NL80211_RATE_INFO_5_MHZ_WIDTH < size)
+++		 && (ri[NL80211_RATE_INFO_5_MHZ_WIDTH]))
+++		return 5;
+++	else if ((NL80211_RATE_INFO_5_MHZ_WIDTH < size)
+++		 && (ri[NL80211_RATE_INFO_10_MHZ_WIDTH]))
+++		return 10;
+++	else if ((NL80211_RATE_INFO_5_MHZ_WIDTH < size)
+++		 && (ri[NL80211_RATE_INFO_40_MHZ_WIDTH]))
+++		return 40;
+++	else if ((NL80211_RATE_INFO_5_MHZ_WIDTH < size)
+++		 && (ri[NL80211_RATE_INFO_80_MHZ_WIDTH]))
+++		return 80;
+++	else if ((NL80211_RATE_INFO_5_MHZ_WIDTH < size)
+++		 && (ri[NL80211_RATE_INFO_80P80_MHZ_WIDTH] ||
+++	         ri[NL80211_RATE_INFO_160_MHZ_WIDTH]))
+++		return 160;
+++	else
+++		return 20;
+++}
+++
+++static int dot11ah_fill_signal_cb(struct nl_msg *msg, void *arg)
+++{
+++	int8_t dbm;
+++	int16_t mbit;
+++	struct nl80211_rssi_rate *rr = arg;
+++	struct nlattr **attr = nl80211_parse(msg);
+++	struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1];
+++	struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1];
+++
+++	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
+++		[NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32    },
+++		[NL80211_STA_INFO_RX_BYTES]      = { .type = NLA_U32    },
+++		[NL80211_STA_INFO_TX_BYTES]      = { .type = NLA_U32    },
+++		[NL80211_STA_INFO_RX_PACKETS]    = { .type = NLA_U32    },
+++		[NL80211_STA_INFO_TX_PACKETS]    = { .type = NLA_U32    },
+++		[NL80211_STA_INFO_SIGNAL]        = { .type = NLA_U8     },
+++		[NL80211_STA_INFO_TX_BITRATE]    = { .type = NLA_NESTED },
+++		[NL80211_STA_INFO_LLID]          = { .type = NLA_U16    },
+++		[NL80211_STA_INFO_PLID]          = { .type = NLA_U16    },
+++		[NL80211_STA_INFO_PLINK_STATE]   = { .type = NLA_U8     },
+++	};
+++
+++	static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
+++		[NL80211_RATE_INFO_BITRATE]      = { .type = NLA_U16  },
+++		[NL80211_RATE_INFO_MCS]          = { .type = NLA_U8   },
+++		[NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
+++		[NL80211_RATE_INFO_SHORT_GI]     = { .type = NLA_FLAG },
+++	};
+++
+++	if (attr[NL80211_ATTR_STA_INFO])
+++	{
+++		if (!nla_parse_nested(sinfo, NL80211_STA_INFO_MAX,
+++		                      attr[NL80211_ATTR_STA_INFO], stats_policy))
+++		{
+++			if (sinfo[NL80211_STA_INFO_SIGNAL])
+++			{
+++				dbm = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]);
+++				rr->rssi = (rr->rssi * rr->rssi_samples + dbm) / (rr->rssi_samples + 1);
+++				rr->rssi_samples++;
+++			}
+++
+++			if (sinfo[NL80211_STA_INFO_TX_BITRATE])
+++			{
+++				if (!nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX,
+++				                      sinfo[NL80211_STA_INFO_TX_BITRATE],
+++				                      rate_policy))
+++				{
+++					if (rinfo[NL80211_RATE_INFO_BITRATE])
+++					{
+++						uint8_t mhz = nl80211_get_bandwidth(rinfo, NL80211_RATE_INFO_MAX);
+++						mbit = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
+++						mbit = s1g_rate(mbit, mhz);
+++						rr->rate = (rr->rate * rr->rate_samples + mbit) / (rr->rate_samples + 1);
+++						rr->rate_samples++;
+++					}
+++				}
+++			}
+++		}
+++	}
+++
+++	return NL_SKIP;
+++}
+++
+++static void dot11ah_fill_signal(const char *ifname, struct nl80211_rssi_rate *r)
+++{
+++	DIR *d;
+++	struct dirent *de;
+++
+++	memset(r, 0, sizeof(*r));
+++
+++	if ((d = opendir("/sys/class/net")) != NULL)
+++	{
+++		while ((de = readdir(d)) != NULL)
+++		{
+++			if (!strncmp(de->d_name, ifname, strlen(ifname)) &&
+++			    (!de->d_name[strlen(ifname)] ||
+++			     !strncmp(&de->d_name[strlen(ifname)], ".sta", 4)))
+++			{
+++				nl80211_request(de->d_name, NL80211_CMD_GET_STATION,
+++				                NLM_F_DUMP, dot11ah_fill_signal_cb, r);
+++			}
+++		}
+++
+++		closedir(d);
+++	}
+++}
+++
+++static int dot11ah_probe(const char *ifname)
+++{
+++	if (!nl80211_ifname2phy(ifname))
+++		return 0;
+++
+++	if (!nl80211_is_halow(ifname))
+++		return 0;
+++
+++	g_map = set_s1g_channel_map();
+++	return 1;
+++}
+++
+++static int dot11ah_get_center_chan2(const char *ifname, int *buf)
+++{
+++    if(nl80211_get_center_chan2(ifname, buf) < 0)
+++        return -1;
+++
+++    channel_to_halow_freq_t *ch_entry = get_s1g(g_map, *buf);
+++    if(ch_entry == NULL)
+++        return -1;
+++
+++    *buf = ch_entry->halow_channel;
+++
+++    return 0;
+++}
+++
+++static int dot11ah_get_center_chan1(const char *ifname, int *buf)
+++{
+++    if(nl80211_get_center_chan1(ifname, buf) < 0)
+++        return -1;
+++
+++    channel_to_halow_freq_t *ch_entry = get_s1g(g_map, *buf);
+++    if(ch_entry == NULL)
+++        return -1;
+++
+++    *buf = ch_entry->halow_channel;
+++
+++    return 0;
+++
+++}
+++
+++static int dot11ah_get_channel(const char *ifname, int *buf)
+++{
+++	if(dot11ah_get_center_chan1(ifname, buf) == 0)
+++		return 0;
+++
+++	if(nl80211_get_channel(ifname, buf) < 0)
+++		return -1;
+++
+++	channel_to_halow_freq_t *ch_entry = get_s1g(g_map, *buf);
+++	if(ch_entry == NULL)
+++		return -1;
+++
+++	*buf = ch_entry->halow_channel;
+++
+++	return 0;
+++
+++}
+++
+++static int dot11ah_get_frequency(const char *ifname, int *buf)
+++{
+++	*buf = 0;
+++
+++	if (dot11ah_get_center_chan1(ifname, buf) < 0)
+++		if (dot11ah_get_channel(ifname, buf) < 0)
+++			return -1;
+++
+++	*buf = (int) (get_freq(g_map, *buf)*1000);
+++
+++	return (*buf == 0) ? -1 : 0;
+++}
+++
+++static int dot11ah_get_bitrate(const char *ifname, int *buf)
+++{
+++    struct nl80211_rssi_rate rr;
+++
+++	dot11ah_fill_signal(ifname, &rr);
+++
+++	if (rr.rate_samples)
+++	{
+++		*buf = (rr.rate * 100);
+++		return 0;
+++	}
+++
+++	return -1;
+++}
+++
+++static int dot11ah_get_hwmodelist(const char *ifname, int *buf)
+++{
+++	*buf = IWINFO_80211_AH;
+++	return 0;
+++}
+++
+++static int dot11ah_get_htmodelist(const char *ifname, int *buf)
+++{
+++	*buf = IWINFO_HTMODE_NOHT;
+++	return 0;
+++}
+++
+++static int dot11ah_get_htmode(const char *ifname, int *buf)
+++{
+++	int chan;
+++	dot11ah_get_channel(ifname, &chan);
+++	if(!g_map || !chan)
+++		return 0;
+++	*buf = s1g_chan2bw(g_map, chan);
+++	return 0;
+++}
+++
+++static int dot11ah_get_country(const char *ifname, char *buf)
+++{
+++	s1g_get_country(buf);
+++	return 0;
+++}
+++
+++static int dot11ah_get_noise(const char *ifname, int *buf)
+++{
+++	if (!morse_cli_stats_query(ifname, "Noise dBm", buf))
+++		return -1;
+++	else
+++		return 0;
+++}
+++
+++static int dot11ah_get_assoclist(const char *ifname, char *buf, int *len)
+++{
+++	struct iwinfo_assoclist_entry *ae;
+++	int noise = 0;
+++
+++	if (nl80211_get_assoclist(ifname, buf, len) < 0)
+++		return -1;
+++
+++	dot11ah_get_noise(ifname, &noise);
+++
+++	for (char *p = buf; p < (buf + *len); p += sizeof(struct iwinfo_assoclist_entry))
+++	{
+++		ae = (struct iwinfo_assoclist_entry *) p;
+++		ae->noise = noise;
+++		_sanitise_rate_entry(&ae->rx_rate);
+++		_sanitise_rate_entry(&ae->tx_rate);
+++	}
+++
+++	return 0;
+++}
+++
+++static int dot11ah_get_scanlist(const char *ifname, char *buf, int *len)
+++{
+++	struct iwinfo_scanlist_entry *se;
+++	channel_to_halow_freq_t *ch_entry, *prim_chan;
+++	if(nl80211_get_scanlist(ifname, buf, len) < 0)
+++		return -1;
+++
+++	for(char *p = buf; p < (buf + *len); p += sizeof(struct iwinfo_scanlist_entry)){
+++		se = (struct iwinfo_scanlist_entry *) p;
+++
+++		ch_entry = get_s1g(g_map, se->channel);
+++		prim_chan = get_s1g(g_map, se->ht_chan_info.primary_chan);
+++		se->channel = ch_entry->halow_channel;
+++		se->band = IWINFO_BAND_900;
+++		se->mhz = get_freq(g_map, se->channel)*1000;
+++
+++		if (se->vht_chan_info.center_chan_1)
+++		{
+++			ch_entry = get_s1g(g_map, se->vht_chan_info.center_chan_1);
+++			se->channel = ch_entry->halow_channel;
+++			se->vht_chan_info.center_chan_1 = 0;
+++		}else if(se->ht_chan_info.secondary_chan_off == 1)
+++		{
+++			se->channel += 1;
+++		}else if(se->ht_chan_info.secondary_chan_off == 3)
+++		{
+++			se->channel -= 1;
+++		}
+++		se->ht_chan_info.secondary_chan_off=0;
+++		se->ht_chan_info.primary_chan=0;
+++		se->ah_chan_info.primary_chan=prim_chan->halow_channel;
+++		se->ah_chan_info.chan_width=s1g_chan2bw(g_map, se->channel);
+++
+++		se->crypto.wpa_version |= 4;
+++		if(se->crypto.sae_h2e == 1)
+++			se->crypto.auth_suites |= IWINFO_KMGMT_SAE;
+++		else
+++			se->crypto.auth_suites |= IWINFO_KMGMT_OWE;
+++		se->crypto.group_ciphers |= IWINFO_CIPHER_CCMP;
+++		se->crypto.group_ciphers &= ~(IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104);
+++		se->crypto.pair_ciphers |= IWINFO_CIPHER_CCMP;
+++		se->crypto.pair_ciphers &= ~(IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104);
+++	}
+++
+++	return 0;
+++}
+++
+++int dot11ah_freq_compare(const void *a, const void *b)
+++{
+++	const struct iwinfo_freqlist_entry *fe1 = (const struct iwinfo_freqlist_entry *) a;
+++	const struct iwinfo_freqlist_entry *fe2 = (const struct iwinfo_freqlist_entry *) b;
+++	return ( fe1->mhz - fe2->mhz );
+++}
+++
+++static int dot11ah_get_freqlist(const char *ifname, char *buf, int *len)
+++{
+++	struct iwinfo_freqlist_entry *fe;
+++	channel_to_halow_freq_t *ch_entry;
+++	const size_t fe_size = sizeof(struct iwinfo_freqlist_entry);
+++	if(nl80211_get_freqlist(ifname, buf, len) < 0)
+++		return -1;
+++
+++	for(char *p = buf; p < (buf + *len); p += fe_size){
+++		fe = (struct iwinfo_freqlist_entry *) p;
+++		ch_entry = get_s1g(g_map, fe->channel);
+++		fe->channel = ch_entry->halow_channel;
+++		fe->mhz = get_freq(g_map, fe->channel)*1000;
+++		fe->band = IWINFO_BAND_900;
+++		fe->flags = 0;
+++	}
+++
+++	qsort(buf, *len/fe_size, fe_size, dot11ah_freq_compare);
+++	return 0;
+++}
+++
+++static int dot11ah_get_countrylist(const char *ifname, char *buf, int *len)
+++{
+++	int count;
+++	struct iwinfo_country_entry *e = (struct iwinfo_country_entry *)buf;
+++
+++	const country_channel_map_t **halow_map = s1g_mapped_channel();
+++	char higher='0',lower='0';
+++	e->iso3166 = (int)higher*256+lower;
+++	e->ccode[0] = '0';
+++	e->ccode[1] = '0';
+++	e->ccode[2] = 0;
+++	e++;
+++	count=1;
+++	while((*halow_map)->country[0])
+++	{
+++		higher = (*halow_map)->country[0];
+++		lower = (*halow_map)->country[1];
+++		e->iso3166 = higher * 256 + lower;
+++		e->ccode[0] = higher;
+++		e->ccode[1] = lower;
+++		e->ccode[2] = 0;
+++		e++;
+++		halow_map++;
+++		count++;
+++	}
+++	*len = (count * sizeof(struct iwinfo_country_entry));
+++	return 0;
+++}
+++
+++/*
+++ * modified function to look for the interface in wpa_supplicant_s1g
+++ */
+++static int dot11ah_wpactl_connect(const char *ifname, struct sockaddr_un *local)
+++{
+++	struct sockaddr_un remote = { 0 };
+++	size_t remote_length, local_length;
+++
+++	int sock = socket(PF_UNIX, SOCK_DGRAM, 0);
+++	if (sock < 0)
+++		return sock;
+++
+++	remote.sun_family = AF_UNIX;
+++	remote_length = sizeof(remote.sun_family) +
+++		sprintf(remote.sun_path, "/var/run/wpa_supplicant-%s/%s",
+++		        ifname, ifname);
+++
+++	if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0)
+++	{
+++		close(sock);
+++		return -1;
+++	}
+++
+++	if (connect(sock, (struct sockaddr *)&remote, remote_length))
+++	{
+++		remote_length = sizeof(remote.sun_family) +
+++			sprintf(remote.sun_path, "/var/run/wpa_supplicant_s1g/%s", ifname);
+++
+++		if (connect(sock, (struct sockaddr *)&remote, remote_length))
+++		{
+++			close(sock);
+++			return -1;
+++		}
+++	}
+++
+++	local->sun_family = AF_UNIX;
+++	local_length = sizeof(local->sun_family) +
+++		sprintf(local->sun_path, "/var/run/iwinfo-%s-%d", ifname, getpid());
+++
+++	if (bind(sock, (struct sockaddr *)local, local_length) < 0)
+++	{
+++		close(sock);
+++		return -1;
+++	}
+++
+++	return sock;
+++}
+++
+++/* function copied as is from nl80211 version*/
+++static int __dot11ah_wpactl_query(const char *ifname, ...)
+++{
+++	va_list ap, ap_cur;
+++	struct sockaddr_un local = { 0 };
+++	int len, mode, found = 0, sock = -1;
+++	char *search, *dest, *key, *val, *line, *pos, buf[512];
+++
+++	if (nl80211_get_mode(ifname, &mode))
+++		return 0;
+++
+++	if (mode != IWINFO_OPMODE_CLIENT &&
+++	    mode != IWINFO_OPMODE_ADHOC &&
+++	    mode != IWINFO_OPMODE_MESHPOINT)
+++		return 0;
+++
+++	sock = dot11ah_wpactl_connect(ifname, &local);
+++
+++	if (sock < 0)
+++		return 0;
+++
+++	va_start(ap, ifname);
+++
+++	/* clear all destination buffers */
+++	va_copy(ap_cur, ap);
+++
+++	while ((search = va_arg(ap_cur, char *)) != NULL)
+++	{
+++		dest = va_arg(ap_cur, char *);
+++		len  = va_arg(ap_cur, int);
+++
+++		memset(dest, 0, len);
+++	}
+++
+++	va_end(ap_cur);
+++
+++	send(sock, "STATUS", 6, 0);
+++
+++	while (true)
+++	{
+++		if (nl80211_wpactl_recv(sock, buf, sizeof(buf)) <= 0)
+++			break;
+++
+++		if (buf[0] == '<')
+++			continue;
+++
+++		for (line = strtok_r(buf, "\n", &pos);
+++			 line != NULL;
+++			 line = strtok_r(NULL, "\n", &pos))
+++		{
+++			key = strtok(line, "=");
+++			val = strtok(NULL, "\n");
+++
+++			if (!key || !val)
+++				continue;
+++
+++			va_copy(ap_cur, ap);
+++
+++			while ((search = va_arg(ap_cur, char *)) != NULL)
+++			{
+++				dest = va_arg(ap_cur, char *);
+++				len  = va_arg(ap_cur, int);
+++
+++				if (!strcmp(search, key))
+++				{
+++					strncpy(dest, val, len - 1);
+++					found++;
+++					break;
+++				}
+++			}
+++
+++			va_end(ap_cur);
+++		}
+++
+++		break;
+++	}
+++
+++	va_end(ap);
+++
+++	close(sock);
+++	unlink(local.sun_path);
+++
+++	return found;
+++}
+++
+++#define dot11ah_wpactl_query(ifname, ...) \
+++	__dot11ah_wpactl_query(ifname, ##__VA_ARGS__, NULL)
+++
+++/* function copied as is from nl80211 version*/
+++static int dot11ah_get_encryption(const char *ifname, char *buf)
+++{
+++	char *p;
+++	int opmode;
+++	uint8_t wpa_version = 0;
+++	char wpa[2], wpa_key_mgmt[64], wpa_pairwise[16], wpa_groupwise[16];
+++	char auth_algs[2], wep_key0[27], wep_key1[27], wep_key2[27], wep_key3[27];
+++	char ieee80211w[2], pmf[2];
+++	char mode[16];
+++
+++	struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
+++
+++	/* WPA supplicant */
+++	if (dot11ah_wpactl_query(ifname,
+++			"pairwise_cipher", wpa_pairwise,  sizeof(wpa_pairwise),
+++			"group_cipher",    wpa_groupwise, sizeof(wpa_groupwise),
+++			"key_mgmt",        wpa_key_mgmt,  sizeof(wpa_key_mgmt),
+++			"pmf",             pmf,           sizeof(pmf),
+++			"mode",            mode,          sizeof(mode)))
+++	{
+++		/* WEP or Open */
+++		if (!strcmp(wpa_key_mgmt, "NONE"))
+++		{
+++			parse_wpa_ciphers(wpa_pairwise, &c->pair_ciphers);
+++			parse_wpa_ciphers(wpa_groupwise, &c->group_ciphers);
+++
+++			if (c->pair_ciphers != 0 && c->pair_ciphers != IWINFO_CIPHER_NONE) {
+++				c->enabled     = 1;
+++				c->auth_suites = IWINFO_KMGMT_NONE;
+++				c->auth_algs   = IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED;
+++			}
+++			else {
+++				c->pair_ciphers = 0;
+++				c->group_ciphers = 0;
+++			}
+++		}
+++
+++		/* MESH with SAE */
+++		else if (!strcmp(mode, "mesh") && !strcmp(wpa_key_mgmt, "UNKNOWN"))
+++		{
+++			c->enabled = 1;
+++			c->wpa_version = 4;
+++			c->auth_suites = IWINFO_KMGMT_SAE;
+++			c->pair_ciphers = IWINFO_CIPHER_CCMP;
+++			c->group_ciphers = IWINFO_CIPHER_CCMP;
+++		}
+++
+++		/* WPA */
+++		else
+++		{
+++			parse_wpa_ciphers(wpa_pairwise, &c->pair_ciphers);
+++			parse_wpa_ciphers(wpa_groupwise, &c->group_ciphers);
+++
+++			p = wpa_key_mgmt;
+++
+++			if (!strncmp(p, "WPA2-", 5) || !strncmp(p, "WPA2/", 5))
+++			{
+++				p += 5;
+++				wpa_version = 2;
+++			}
+++			else if (!strncmp(p, "WPA-", 4))
+++			{
+++				p += 4;
+++				wpa_version = 1;
+++			}
+++
+++			parse_wpa_suites(p, wpa_version, &c->wpa_version, &c->auth_suites, atoi(pmf));
+++
+++			c->enabled = !!(c->wpa_version && c->auth_suites);
+++		}
+++
+++		return 0;
+++	}
+++
+++	/* Hostapd */
+++	else if (nl80211_hostapd_query(ifname,
+++				"wpa",          wpa,          sizeof(wpa),
+++				"wpa_key_mgmt", wpa_key_mgmt, sizeof(wpa_key_mgmt),
+++				"wpa_pairwise", wpa_pairwise, sizeof(wpa_pairwise),
+++				"ieee80211w",   ieee80211w,   sizeof(ieee80211w),
+++				"auth_algs",    auth_algs,    sizeof(auth_algs),
+++				"wep_key0",     wep_key0,     sizeof(wep_key0),
+++				"wep_key1",     wep_key1,     sizeof(wep_key1),
+++				"wep_key2",     wep_key2,     sizeof(wep_key2),
+++				"wep_key3",     wep_key3,     sizeof(wep_key3)))
+++	{
+++		c->wpa_version = 0;
+++
+++		if (wpa_key_mgmt[0])
+++		{
+++			for (p = strtok(wpa_key_mgmt, " \t"); p != NULL; p = strtok(NULL, " \t"))
+++			{
+++				if (!strncmp(p, "WPA-", 4))
+++					p += 4;
+++
+++				if (!strncmp(p, "FT-", 3))
+++					p += 3;
+++
+++				parse_wpa_suites(p, atoi(wpa), &c->wpa_version, &c->auth_suites, atoi(ieee80211w));
+++			}
+++
+++			c->enabled = c->wpa_version ? 1 : 0;
+++		}
+++
+++		if (wpa_pairwise[0])
+++			parse_wpa_ciphers(wpa_pairwise, &c->pair_ciphers);
+++
+++		if (auth_algs[0])
+++		{
+++			switch (atoi(auth_algs))
+++			{
+++			case 1:
+++				c->auth_algs |= IWINFO_AUTH_OPEN;
+++				break;
+++
+++			case 2:
+++				c->auth_algs |= IWINFO_AUTH_SHARED;
+++				break;
+++
+++			case 3:
+++				c->auth_algs |= IWINFO_AUTH_OPEN;
+++				c->auth_algs |= IWINFO_AUTH_SHARED;
+++				break;
+++			}
+++
+++			c->pair_ciphers |= nl80211_check_wepkey(wep_key0);
+++			c->pair_ciphers |= nl80211_check_wepkey(wep_key1);
+++			c->pair_ciphers |= nl80211_check_wepkey(wep_key2);
+++			c->pair_ciphers |= nl80211_check_wepkey(wep_key3);
+++
+++			c->enabled = (c->auth_algs && c->pair_ciphers) ? 1 : 0;
+++		}
+++
+++		c->group_ciphers = c->pair_ciphers;
+++
+++		return 0;
+++	}
+++
+++	/* Ad-Hoc or Mesh interfaces without wpa_supplicant are open */
+++	else if (!nl80211_get_mode(ifname, &opmode) &&
+++	         (opmode == IWINFO_OPMODE_ADHOC ||
+++	          opmode == IWINFO_OPMODE_MESHPOINT))
+++	{
+++		c->enabled = 0;
+++
+++		return 0;
+++	}
+++
+++
+++	return -1;
+++}
+++
+++const struct iwinfo_ops dot11ah_ops = {
+++	.name             = "dot11ah",
+++	.probe            = dot11ah_probe,
+++	.channel          = dot11ah_get_channel,
+++	.center_chan1     = dot11ah_get_center_chan1,
+++	.center_chan2     = dot11ah_get_center_chan2,
+++	.frequency        = dot11ah_get_frequency,
+++	.frequency_offset = nl80211_get_frequency_offset,
+++	.txpower          = nl80211_get_txpower,
+++	.txpower_offset   = nl80211_get_txpower_offset,
+++	.bitrate          = dot11ah_get_bitrate,
+++	.signal           = nl80211_get_signal,
+++	.noise            = dot11ah_get_noise,
+++	.quality          = nl80211_get_quality,
+++	.quality_max      = nl80211_get_quality_max,
+++	.mbssid_support   = nl80211_get_mbssid_support,
+++	.hwmodelist       = dot11ah_get_hwmodelist,
+++	.htmodelist       = dot11ah_get_htmodelist,
+++	.htmode           = dot11ah_get_htmode,
+++	.mode             = nl80211_get_mode,
+++	.ssid             = nl80211_get_ssid,
+++	.bssid            = nl80211_get_bssid,
+++	.country          = dot11ah_get_country,
+++	.hardware_id      = nl80211_get_hardware_id,
+++	.hardware_name    = nl80211_get_hardware_name,
+++	.encryption       = dot11ah_get_encryption,
+++	.phyname          = nl80211_get_phyname,
+++	.assoclist        = dot11ah_get_assoclist,
+++	.txpwrlist        = nl80211_get_txpwrlist,
+++	.scanlist         = dot11ah_get_scanlist,
+++	.freqlist         = dot11ah_get_freqlist,
+++	.countrylist      = dot11ah_get_countrylist,
+++	.survey           = nl80211_get_survey,
+++	.lookup_phy       = nl80211_lookup_phyname,
+++	.phy_path         = nl80211_phy_path,
+++	.close            = nl80211_close
+++};
++\ No newline at end of file
++diff --git a/iwinfo_utils.c b/iwinfo_utils.c
++index d96cbb3..a7c8abe 100644
++--- a/iwinfo_utils.c
+++++ b/iwinfo_utils.c
++@@ -2,6 +2,7 @@
++  * iwinfo - Wireless Information Library - Shared utility routines
++  *
++  *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+++ *   Copyright 2022 Morse Micro
++  *
++  * The iwinfo library is free software: you can redistribute it and/or
++  * modify it under the terms of the GNU General Public License version 2
++@@ -151,8 +152,8 @@ uint8_t iwinfo_ghz2band(uint32_t ghz)
++ 
++ size_t iwinfo_format_hwmodes(int modes, char *buf, size_t len)
++ {
++-	// bit numbers as per IWINFO_80211_*:  ad ac ax  a  b  g  n
++-	const int order[IWINFO_80211_COUNT] = { 5, 4, 6, 0, 1, 2, 3 };
+++	// bit numbers as per IWINFO_80211_*:  ad ac ax  ah a  b  g  n
+++	const int order[IWINFO_80211_COUNT] = { 5, 4, 6, 7, 0, 1, 2, 3 };
++ 	size_t res = 0;
++ 	int i;
++ 
++@@ -599,6 +600,25 @@ void iwinfo_parse_rsn(struct iwinfo_crypto_entry *c, uint8_t *data, uint8_t len,
++ 	len -= 2 + (count * 4);
++ }
++ 
+++void iwinfo_parse_rsnxe(struct iwinfo_crypto_entry *c, uint8_t *data, uint8_t len)
+++{
+++	if (len > 2)
+++		return;
+++
+++	c->prot_twt = (data[0] >> 4) & 0x1;
+++	c->sae_h2e  = (data[0] >> 5) & 0x1;
+++	c->sae_pk   = (data[0] >> 6) & 0x1;
+++	len -= 1;
+++	data += 1;
+++
+++	if (len == 0)
+++		return;
+++
+++	c->secure_ltf     = (data[0]) & 0x1;
+++	c->secure_rtt     = (data[0] >> 1) & 0x1;
+++	c->prot_range_neg = (data[0] >> 2) & 0x1;
+++}
+++
++ struct uci_section *iwinfo_uci_get_radio(const char *name, const char *type)
++ {
++ 	struct uci_ptr ptr = {
+-- 
+2.34.1
+
diff --git a/profiles/edgecore_eap112.yml b/profiles/edgecore_eap112.yml
index abd388396..61844483d 100644
--- a/profiles/edgecore_eap112.yml
+++ b/profiles/edgecore_eap112.yml
@@ -7,6 +7,8 @@ image: bin/targets/mediatek/mt7981/openwrt-mediatek-mt7981-edgecore_eap112-squas
 feeds:
   - name: mediatek
     path: ../../feeds/mediatek-sdk
+  - name: morse
+    path: ../../feeds/morse
 packages:
   - mediatek
   - kmod-i2c-core
@@ -31,6 +33,15 @@ packages:
   - wwan
   - dbus
   - i2c-tools
+  - kmod-morse
+  - morse-fw
+  - morsecli
+  - hostapd_s1g
+  - wpa_supplicant_s1g
+  - netifd-morse
+  - morse_mesh11sd
+  - wpa_event_listener
+  - morse-regdb
 include:
   - ucentral-ap
 diffconfig: |  
diff --git a/profiles/emplus_wap588m.yml b/profiles/emplus_wap588m.yml
new file mode 100644
index 000000000..0b35ce1b2
--- /dev/null
+++ b/profiles/emplus_wap588m.yml
@@ -0,0 +1,942 @@
+---
+profile: emplus_wap588m
+target: mediatek
+subtarget: mt7981
+description: Build image for the EMPLUS WAP588M
+image: bin/targets/mediatek/mt7981/openwrt-mediatek-mt7981-emplus_wap588m-squashfs-sysupgrade.bin
+feeds:
+  - name: mediatek
+    path: ../../feeds/mediatek-sdk
+packages:
+  - mediatek
+include:
+  - ucentral-ap
+diffconfig: |
+  CONFIG_BUSYBOX_CUSTOM=y
+  CONFIG_BUSYBOX_DEFAULT_HAVE_DOT_CONFIG=y
+  # CONFIG_BUSYBOX_DEFAULT_DESKTOP is not set
+  # CONFIG_BUSYBOX_DEFAULT_EXTRA_COMPAT is not set
+  CONFIG_BUSYBOX_DEFAULT_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
+  # CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG is not set
+  CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+  # CONFIG_BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG is not set
+  CONFIG_BUSYBOX_CONFIG_HAVE_DOT_CONFIG=y
+  
+  #
+  # Settings
+  #
+  # CONFIG_BUSYBOX_CONFIG_DESKTOP is not set
+  # CONFIG_BUSYBOX_CONFIG_EXTRA_COMPAT is not set
+  # CONFIG_BUSYBOX_CONFIG_FEDORA_COMPAT is not set
+  CONFIG_BUSYBOX_CONFIG_INCLUDE_SUSv2=y
+  CONFIG_BUSYBOX_CONFIG_LONG_OPTS=y
+  CONFIG_BUSYBOX_CONFIG_SHOW_USAGE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE is not set
+  CONFIG_BUSYBOX_CONFIG_LFS=y
+  # CONFIG_BUSYBOX_CONFIG_PAM is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DEVPTS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_UTMP is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_PIDFILE=y
+  CONFIG_BUSYBOX_CONFIG_PID_FILE_PATH="/var/run"
+  # CONFIG_BUSYBOX_CONFIG_BUSYBOX is not set
+  # CONFIG_BUSYBOX_CONFIG_INSTALL_NO_USR is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SUID is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS=y
+  CONFIG_BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+  # CONFIG_BUSYBOX_CONFIG_SELINUX is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CLEAN_UP is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG=y
+  
+  #
+  # Build Options
+  #
+  # CONFIG_BUSYBOX_CONFIG_STATIC is not set
+  # CONFIG_BUSYBOX_CONFIG_PIE is not set
+  # CONFIG_BUSYBOX_CONFIG_NOMMU is not set
+  CONFIG_BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX=""
+  CONFIG_BUSYBOX_CONFIG_SYSROOT=""
+  CONFIG_BUSYBOX_CONFIG_EXTRA_CFLAGS=""
+  CONFIG_BUSYBOX_CONFIG_EXTRA_LDFLAGS=""
+  CONFIG_BUSYBOX_CONFIG_EXTRA_LDLIBS=""
+  # CONFIG_BUSYBOX_CONFIG_USE_PORTABLE_CODE is not set
+  # CONFIG_BUSYBOX_CONFIG_STACK_OPTIMIZATION_386 is not set
+  # CONFIG_BUSYBOX_CONFIG_STATIC_LIBGCC is not set
+  
+  #
+  # Installation Options ("make install" behavior)
+  #
+  CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS=y
+  # CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS is not set
+  # CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+  # CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_DONT is not set
+  CONFIG_BUSYBOX_CONFIG_PREFIX="./_install"
+  
+  #
+  # Debugging Options
+  #
+  # CONFIG_BUSYBOX_CONFIG_DEBUG is not set
+  # CONFIG_BUSYBOX_CONFIG_DEBUG_SANITIZE is not set
+  # CONFIG_BUSYBOX_CONFIG_UNIT_TEST is not set
+  # CONFIG_BUSYBOX_CONFIG_WERROR is not set
+  # CONFIG_BUSYBOX_CONFIG_WARN_SIMPLE_MSG is not set
+  CONFIG_BUSYBOX_CONFIG_NO_DEBUG_LIB=y
+  # CONFIG_BUSYBOX_CONFIG_DMALLOC is not set
+  # CONFIG_BUSYBOX_CONFIG_EFENCE is not set
+  
+  #
+  # Library Tuning
+  #
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL is not set
+  # CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_RTMINMAX is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+  CONFIG_BUSYBOX_CONFIG_PASSWORD_MINLEN=6
+  CONFIG_BUSYBOX_CONFIG_MD5_SMALL=1
+  CONFIG_BUSYBOX_CONFIG_SHA1_SMALL=3
+  CONFIG_BUSYBOX_CONFIG_SHA1_HWACCEL=y
+  CONFIG_BUSYBOX_CONFIG_SHA256_HWACCEL=y
+  CONFIG_BUSYBOX_CONFIG_SHA3_SMALL=1
+  CONFIG_BUSYBOX_CONFIG_FEATURE_NON_POSIX_CP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_USE_SENDFILE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_COPYBUF_KB=4
+  CONFIG_BUSYBOX_CONFIG_MONOTONIC_SYSCALL=y
+  CONFIG_BUSYBOX_CONFIG_IOCTL_HEX2STR_ERROR=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN=512
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_VI is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY=256
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_REVERSE_SEARCH is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_WINCH is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+  # CONFIG_BUSYBOX_CONFIG_LOCALE_SUPPORT is not set
+  # CONFIG_BUSYBOX_CONFIG_UNICODE_SUPPORT is not set
+  # CONFIG_BUSYBOX_CONFIG_LOOP_CONFIGURE is not set
+  # CONFIG_BUSYBOX_CONFIG_NO_LOOP_CONFIGURE is not set
+  CONFIG_BUSYBOX_CONFIG_TRY_LOOP_CONFIGURE=y
+  # end of Settings
+  
+  #
+  # Applets
+  #
+  
+  #
+  # Archival Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_LZMA is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z is not set
+  # CONFIG_BUSYBOX_CONFIG_AR is not set
+  # CONFIG_BUSYBOX_CONFIG_UNCOMPRESS is not set
+  CONFIG_BUSYBOX_CONFIG_GUNZIP=y
+  CONFIG_BUSYBOX_CONFIG_ZCAT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_GUNZIP_LONG_OPTIONS is not set
+  # CONFIG_BUSYBOX_CONFIG_BUNZIP2 is not set
+  # CONFIG_BUSYBOX_CONFIG_BZCAT is not set
+  # CONFIG_BUSYBOX_CONFIG_UNLZMA is not set
+  # CONFIG_BUSYBOX_CONFIG_LZCAT is not set
+  # CONFIG_BUSYBOX_CONFIG_LZMA is not set
+  # CONFIG_BUSYBOX_CONFIG_UNXZ is not set
+  # CONFIG_BUSYBOX_CONFIG_XZCAT is not set
+  # CONFIG_BUSYBOX_CONFIG_XZ is not set
+  # CONFIG_BUSYBOX_CONFIG_BZIP2 is not set
+  # CONFIG_BUSYBOX_CONFIG_CPIO is not set
+  # CONFIG_BUSYBOX_CONFIG_DPKG is not set
+  # CONFIG_BUSYBOX_CONFIG_DPKG_DEB is not set
+  CONFIG_BUSYBOX_CONFIG_GZIP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+  CONFIG_BUSYBOX_CONFIG_GZIP_FAST=0
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_DECOMPRESS=y
+  # CONFIG_BUSYBOX_CONFIG_LZOP is not set
+  # CONFIG_BUSYBOX_CONFIG_UNLZOP is not set
+  # CONFIG_BUSYBOX_CONFIG_LZOPCAT is not set
+  # CONFIG_BUSYBOX_CONFIG_RPM is not set
+  # CONFIG_BUSYBOX_CONFIG_RPM2CPIO is not set
+  CONFIG_BUSYBOX_CONFIG_TAR=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_CREATE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_FROM=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+  # CONFIG_BUSYBOX_CONFIG_UNZIP is not set
+  # end of Archival Utilities
+  
+  #
+  # Coreutils
+  #
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE is not set
+  
+  #
+  # Common options for date and touch
+  #
+  
+  #
+  # Common options for cp and mv
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+  
+  #
+  # Common options for df, du, ls
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE=y
+  CONFIG_BUSYBOX_CONFIG_BASENAME=y
+  CONFIG_BUSYBOX_CONFIG_CAT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CATN is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CATV is not set
+  CONFIG_BUSYBOX_CONFIG_CHGRP=y
+  CONFIG_BUSYBOX_CONFIG_CHMOD=y
+  CONFIG_BUSYBOX_CONFIG_CHOWN=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+  CONFIG_BUSYBOX_CONFIG_CHROOT=y
+  # CONFIG_BUSYBOX_CONFIG_CKSUM is not set
+  # CONFIG_BUSYBOX_CONFIG_CRC32 is not set
+  # CONFIG_BUSYBOX_CONFIG_COMM is not set
+  CONFIG_BUSYBOX_CONFIG_CP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+  CONFIG_BUSYBOX_CONFIG_CUT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CUT_REGEX is not set
+  CONFIG_BUSYBOX_CONFIG_DATE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_COMPAT is not set
+  CONFIG_BUSYBOX_CONFIG_DD=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_DD_STATUS is not set
+  CONFIG_BUSYBOX_CONFIG_DF=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_DF_FANCY is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SKIP_ROOTFS is not set
+  CONFIG_BUSYBOX_CONFIG_DIRNAME=y
+  # CONFIG_BUSYBOX_CONFIG_DOS2UNIX is not set
+  # CONFIG_BUSYBOX_CONFIG_UNIX2DOS is not set
+  CONFIG_BUSYBOX_CONFIG_DU=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+  CONFIG_BUSYBOX_CONFIG_ECHO=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_ECHO=y
+  CONFIG_BUSYBOX_CONFIG_ENV=y
+  # CONFIG_BUSYBOX_CONFIG_EXPAND is not set
+  # CONFIG_BUSYBOX_CONFIG_UNEXPAND is not set
+  CONFIG_BUSYBOX_CONFIG_EXPR=y
+  CONFIG_BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64=y
+  # CONFIG_BUSYBOX_CONFIG_FACTOR is not set
+  CONFIG_BUSYBOX_CONFIG_FALSE=y
+  # CONFIG_BUSYBOX_CONFIG_FOLD is not set
+  CONFIG_BUSYBOX_CONFIG_HEAD=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_HEAD=y
+  # CONFIG_BUSYBOX_CONFIG_HOSTID is not set
+  CONFIG_BUSYBOX_CONFIG_ID=y
+  # CONFIG_BUSYBOX_CONFIG_GROUPS is not set
+  # CONFIG_BUSYBOX_CONFIG_INSTALL is not set
+  # CONFIG_BUSYBOX_CONFIG_LINK is not set
+  CONFIG_BUSYBOX_CONFIG_LN=y
+  # CONFIG_BUSYBOX_CONFIG_LOGNAME is not set
+  CONFIG_BUSYBOX_CONFIG_LS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_FILETYPES=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_WIDTH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_SORTFILES=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_USERNAME=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+  CONFIG_BUSYBOX_CONFIG_MD5SUM=y
+  # CONFIG_BUSYBOX_CONFIG_SHA1SUM is not set
+  CONFIG_BUSYBOX_CONFIG_SHA256SUM=y
+  # CONFIG_BUSYBOX_CONFIG_SHA512SUM is not set
+  # CONFIG_BUSYBOX_CONFIG_SHA3SUM is not set
+  
+  #
+  # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+  CONFIG_BUSYBOX_CONFIG_MKDIR=y
+  CONFIG_BUSYBOX_CONFIG_MKFIFO=y
+  CONFIG_BUSYBOX_CONFIG_MKNOD=y
+  CONFIG_BUSYBOX_CONFIG_MKTEMP=y
+  CONFIG_BUSYBOX_CONFIG_MV=y
+  CONFIG_BUSYBOX_CONFIG_NICE=y
+  # CONFIG_BUSYBOX_CONFIG_NL is not set
+  # CONFIG_BUSYBOX_CONFIG_NOHUP is not set
+  # CONFIG_BUSYBOX_CONFIG_NPROC is not set
+  # CONFIG_BUSYBOX_CONFIG_OD is not set
+  # CONFIG_BUSYBOX_CONFIG_PASTE is not set
+  # CONFIG_BUSYBOX_CONFIG_PRINTENV is not set
+  CONFIG_BUSYBOX_CONFIG_PRINTF=y
+  CONFIG_BUSYBOX_CONFIG_PWD=y
+  CONFIG_BUSYBOX_CONFIG_READLINK=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW=y
+  # CONFIG_BUSYBOX_CONFIG_REALPATH is not set
+  CONFIG_BUSYBOX_CONFIG_RM=y
+  CONFIG_BUSYBOX_CONFIG_RMDIR=y
+  CONFIG_BUSYBOX_CONFIG_SEQ=y
+  # CONFIG_BUSYBOX_CONFIG_SHRED is not set
+  # CONFIG_BUSYBOX_CONFIG_SHUF is not set
+  CONFIG_BUSYBOX_CONFIG_SLEEP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
+  CONFIG_BUSYBOX_CONFIG_SORT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SORT_BIG is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
+  # CONFIG_BUSYBOX_CONFIG_SPLIT is not set
+  # CONFIG_BUSYBOX_CONFIG_STAT is not set
+  # CONFIG_BUSYBOX_CONFIG_STTY is not set
+  # CONFIG_BUSYBOX_CONFIG_SUM is not set
+  CONFIG_BUSYBOX_CONFIG_SYNC=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SYNC_FANCY is not set
+  CONFIG_BUSYBOX_CONFIG_FSYNC=y
+  # CONFIG_BUSYBOX_CONFIG_TAC is not set
+  CONFIG_BUSYBOX_CONFIG_TAIL=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_TAIL=y
+  CONFIG_BUSYBOX_CONFIG_TEE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+  CONFIG_BUSYBOX_CONFIG_TEST=y
+  CONFIG_BUSYBOX_CONFIG_TEST1=y
+  CONFIG_BUSYBOX_CONFIG_TEST2=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64=y
+  # CONFIG_BUSYBOX_CONFIG_TIMEOUT is not set
+  CONFIG_BUSYBOX_CONFIG_TOUCH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TOUCH_SUSV3=y
+  CONFIG_BUSYBOX_CONFIG_TR=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TR_CLASSES is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TR_EQUIV is not set
+  CONFIG_BUSYBOX_CONFIG_TRUE=y
+  # CONFIG_BUSYBOX_CONFIG_TRUNCATE is not set
+  # CONFIG_BUSYBOX_CONFIG_TSORT is not set
+  # CONFIG_BUSYBOX_CONFIG_TTY is not set
+  CONFIG_BUSYBOX_CONFIG_UNAME=y
+  CONFIG_BUSYBOX_CONFIG_UNAME_OSNAME="GNU/Linux"
+  # CONFIG_BUSYBOX_CONFIG_BB_ARCH is not set
+  CONFIG_BUSYBOX_CONFIG_UNIQ=y
+  # CONFIG_BUSYBOX_CONFIG_UNLINK is not set
+  # CONFIG_BUSYBOX_CONFIG_USLEEP is not set
+  # CONFIG_BUSYBOX_CONFIG_UUDECODE is not set
+  # CONFIG_BUSYBOX_CONFIG_BASE32 is not set
+  # CONFIG_BUSYBOX_CONFIG_BASE64 is not set
+  # CONFIG_BUSYBOX_CONFIG_UUENCODE is not set
+  CONFIG_BUSYBOX_CONFIG_WC=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_WC_LARGE is not set
+  # CONFIG_BUSYBOX_CONFIG_WHOAMI is not set
+  CONFIG_BUSYBOX_CONFIG_YES=y
+  # end of Coreutils
+  
+  #
+  # Console Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_CHVT is not set
+  CONFIG_BUSYBOX_CONFIG_CLEAR=y
+  # CONFIG_BUSYBOX_CONFIG_DEALLOCVT is not set
+  # CONFIG_BUSYBOX_CONFIG_DUMPKMAP is not set
+  # CONFIG_BUSYBOX_CONFIG_FGCONSOLE is not set
+  # CONFIG_BUSYBOX_CONFIG_KBD_MODE is not set
+  # CONFIG_BUSYBOX_CONFIG_LOADFONT is not set
+  # CONFIG_BUSYBOX_CONFIG_SETFONT is not set
+  # CONFIG_BUSYBOX_CONFIG_LOADKMAP is not set
+  # CONFIG_BUSYBOX_CONFIG_OPENVT is not set
+  CONFIG_BUSYBOX_CONFIG_RESET=y
+  CONFIG_BUSYBOX_CONFIG_RESIZE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_RESIZE_PRINT is not set
+  # CONFIG_BUSYBOX_CONFIG_SETCONSOLE is not set
+  # CONFIG_BUSYBOX_CONFIG_SETKEYCODES is not set
+  # CONFIG_BUSYBOX_CONFIG_SETLOGCONS is not set
+  # CONFIG_BUSYBOX_CONFIG_SHOWKEY is not set
+  # end of Console Utilities
+  
+  #
+  # Debian Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_PIPE_PROGRESS is not set
+  # CONFIG_BUSYBOX_CONFIG_RUN_PARTS is not set
+  CONFIG_BUSYBOX_CONFIG_START_STOP_DAEMON=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+  CONFIG_BUSYBOX_CONFIG_WHICH=y
+  # end of Debian Utilities
+  
+  #
+  # klibc-utils
+  #
+  # CONFIG_BUSYBOX_CONFIG_MINIPS is not set
+  # CONFIG_BUSYBOX_CONFIG_NUKE is not set
+  # CONFIG_BUSYBOX_CONFIG_RESUME is not set
+  # CONFIG_BUSYBOX_CONFIG_RUN_INIT is not set
+  # end of klibc-utils
+  
+  #
+  # Editors
+  #
+  CONFIG_BUSYBOX_CONFIG_AWK=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_AWK_LIBM=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+  CONFIG_BUSYBOX_CONFIG_CMP=y
+  # CONFIG_BUSYBOX_CONFIG_DIFF is not set
+  # CONFIG_BUSYBOX_CONFIG_ED is not set
+  # CONFIG_BUSYBOX_CONFIG_PATCH is not set
+  CONFIG_BUSYBOX_CONFIG_SED=y
+  CONFIG_BUSYBOX_CONFIG_VI=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN=1024
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_VI_8BIT is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_COLON=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_VI_COLON_EXPAND is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_YANKMARK=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SEARCH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_READONLY=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SETOPTS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SET=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC=y
+  # end of Editors
+  
+  #
+  # Finding Utilities
+  #
+  CONFIG_BUSYBOX_CONFIG_FIND=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRINT0=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MTIME=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_ATIME is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_CTIME is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MMIN=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_AMIN is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_CMIN is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PERM=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_TYPE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_EXECUTABLE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_XDEV=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_NEWER=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_INUM is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_SAMEFILE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_EXEC=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_EXEC_PLUS is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_USER=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_GROUP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_NOT=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DEPTH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PAREN=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_SIZE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRUNE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_QUIT is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DELETE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_EMPTY is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_REGEX=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_LINKS is not set
+  CONFIG_BUSYBOX_CONFIG_GREP=y
+  CONFIG_BUSYBOX_CONFIG_EGREP=y
+  CONFIG_BUSYBOX_CONFIG_FGREP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT=y
+  CONFIG_BUSYBOX_CONFIG_XARGS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE is not set
+  # end of Finding Utilities
+  
+  #
+  # Init Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_BOOTCHARTD is not set
+  CONFIG_BUSYBOX_CONFIG_HALT=y
+  CONFIG_BUSYBOX_CONFIG_POWEROFF=y
+  CONFIG_BUSYBOX_CONFIG_REBOOT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_WAIT_FOR_INIT is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CALL_TELINIT is not set
+  # CONFIG_BUSYBOX_CONFIG_INIT is not set
+  # CONFIG_BUSYBOX_CONFIG_LINUXRC is not set
+  # end of Init Utilities
+  
+  #
+  # Login/Password Management Utilities
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS=y
+  # CONFIG_BUSYBOX_CONFIG_USE_BB_PWD_GRP is not set
+  # CONFIG_BUSYBOX_CONFIG_USE_BB_CRYPT is not set
+  # CONFIG_BUSYBOX_CONFIG_ADD_SHELL is not set
+  # CONFIG_BUSYBOX_CONFIG_REMOVE_SHELL is not set
+  # CONFIG_BUSYBOX_CONFIG_ADDGROUP is not set
+  # CONFIG_BUSYBOX_CONFIG_ADDUSER is not set
+  # CONFIG_BUSYBOX_CONFIG_CHPASSWD is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="md5"
+  # CONFIG_BUSYBOX_CONFIG_CRYPTPW is not set
+  # CONFIG_BUSYBOX_CONFIG_MKPASSWD is not set
+  # CONFIG_BUSYBOX_CONFIG_DELUSER is not set
+  # CONFIG_BUSYBOX_CONFIG_DELGROUP is not set
+  # CONFIG_BUSYBOX_CONFIG_GETTY is not set
+  CONFIG_BUSYBOX_CONFIG_LOGIN=y
+  # CONFIG_BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD is not set
+  # CONFIG_BUSYBOX_CONFIG_LOGIN_SCRIPTS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY is not set
+  CONFIG_BUSYBOX_CONFIG_PASSWD=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+  # CONFIG_BUSYBOX_CONFIG_SU is not set
+  # CONFIG_BUSYBOX_CONFIG_SULOGIN is not set
+  # CONFIG_BUSYBOX_CONFIG_VLOCK is not set
+  # end of Login/Password Management Utilities
+  
+  #
+  # Linux Ext2 FS Progs
+  #
+  # CONFIG_BUSYBOX_CONFIG_CHATTR is not set
+  # CONFIG_BUSYBOX_CONFIG_FSCK is not set
+  # CONFIG_BUSYBOX_CONFIG_LSATTR is not set
+  # CONFIG_BUSYBOX_CONFIG_TUNE2FS is not set
+  # end of Linux Ext2 FS Progs
+  
+  #
+  # Linux Module Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_MODPROBE_SMALL is not set
+  # CONFIG_BUSYBOX_CONFIG_DEPMOD is not set
+  # CONFIG_BUSYBOX_CONFIG_INSMOD is not set
+  # CONFIG_BUSYBOX_CONFIG_LSMOD is not set
+  # CONFIG_BUSYBOX_CONFIG_MODINFO is not set
+  # CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
+  # CONFIG_BUSYBOX_CONFIG_RMMOD is not set
+  
+  #
+  # Options common to multiple modutils
+  #
+  # end of Linux Module Utilities
+  
+  #
+  # Linux System Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_ACPID is not set
+  # CONFIG_BUSYBOX_CONFIG_BLKDISCARD is not set
+  # CONFIG_BUSYBOX_CONFIG_BLKID is not set
+  # CONFIG_BUSYBOX_CONFIG_BLOCKDEV is not set
+  # CONFIG_BUSYBOX_CONFIG_CAL is not set
+  # CONFIG_BUSYBOX_CONFIG_CHRT is not set
+  CONFIG_BUSYBOX_CONFIG_DMESG=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY=y
+  # CONFIG_BUSYBOX_CONFIG_EJECT is not set
+  # CONFIG_BUSYBOX_CONFIG_FALLOCATE is not set
+  # CONFIG_BUSYBOX_CONFIG_FATATTR is not set
+  # CONFIG_BUSYBOX_CONFIG_FBSET is not set
+  # CONFIG_BUSYBOX_CONFIG_FDFORMAT is not set
+  # CONFIG_BUSYBOX_CONFIG_FDISK is not set
+  # CONFIG_BUSYBOX_CONFIG_FINDFS is not set
+  CONFIG_BUSYBOX_CONFIG_FLOCK=y
+  # CONFIG_BUSYBOX_CONFIG_FDFLUSH is not set
+  # CONFIG_BUSYBOX_CONFIG_FREERAMDISK is not set
+  # CONFIG_BUSYBOX_CONFIG_FSCK_MINIX is not set
+  # CONFIG_BUSYBOX_CONFIG_FSFREEZE is not set
+  # CONFIG_BUSYBOX_CONFIG_FSTRIM is not set
+  # CONFIG_BUSYBOX_CONFIG_GETOPT is not set
+  CONFIG_BUSYBOX_CONFIG_HEXDUMP=y
+  # CONFIG_BUSYBOX_CONFIG_HD is not set
+  # CONFIG_BUSYBOX_CONFIG_XXD is not set
+  CONFIG_BUSYBOX_CONFIG_HWCLOCK=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+  # CONFIG_BUSYBOX_CONFIG_IONICE is not set
+  # CONFIG_BUSYBOX_CONFIG_IPCRM is not set
+  # CONFIG_BUSYBOX_CONFIG_IPCS is not set
+  # CONFIG_BUSYBOX_CONFIG_LOSETUP is not set
+  # CONFIG_BUSYBOX_CONFIG_LSPCI is not set
+  # CONFIG_BUSYBOX_CONFIG_LSUSB is not set
+  # CONFIG_BUSYBOX_CONFIG_MDEV is not set
+  # CONFIG_BUSYBOX_CONFIG_MESG is not set
+  # CONFIG_BUSYBOX_CONFIG_MKE2FS is not set
+  # CONFIG_BUSYBOX_CONFIG_MKFS_EXT2 is not set
+  # CONFIG_BUSYBOX_CONFIG_MKFS_MINIX is not set
+  # CONFIG_BUSYBOX_CONFIG_MKFS_REISER is not set
+  # CONFIG_BUSYBOX_CONFIG_MKDOSFS is not set
+  # CONFIG_BUSYBOX_CONFIG_MKFS_VFAT is not set
+  CONFIG_BUSYBOX_CONFIG_MKSWAP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID is not set
+  # CONFIG_BUSYBOX_CONFIG_MORE is not set
+  CONFIG_BUSYBOX_CONFIG_MOUNT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_OTHERTAB is not set
+  # CONFIG_BUSYBOX_CONFIG_MOUNTPOINT is not set
+  # CONFIG_BUSYBOX_CONFIG_NSENTER is not set
+  CONFIG_BUSYBOX_CONFIG_PIVOT_ROOT=y
+  # CONFIG_BUSYBOX_CONFIG_RDATE is not set
+  # CONFIG_BUSYBOX_CONFIG_RDEV is not set
+  # CONFIG_BUSYBOX_CONFIG_READPROFILE is not set
+  # CONFIG_BUSYBOX_CONFIG_RENICE is not set
+  # CONFIG_BUSYBOX_CONFIG_REV is not set
+  # CONFIG_BUSYBOX_CONFIG_RTCWAKE is not set
+  # CONFIG_BUSYBOX_CONFIG_SCRIPT is not set
+  # CONFIG_BUSYBOX_CONFIG_SCRIPTREPLAY is not set
+  # CONFIG_BUSYBOX_CONFIG_SETARCH is not set
+  # CONFIG_BUSYBOX_CONFIG_LINUX32 is not set
+  # CONFIG_BUSYBOX_CONFIG_LINUX64 is not set
+  # CONFIG_BUSYBOX_CONFIG_SETPRIV is not set
+  # CONFIG_BUSYBOX_CONFIG_SETSID is not set
+  CONFIG_BUSYBOX_CONFIG_SWAPON=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SWAPON_DISCARD=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SWAPON_PRI=y
+  CONFIG_BUSYBOX_CONFIG_SWAPOFF=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SWAPONOFF_LABEL is not set
+  CONFIG_BUSYBOX_CONFIG_SWITCH_ROOT=y
+  CONFIG_BUSYBOX_CONFIG_TASKSET=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_CPULIST=y
+  # CONFIG_BUSYBOX_CONFIG_UEVENT is not set
+  CONFIG_BUSYBOX_CONFIG_UMOUNT=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL=y
+  # CONFIG_BUSYBOX_CONFIG_UNSHARE is not set
+  
+  #
+  # Common options for mount/umount
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT is not set
+  # CONFIG_BUSYBOX_CONFIG_VOLUMEID is not set
+  # end of Linux System Utilities
+  
+  #
+  # Miscellaneous Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_ADJTIMEX is not set
+  # CONFIG_BUSYBOX_CONFIG_ASCII is not set
+  # CONFIG_BUSYBOX_CONFIG_BBCONFIG is not set
+  # CONFIG_BUSYBOX_CONFIG_BC is not set
+  # CONFIG_BUSYBOX_CONFIG_DC is not set
+  # CONFIG_BUSYBOX_CONFIG_BEEP is not set
+  # CONFIG_BUSYBOX_CONFIG_CHAT is not set
+  # CONFIG_BUSYBOX_CONFIG_CONSPY is not set
+  CONFIG_BUSYBOX_CONFIG_CROND=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_D is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_DIR="/etc"
+  CONFIG_BUSYBOX_CONFIG_CRONTAB=y
+  # CONFIG_BUSYBOX_CONFIG_DEVFSD is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_DEVFS is not set
+  # CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
+  # CONFIG_BUSYBOX_CONFIG_FBSPLASH is not set
+  # CONFIG_BUSYBOX_CONFIG_FLASH_ERASEALL is not set
+  # CONFIG_BUSYBOX_CONFIG_FLASH_LOCK is not set
+  # CONFIG_BUSYBOX_CONFIG_FLASH_UNLOCK is not set
+  # CONFIG_BUSYBOX_CONFIG_FLASHCP is not set
+  # CONFIG_BUSYBOX_CONFIG_HDPARM is not set
+  # CONFIG_BUSYBOX_CONFIG_HEXEDIT is not set
+  # CONFIG_BUSYBOX_CONFIG_I2CGET is not set
+  # CONFIG_BUSYBOX_CONFIG_I2CSET is not set
+  # CONFIG_BUSYBOX_CONFIG_I2CDUMP is not set
+  # CONFIG_BUSYBOX_CONFIG_I2CDETECT is not set
+  # CONFIG_BUSYBOX_CONFIG_I2CTRANSFER is not set
+  # CONFIG_BUSYBOX_CONFIG_INOTIFYD is not set
+  CONFIG_BUSYBOX_CONFIG_LESS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES=9999999
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_FLAGS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_TRUNCATE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_MARKS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_REGEXP is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_WINCH is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD is not set
+  CONFIG_BUSYBOX_CONFIG_LOCK=y
+  # CONFIG_BUSYBOX_CONFIG_LSSCSI is not set
+  # CONFIG_BUSYBOX_CONFIG_MAKEDEVS is not set
+  # CONFIG_BUSYBOX_CONFIG_MAN is not set
+  # CONFIG_BUSYBOX_CONFIG_MICROCOM is not set
+  # CONFIG_BUSYBOX_CONFIG_MT is not set
+  # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
+  # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
+  # CONFIG_BUSYBOX_CONFIG_PARTPROBE is not set
+  # CONFIG_BUSYBOX_CONFIG_RAIDAUTORUN is not set
+  # CONFIG_BUSYBOX_CONFIG_READAHEAD is not set
+  # CONFIG_BUSYBOX_CONFIG_RFKILL is not set
+  # CONFIG_BUSYBOX_CONFIG_RX is not set
+  # CONFIG_BUSYBOX_CONFIG_SEEDRNG is not set
+  # CONFIG_BUSYBOX_CONFIG_SETFATTR is not set
+  # CONFIG_BUSYBOX_CONFIG_SETSERIAL is not set
+  CONFIG_BUSYBOX_CONFIG_STRINGS=y
+  CONFIG_BUSYBOX_CONFIG_TIME=y
+  # CONFIG_BUSYBOX_CONFIG_TREE is not set
+  # CONFIG_BUSYBOX_CONFIG_TS is not set
+  # CONFIG_BUSYBOX_CONFIG_TTYSIZE is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIATTACH is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIDETACH is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIMKVOL is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIRMVOL is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIRSVOL is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIUPDATEVOL is not set
+  # CONFIG_BUSYBOX_CONFIG_UBIRENAME is not set
+  # CONFIG_BUSYBOX_CONFIG_VOLNAME is not set
+  # CONFIG_BUSYBOX_CONFIG_WATCHDOG is not set
+  # end of Miscellaneous Utilities
+  
+  #
+  # Networking Utilities
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_UNIX_LOCAL is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+  CONFIG_BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_SERVICES is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_HWIB is not set
+  # CONFIG_BUSYBOX_CONFIG_ARP is not set
+  # CONFIG_BUSYBOX_CONFIG_ARPING is not set
+  CONFIG_BUSYBOX_CONFIG_BRCTL=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW=y
+  # CONFIG_BUSYBOX_CONFIG_DNSD is not set
+  # CONFIG_BUSYBOX_CONFIG_ETHER_WAKE is not set
+  # CONFIG_BUSYBOX_CONFIG_FTPD is not set
+  # CONFIG_BUSYBOX_CONFIG_FTPGET is not set
+  # CONFIG_BUSYBOX_CONFIG_FTPPUT is not set
+  # CONFIG_BUSYBOX_CONFIG_HOSTNAME is not set
+  # CONFIG_BUSYBOX_CONFIG_DNSDOMAINNAME is not set
+  # CONFIG_BUSYBOX_CONFIG_HTTPD is not set
+  CONFIG_BUSYBOX_CONFIG_IFCONFIG=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+  # CONFIG_BUSYBOX_CONFIG_IFENSLAVE is not set
+  # CONFIG_BUSYBOX_CONFIG_IFPLUGD is not set
+  # CONFIG_BUSYBOX_CONFIG_IFUP is not set
+  # CONFIG_BUSYBOX_CONFIG_IFDOWN is not set
+  # CONFIG_BUSYBOX_CONFIG_INETD is not set
+  CONFIG_BUSYBOX_CONFIG_IP=y
+  # CONFIG_BUSYBOX_CONFIG_IPADDR is not set
+  # CONFIG_BUSYBOX_CONFIG_IPLINK is not set
+  # CONFIG_BUSYBOX_CONFIG_IPROUTE is not set
+  # CONFIG_BUSYBOX_CONFIG_IPTUNNEL is not set
+  # CONFIG_BUSYBOX_CONFIG_IPRULE is not set
+  # CONFIG_BUSYBOX_CONFIG_IPNEIGH is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IP_ADDRESS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IP_LINK=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IP_ROUTE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_IP_TUNNEL is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IP_RULE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_IP_NEIGH=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+  # CONFIG_BUSYBOX_CONFIG_IPCALC is not set
+  # CONFIG_BUSYBOX_CONFIG_FAKEIDENTD is not set
+  # CONFIG_BUSYBOX_CONFIG_NAMEIF is not set
+  # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
+  CONFIG_BUSYBOX_CONFIG_NC=y
+  # CONFIG_BUSYBOX_CONFIG_NETCAT is not set
+  # CONFIG_BUSYBOX_CONFIG_NC_SERVER is not set
+  # CONFIG_BUSYBOX_CONFIG_NC_EXTRA is not set
+  # CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT is not set
+  CONFIG_BUSYBOX_CONFIG_NETMSG=y
+  CONFIG_BUSYBOX_CONFIG_NETSTAT=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG=y
+  CONFIG_BUSYBOX_CONFIG_NSLOOKUP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_NSLOOKUP_BIG=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set
+  CONFIG_BUSYBOX_CONFIG_NTPD=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_CONF is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_NTP_AUTH is not set
+  CONFIG_BUSYBOX_CONFIG_PING=y
+  CONFIG_BUSYBOX_CONFIG_PING6=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING=y
+  # CONFIG_BUSYBOX_CONFIG_PSCAN is not set
+  CONFIG_BUSYBOX_CONFIG_ROUTE=y
+  # CONFIG_BUSYBOX_CONFIG_SLATTACH is not set
+  # CONFIG_BUSYBOX_CONFIG_SSL_CLIENT is not set
+  # CONFIG_BUSYBOX_CONFIG_TC is not set
+  # CONFIG_BUSYBOX_CONFIG_TCPSVD is not set
+  # CONFIG_BUSYBOX_CONFIG_UDPSVD is not set
+  # CONFIG_BUSYBOX_CONFIG_TELNET is not set
+  # CONFIG_BUSYBOX_CONFIG_TELNETD is not set
+  CONFIG_BUSYBOX_CONFIG_TFTP=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
+  # CONFIG_BUSYBOX_CONFIG_TFTPD is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+  # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
+  # CONFIG_BUSYBOX_CONFIG_TLS is not set
+  CONFIG_BUSYBOX_CONFIG_TRACEROUTE=y
+  CONFIG_BUSYBOX_CONFIG_TRACEROUTE6=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+  # CONFIG_BUSYBOX_CONFIG_TUNCTL is not set
+  # CONFIG_BUSYBOX_CONFIG_VCONFIG is not set
+  # CONFIG_BUSYBOX_CONFIG_WGET is not set
+  # CONFIG_BUSYBOX_CONFIG_WHOIS is not set
+  # CONFIG_BUSYBOX_CONFIG_ZCIP is not set
+  # CONFIG_BUSYBOX_CONFIG_UDHCPD is not set
+  # CONFIG_BUSYBOX_CONFIG_DUMPLEASES is not set
+  # CONFIG_BUSYBOX_CONFIG_DHCPRELAY is not set
+  CONFIG_BUSYBOX_CONFIG_UDHCPC=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
+  CONFIG_BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+  # CONFIG_BUSYBOX_CONFIG_UDHCPC6 is not set
+  
+  #
+  # Common options for DHCP applets
+  #
+  CONFIG_BUSYBOX_CONFIG_UDHCPC_DEFAULT_INTERFACE=""
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_PORT is not set
+  CONFIG_BUSYBOX_CONFIG_UDHCP_DEBUG=0
+  CONFIG_BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+  CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q is not set
+  # end of Networking Utilities
+  
+  #
+  # Print Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_LPD is not set
+  # CONFIG_BUSYBOX_CONFIG_LPR is not set
+  # CONFIG_BUSYBOX_CONFIG_LPQ is not set
+  # end of Print Utilities
+  
+  #
+  # Mail Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_MAKEMIME is not set
+  # CONFIG_BUSYBOX_CONFIG_POPMAILDIR is not set
+  # CONFIG_BUSYBOX_CONFIG_REFORMIME is not set
+  # CONFIG_BUSYBOX_CONFIG_SENDMAIL is not set
+  # end of Mail Utilities
+  
+  #
+  # Process Utilities
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS is not set
+  CONFIG_BUSYBOX_CONFIG_FREE=y
+  # CONFIG_BUSYBOX_CONFIG_FUSER is not set
+  # CONFIG_BUSYBOX_CONFIG_IOSTAT is not set
+  CONFIG_BUSYBOX_CONFIG_KILL=y
+  CONFIG_BUSYBOX_CONFIG_KILLALL=y
+  # CONFIG_BUSYBOX_CONFIG_KILLALL5 is not set
+  # CONFIG_BUSYBOX_CONFIG_LSOF is not set
+  # CONFIG_BUSYBOX_CONFIG_MPSTAT is not set
+  # CONFIG_BUSYBOX_CONFIG_NMETER is not set
+  CONFIG_BUSYBOX_CONFIG_PGREP=y
+  # CONFIG_BUSYBOX_CONFIG_PKILL is not set
+  CONFIG_BUSYBOX_CONFIG_PIDOF=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT is not set
+  # CONFIG_BUSYBOX_CONFIG_PMAP is not set
+  # CONFIG_BUSYBOX_CONFIG_POWERTOP is not set
+  CONFIG_BUSYBOX_CONFIG_PS=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_PS_WIDE=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_PS_LONG is not set
+  # CONFIG_BUSYBOX_CONFIG_PSTREE is not set
+  # CONFIG_BUSYBOX_CONFIG_PWDX is not set
+  # CONFIG_BUSYBOX_CONFIG_SMEMCAP is not set
+  CONFIG_BUSYBOX_CONFIG_BB_SYSCTL=y
+  CONFIG_BUSYBOX_CONFIG_TOP=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_INTERACTIVE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_TOPMEM is not set
+  CONFIG_BUSYBOX_CONFIG_UPTIME=y
+  # CONFIG_BUSYBOX_CONFIG_WATCH is not set
+  # end of Process Utilities
+  
+  #
+  # Runit Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_CHPST is not set
+  # CONFIG_BUSYBOX_CONFIG_SETUIDGID is not set
+  # CONFIG_BUSYBOX_CONFIG_ENVUIDGID is not set
+  # CONFIG_BUSYBOX_CONFIG_ENVDIR is not set
+  # CONFIG_BUSYBOX_CONFIG_SOFTLIMIT is not set
+  # CONFIG_BUSYBOX_CONFIG_RUNSV is not set
+  # CONFIG_BUSYBOX_CONFIG_RUNSVDIR is not set
+  # CONFIG_BUSYBOX_CONFIG_SV is not set
+  # CONFIG_BUSYBOX_CONFIG_SVC is not set
+  # CONFIG_BUSYBOX_CONFIG_SVOK is not set
+  # CONFIG_BUSYBOX_CONFIG_SVLOGD is not set
+  # end of Runit Utilities
+  
+  #
+  # Shells
+  #
+  CONFIG_BUSYBOX_CONFIG_SH_IS_ASH=y
+  # CONFIG_BUSYBOX_CONFIG_SH_IS_HUSH is not set
+  # CONFIG_BUSYBOX_CONFIG_SH_IS_NONE is not set
+  # CONFIG_BUSYBOX_CONFIG_BASH_IS_ASH is not set
+  # CONFIG_BUSYBOX_CONFIG_BASH_IS_HUSH is not set
+  CONFIG_BUSYBOX_CONFIG_BASH_IS_NONE=y
+  CONFIG_BUSYBOX_CONFIG_SHELL_ASH=y
+  CONFIG_BUSYBOX_CONFIG_ASH=y
+  # CONFIG_BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
+  CONFIG_BUSYBOX_CONFIG_ASH_INTERNAL_GLOB=y
+  CONFIG_BUSYBOX_CONFIG_ASH_BASH_COMPAT=y
+  # CONFIG_BUSYBOX_CONFIG_ASH_BASH_SOURCE_CURDIR is not set
+  # CONFIG_BUSYBOX_CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set
+  CONFIG_BUSYBOX_CONFIG_ASH_JOB_CONTROL=y
+  CONFIG_BUSYBOX_CONFIG_ASH_ALIAS=y
+  CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
+  CONFIG_BUSYBOX_CONFIG_ASH_EXPAND_PRMT=y
+  # CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT is not set
+  # CONFIG_BUSYBOX_CONFIG_ASH_MAIL is not set
+  CONFIG_BUSYBOX_CONFIG_ASH_ECHO=y
+  CONFIG_BUSYBOX_CONFIG_ASH_PRINTF=y
+  CONFIG_BUSYBOX_CONFIG_ASH_TEST=y
+  # CONFIG_BUSYBOX_CONFIG_ASH_SLEEP is not set
+  # CONFIG_BUSYBOX_CONFIG_ASH_HELP is not set
+  CONFIG_BUSYBOX_CONFIG_ASH_GETOPTS=y
+  CONFIG_BUSYBOX_CONFIG_ASH_CMDCMD=y
+  # CONFIG_BUSYBOX_CONFIG_CTTYHACK is not set
+  # CONFIG_BUSYBOX_CONFIG_HUSH is not set
+  # CONFIG_BUSYBOX_CONFIG_SHELL_HUSH is not set
+  
+  #
+  # Options common to all shells
+  #
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SH_MATH=y
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SH_MATH_64=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SH_MATH_BASE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SH_STANDALONE is not set
+  CONFIG_BUSYBOX_CONFIG_FEATURE_SH_NOFORK=y
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SH_READ_FRAC is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE is not set
+  # CONFIG_BUSYBOX_CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
+  # end of Shells
+  
+  #
+  # System Logging Utilities
+  #
+  # CONFIG_BUSYBOX_CONFIG_KLOGD is not set
+  CONFIG_BUSYBOX_CONFIG_LOGGER=y
+  # CONFIG_BUSYBOX_CONFIG_LOGREAD is not set
+  # CONFIG_BUSYBOX_CONFIG_SYSLOGD is not set
+  # end of System Logging Utilities
+  
diff --git a/profiles/sonicfi_rap750e-h.yml b/profiles/sonicfi_rap750e-h.yml
new file mode 100755
index 000000000..ea038322e
--- /dev/null
+++ b/profiles/sonicfi_rap750e-h.yml
@@ -0,0 +1,16 @@
+---
+profile: sonicfi_rap750e_h
+target: ipq53xx
+subtarget: generic
+description: Build image for the SONICFI RAP750E-H
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750e_h-squashfs-sysupgrade.tar
+feeds:
+  - name: qca
+    path: ../../feeds/qca-wifi-7
+include:
+  - ucentral-ap
+packages:
+  - ipq53xx
+  - qca-ssdk-shell
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=512
\ No newline at end of file
diff --git a/profiles/zyxel_nwa130be.yml b/profiles/zyxel_nwa130be.yml
new file mode 100644
index 000000000..a29b2d2a1
--- /dev/null
+++ b/profiles/zyxel_nwa130be.yml
@@ -0,0 +1,16 @@
+---
+profile: zyxel_nwa130be
+target: ipq53xx
+subtarget: generic
+description: Build image for the zyxel nwa130be
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-zyxel_nwa130be-squashfs-sysupgrade.tar
+feeds:
+  - name: qca
+    path: ../../feeds/qca-wifi-7
+packages:
+  - ipq53xx
+  - qca-ssdk-shell
+include:
+  - ucentral-ap
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0