WIFI-14603 Default TC fq_codel queue on GRE cause low GRE RX throughput

Signed-off-by: Ken <xshi@actiontec.com>

feeds/qca-wifi-7/hostapd/patches/zzz-roaming-key.patch

@@ -1,4 +1,3 @@
-unchanged:
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
 @@ -3003,6 +3003,8 @@ static int hostapd_config_fill(struct ho
@@ -10,10 +9,12 @@ unchanged:
  #endif /* CONFIG_IEEE80211R_AP */
  #ifndef CONFIG_NO_CTRL_IFACE
  	} else if (os_strcmp(buf, "ctrl_interface") == 0) {
-@@ -4982,6 +4982,19 @@ struct hostapd_config * hostapd_config_r
- 	fclose(f);
+@@ -4958,8 +4960,22 @@ int hostapd_set_iface(struct hostapd_con
+ 		return -1;
+ 	}
  
- 	for (i = 0; i < conf->num_bss; i++) {
+-	for (i = 0; i < conf->num_bss; i++)
++	for (i = 0; i < conf->num_bss; i++) {
 +		if (*conf->bss[i]->ft_key) {
 +			u8 buffer[128];
 +			sprintf(buffer, "%02X:%02X:%02X:%02X:%02X:%02X %02X%02X%02X%02X%02X%02X %s", MAC2STR(conf->bss[i]->bssid), MAC2STR(conf->bss[i]->bssid), conf->bss[i]->ft_key);
@@ -24,12 +25,14 @@ unchanged:
 +			add_r0kh(conf->bss[i], buffer);
 +			sprintf(buffer, "00:00:00:00:00:00 00:00:00:00:00:00 %s", conf->bss[i]->ft_key);
 +			add_r1kh(conf->bss[i], buffer);
-+			hexstr2bin(conf->bss[i]->bssid, conf->bss[i]->r1_key_holder, FT_R1KH_ID_LEN);
++			hexstr2bin(conf->bss[i]->bssid, conf->bss[i]->r1_key_holder, FT_R1KH_ID_LEN); 
 +			conf->bss[i]->r0_key_holder_bssid = 1;
 +		}
- 		hostapd_set_security_params(conf->bss[i], 1);
- #ifdef CONFIG_IEEE80211BE
- 		if (conf->ieee80211be && conf->bss[i]->ieee80211w > 0
+ 		hostapd_set_security_params(conf->bss[i], 0);
++	}
+ 
+ 	if (hostapd_config_check(conf, 0)) {
+ 		wpa_printf(MSG_ERROR, "Configuration check failed");
 --- a/src/ap/ap_config.h
 +++ b/src/ap/ap_config.h
 @@ -398,6 +398,7 @@ struct hostapd_bss_config {

feeds/qca-wifi-7/hostapd/src/src/ap/ucode.c

@@ -785,7 +785,6 @@ int hostapd_ucode_sta_auth(struct hostapd_data *hapd, struct sta_info *sta)
 
 void hostapd_ucode_sta_connected(struct hostapd_data *hapd, struct sta_info *sta)
 {
-	struct hostapd_sta_wpa_psk_short *psk = sta->psk;
 	char addr[sizeof(MACSTR)];
 	uc_value_t *val, *cur;
 	int ret = 0;
@@ -802,8 +801,6 @@ void hostapd_ucode_sta_connected(struct hostapd_data *hapd, struct sta_info *sta
 	val = ucv_object_new(vm);
 	if (sta->psk_idx)
 		ucv_object_add(val, "psk_idx", ucv_int64_new(sta->psk_idx - 1));
-	if (sta->psk)
-		ucv_object_add(val, "psk", ucv_string_new(sta->psk->passphrase));
 	uc_value_push(ucv_get(val));
 
 	val = wpa_ucode_call(3);

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -69,9 +69,6 @@ qcom_setup_macs()
         edgecore,eap105)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 lan_mac=$(macaddr_add "$wan_mac" 1)
-                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)
 		;;
         sonicfi,rap7110c-341x|\
         sonicfi,rap750e-h)

feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/iface/85-greqos

@@ -0,0 +1,20 @@
+# /etc/hotplug.d/iface/85-greqos
+[ "$ACTION" == "ifup" ] || exit 0
+
+. /lib/functions.sh
+
+case "$(board_name)" in
+cig,wf189|\
+cig,wf189w|\
+cig,wf189h|\
+cig,wf672)
+    case "$INTERFACE" in
+      gre*)
+        dev=$(ubus call network.interface.$INTERFACE status | jsonfilter -e '@.l3_device')
+        [ -n "$dev" ] && {
+          tc qdisc del dev $dev root 2>/dev/null
+          tc qdisc add dev $dev root noqueue
+        }
+        ;;
+    esac
+esac