ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 23:42:43 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

hostapd: use config option CONFIG_NO_LINUX_PACKET_SOCKET_WAR

Browse Source 
Instead of patching the workaround away, just use the config option.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2019-05-04 01:58:53 +02:00
parent 167028b750
commit 9b4a27455c
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/hostapd/files/wpa_supplicant-basic.config
View File

@ -308,7 +308,7 @@ CONFIG_BACKEND=file
# in a bridge for EAPOL frames. This should be uncommented only if the kernel # in a bridge for EAPOL frames. This should be uncommented only if the kernel
# is known to not have the regression issue in packet socket behavior with # is known to not have the regression issue in packet socket behavior with
# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). # bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
# IEEE 802.11w (management frame protection), also known as PMF # IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w. # Driver support is also needed for IEEE 802.11w.

2
package/network/services/hostapd/files/wpa_supplicant-full.config
View File

@ -308,7 +308,7 @@ CONFIG_BACKEND=file
# in a bridge for EAPOL frames. This should be uncommented only if the kernel # in a bridge for EAPOL frames. This should be uncommented only if the kernel
# is known to not have the regression issue in packet socket behavior with # is known to not have the regression issue in packet socket behavior with
# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). # bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
# IEEE 802.11w (management frame protection), also known as PMF # IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w. # Driver support is also needed for IEEE 802.11w.

2
package/network/services/hostapd/files/wpa_supplicant-mini.config
View File

@ -308,7 +308,7 @@ CONFIG_BACKEND=file
# in a bridge for EAPOL frames. This should be uncommented only if the kernel # in a bridge for EAPOL frames. This should be uncommented only if the kernel
# is known to not have the regression issue in packet socket behavior with # is known to not have the regression issue in packet socket behavior with
# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). # bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
# IEEE 802.11w (management frame protection), also known as PMF # IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w. # Driver support is also needed for IEEE 802.11w.

2
package/network/services/hostapd/files/wpa_supplicant-p2p.config
View File

@ -308,7 +308,7 @@ CONFIG_BACKEND=file
# in a bridge for EAPOL frames. This should be uncommented only if the kernel # in a bridge for EAPOL frames. This should be uncommented only if the kernel
# is known to not have the regression issue in packet socket behavior with # is known to not have the regression issue in packet socket behavior with
# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). # bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
# IEEE 802.11w (management frame protection), also known as PMF # IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w. # Driver support is also needed for IEEE 802.11w.

12
package/network/services/hostapd/patches/120-disable_bridge_packet_workaround.patch
View File

@ -1,12 +0,0 @@
--- a/src/l2_packet/l2_packet_linux.c
+++ b/src/l2_packet/l2_packet_linux.c
@@ -360,8 +360,7 @@ struct l2_packet_data * l2_packet_init_b
l2 = l2_packet_init(br_ifname, own_addr, protocol, rx_callback,
rx_callback_ctx, l2_hdr);
- if (!l2)
- return NULL;
+ return l2;
#ifndef CONFIG_NO_LINUX_PACKET_SOCKET_WAR
/*