mirror of
				https://github.com/Telecominfraproject/wlan-ap.git
				synced 2025-10-30 18:07:52 +00:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			release/v2
			...
			release/v2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | bcd07e4a15 | ||
|   | 958e14efb0 | 
| @@ -1,7 +1,7 @@ | ||||
| From 8bf74d315b602791f87774abac95e3234f0d8c2e Mon Sep 17 00:00:00 2001 | ||||
| From a622ab0c15a2f58b724362339d6b467c02ee7576 Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Thu, 27 May 2021 13:24:47 +0200 | ||||
| Subject: [PATCH 11/59] netifd: update to latest HEAD | ||||
| Subject: [PATCH 01/57] netifd: update to latest HEAD | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
| @@ -14,7 +14,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
|  create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch | ||||
|  | ||||
| diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile | ||||
| index 7061456b08..19da03122f 100644 | ||||
| index 7061456b08..13c1d96ed7 100644 | ||||
| --- a/package/network/config/netifd/Makefile | ||||
| +++ b/package/network/config/netifd/Makefile | ||||
| @@ -5,16 +5,14 @@ PKG_RELEASE:=1 | ||||
| @@ -24,9 +24,9 @@ index 7061456b08..19da03122f 100644 | ||||
| -PKG_SOURCE_DATE:=2021-01-09 | ||||
| -PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1 | ||||
| -PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190 | ||||
| +PKG_SOURCE_DATE:=2021-08-27 | ||||
| +PKG_SOURCE_VERSION:=d590fbd255cecd4c3a4c267e7ca377772574cf72 | ||||
| +PKG_MIRROR_HASH:=f4f09672d12d58bc3f1ddceff2b917847386b8deaed8bca1b340f9a6a1cfecc4 | ||||
| +PKG_SOURCE_DATE:=2021-09-01 | ||||
| +PKG_SOURCE_VERSION:=300b1220fab38600f102bb8cfcc59a29ce41b095 | ||||
| +PKG_MIRROR_HASH:=310fa90059795b1c956f9822db712ecc58bc19725b0f05f98c9e0a6824c8ca36 | ||||
|  PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> | ||||
|   | ||||
|  PKG_LICENSE:=GPL-2.0 | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| From bb2c5ff83be37b0bb951059e457192a7bed9388f Mon Sep 17 00:00:00 2001 | ||||
| From b70c9429587452776241c95729481accb9c193ae Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Thu, 27 May 2021 13:25:19 +0200 | ||||
| Subject: [PATCH 01/43] hostapd: upsate to latest HEAD | ||||
| Subject: [PATCH 03/57] hostapd: upsate to latest HEAD | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
| @@ -66,13 +66,13 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
|  .../720-ACS-fix-channel-100-frequency.patch   |  30 ++ | ||||
|  .../patches/720-iface_max_num_sta.patch       |  82 ++++++ | ||||
|  .../hostapd/patches/730-ft_iface.patch        |  38 +++ | ||||
|  .../hostapd/patches/740-snoop_iface.patch     |  37 +++ | ||||
|  .../hostapd/patches/740-snoop_iface.patch     |  66 +++++ | ||||
|  ...ate-if-no-available-channel-is-found.patch |  37 --- | ||||
|  ...of-secondary-device-types-for-P2P-gr.patch |  33 --- | ||||
|  .../services/hostapd/src/src/ap/ubus.c        | 214 +++++++++++++- | ||||
|  .../services/hostapd/src/src/ap/ubus.h        |  16 + | ||||
|  .../hostapd/src/src/utils/build_features.h    |   2 - | ||||
|  67 files changed, 1300 insertions(+), 2331 deletions(-) | ||||
|  67 files changed, 1329 insertions(+), 2331 deletions(-) | ||||
|  delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch | ||||
|  create mode 100644 package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch | ||||
|  delete mode 100644 package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch | ||||
| @@ -5325,10 +5325,10 @@ index 0000000000..793e8e0194 | ||||
| + 		if (!hapd->l2) { | ||||
| diff --git a/package/network/services/hostapd/patches/740-snoop_iface.patch b/package/network/services/hostapd/patches/740-snoop_iface.patch | ||||
| new file mode 100644 | ||||
| index 0000000000..722d1e713a | ||||
| index 0000000000..8d928f8505 | ||||
| --- /dev/null | ||||
| +++ b/package/network/services/hostapd/patches/740-snoop_iface.patch | ||||
| @@ -0,0 +1,37 @@ | ||||
| @@ -0,0 +1,66 @@ | ||||
| +--- a/src/ap/ap_config.h | ||||
| ++++ b/src/ap/ap_config.h | ||||
| +@@ -278,6 +278,7 @@ struct hostapd_bss_config { | ||||
| @@ -5341,7 +5341,36 @@ index 0000000000..722d1e713a | ||||
| +  | ||||
| +--- a/src/ap/x_snoop.c | ||||
| ++++ b/src/ap/x_snoop.c | ||||
| +@@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat | ||||
| +@@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha | ||||
| + 		return -1; | ||||
| + 	} | ||||
| +  | ||||
| +-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE, | ||||
| ++	if (!conf->snoop_iface[0] && | ||||
| ++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE, | ||||
| + 					 1)) { | ||||
| + 		wpa_printf(MSG_DEBUG, | ||||
| + 			   "x_snoop: Failed to enable hairpin_mode on the bridge port"); | ||||
| + 		return -1; | ||||
| + 	} | ||||
| +  | ||||
| +-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) { | ||||
| ++	if (!conf->snoop_iface[0] && | ||||
| ++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) { | ||||
| + 		wpa_printf(MSG_DEBUG, | ||||
| + 			   "x_snoop: Failed to enable proxyarp on the bridge port"); | ||||
| + 		return -1; | ||||
| +@@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha | ||||
| + 	} | ||||
| +  | ||||
| + #ifdef CONFIG_IPV6 | ||||
| +-	if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) { | ||||
| ++	if (!conf->snoop_iface[0] && | ||||
| ++	    hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) { | ||||
| + 		wpa_printf(MSG_DEBUG, | ||||
| + 			   "x_snoop: Failed to enable multicast snooping on the bridge"); | ||||
| + 		return -1; | ||||
| +@@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat | ||||
| + { | ||||
| + 	struct hostapd_bss_config *conf = hapd->conf; | ||||
| + 	struct l2_packet_data *l2; | ||||
|   | ||||
| @@ -6,7 +6,7 @@ PKG_RELEASE:=1 | ||||
| PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git | ||||
| PKG_SOURCE_PROTO:=git | ||||
| PKG_SOURCE_DATE:=2021-02-15 | ||||
| PKG_SOURCE_VERSION:=b96c05524e01d0014dc9348d5c9350529f31b7d8 | ||||
| PKG_SOURCE_VERSION:=8dd7c83a1c7a290edf0575cbcba450d3bc91bbbe | ||||
|  | ||||
| PKG_MAINTAINER:=John Crispin <john@phrozen.org> | ||||
| PKG_LICENSE:=BSD-3-Clause | ||||
|   | ||||
| @@ -10,7 +10,36 @@ | ||||
|   | ||||
| --- a/src/ap/x_snoop.c | ||||
| +++ b/src/ap/x_snoop.c | ||||
| @@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat | ||||
| @@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha | ||||
|  		return -1; | ||||
|  	} | ||||
|   | ||||
| -	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE, | ||||
| +	if (!conf->snoop_iface[0] && | ||||
| +	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE, | ||||
|  					 1)) { | ||||
|  		wpa_printf(MSG_DEBUG, | ||||
|  			   "x_snoop: Failed to enable hairpin_mode on the bridge port"); | ||||
|  		return -1; | ||||
|  	} | ||||
|   | ||||
| -	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) { | ||||
| +	if (!conf->snoop_iface[0] && | ||||
| +	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) { | ||||
|  		wpa_printf(MSG_DEBUG, | ||||
|  			   "x_snoop: Failed to enable proxyarp on the bridge port"); | ||||
|  		return -1; | ||||
| @@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha | ||||
|  	} | ||||
|   | ||||
|  #ifdef CONFIG_IPV6 | ||||
| -	if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) { | ||||
| +	if (!conf->snoop_iface[0] && | ||||
| +	    hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) { | ||||
|  		wpa_printf(MSG_DEBUG, | ||||
|  			   "x_snoop: Failed to enable multicast snooping on the bridge"); | ||||
|  		return -1; | ||||
| @@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat | ||||
|  { | ||||
|  	struct hostapd_bss_config *conf = hapd->conf; | ||||
|  	struct l2_packet_data *l2; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user