[src/trunk]: src/external/bsd/wpa/dist/src/drivers Downing the interface now ...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff5af0dbc6c6
branches:  trunk
changeset: 343027:ff5af0dbc6c6
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Jan 19 17:22:57 2016 +0000

description:
Downing the interface now disables it instead of removing it.

diffstat:

 external/bsd/wpa/dist/src/drivers/driver_bsd.c |  26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diffs (54 lines):

diff -r 601773cfc571 -r ff5af0dbc6c6 external/bsd/wpa/dist/src/drivers/driver_bsd.c
--- a/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Tue Jan 19 17:10:55 2016 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Tue Jan 19 17:22:57 2016 +0000
@@ -288,6 +288,7 @@
                           strerror(errno));
                return -1;
        }
+       drv->flags = ifr.ifr_flags;
 
        if (enable) {
                if (ifr.ifr_flags & IFF_UP)
@@ -305,6 +306,7 @@
                return -1;
        }
 
+       drv->flags = ifr.ifr_flags;
        return 0;
 }
 
@@ -1298,28 +1300,16 @@
                        return;
                if ((ifm->ifm_flags & IFF_UP) == 0 &&
                    (drv->flags & IFF_UP) != 0) {
-                       os_strlcpy(event.interface_status.ifname, drv->ifname,
-                                  sizeof(event.interface_status.ifname));
-                       event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
                        wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
-                                  event.interface_status.ifname);
-                       wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
-                                            &event);
+                                  drv->ifname);
+                       wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
+                                            NULL);
                } else if ((ifm->ifm_flags & IFF_UP) != 0 &&
                    (drv->flags & IFF_UP) == 0) {
-                       os_strlcpy(event.interface_status.ifname, drv->ifname,
-                               sizeof(event.interface_status.ifname));
-                       event.interface_status.ievent = EVENT_INTERFACE_ADDED;
                        wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
-                                  event.interface_status.ifname);
-                       wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
-                                            &event);
-               } else {
-                       os_strlcpy(event.interface_status.ifname, drv->ifname,
-                               sizeof(event.interface_status.ifname));
-                       wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' "
-                           "if=%x drv=%x", event.interface_status.ifname,
-                           ifm->ifm_flags, drv->flags);
+                                  drv->ifname);
+                       wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,
+                                            NULL);
                }
                drv->flags = ifm->ifm_flags;
                break;