sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase src r361272:

Browse source 
Silence the once per second CTRL-EVENT-SCAN-FAILED errors when the WiFi
radio is disabled through the communication device toggle key (also known
as the RF raidio kill button). Only the CTRL-EVENT-DISCONNECTED will be
issued.

Submitted by:	avg
Reported by:	avg
MFH:		2020Q2
This commit is contained in:
Cy Schubert 2020-05-20 04:20:01 +00:00
parent c16b608701
commit a2e3d8c958
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=535967
4 changed files with 52 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/hostapd/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= hostapd
PORTVERSION= 2.9
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://w1.fi/releases/

30
net/hostapd/files/patch-src_drivers_driver__bsd.c
View file

@ -1,8 +1,8 @@
--- src/drivers/driver_bsd.c.orig 2015-09-27 19:02:05 UTC
+++ src/drivers/driver_bsd.c
@@ -623,7 +623,11 @@ rtbuf_len(void)
--- src/drivers/driver_bsd.c.orig2 2019-08-07 06:25:25.000000000 -0700
+++ src/drivers/driver_bsd.c 2020-05-19 21:11:18.891164000 -0700
@@ -665,7 +665,11 @@
static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
int reason_code);
u16 reason_code);
+#ifdef __DragonFly__
+const char *
@ -12,3 +12,25 @@
ether_sprintf(const u8 *addr)
{
static char buf[sizeof(MACSTR)];
@@ -1336,14 +1340,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL)
return;
- if ((ifm->ifm_flags & IFF_UP) == 0 &&
- (drv->flags & IFF_UP) != 0) {
+ if (((ifm->ifm_flags & IFF_UP) == 0 ||
+ (ifm->ifm_flags & IFF_RUNNING) == 0) &&
+ (drv->flags & IFF_UP) != 0 &&
+ (drv->flags & IFF_RUNNING) != 0) {
wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
drv->ifname);
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
NULL);
} else if ((ifm->ifm_flags & IFF_UP) != 0 &&
- (drv->flags & IFF_UP) == 0) {
+ (ifm->ifm_flags & IFF_RUNNING) != 0 &&
+ ((drv->flags & IFF_UP) == 0 ||
+ (drv->flags & IFF_RUNNING) == 0)) {
wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
drv->ifname);
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,

2
security/wpa_supplicant/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= wpa_supplicant
PORTVERSION= 2.9
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= security net
MASTER_SITES= https://w1.fi/releases/

24
security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c Normal file
View file

@ -0,0 +1,24 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700
+++ src/drivers/driver_bsd.c 2020-05-19 18:17:48.607660000 -0700
@@ -1336,14 +1336,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL)
return;
- if ((ifm->ifm_flags & IFF_UP) == 0 &&
- (drv->flags & IFF_UP) != 0) {
+ if (((ifm->ifm_flags & IFF_UP) == 0 ||
+ (ifm->ifm_flags & IFF_RUNNING) == 0) &&
+ (drv->flags & IFF_UP) != 0 &&
+ (drv->flags & IFF_RUNNING) != 0) {
wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
drv->ifname);
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
NULL);
} else if ((ifm->ifm_flags & IFF_UP) != 0 &&
- (drv->flags & IFF_UP) == 0) {
+ (ifm->ifm_flags & IFF_RUNNING) != 0 &&
+ ((drv->flags & IFF_UP) == 0 ||
+ (drv->flags & IFF_RUNNING) == 0)) {
wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
drv->ifname);
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,