[src/trunk]: src/external/bsd/wpa/dist/src/drivers wpa: reduce diff with upst...

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

details:   https://anonhg.NetBSD.org/src/rev/17773b82acca
branches:  trunk
changeset: 744309:17773b82acca
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Jan 29 12:05:08 2020 +0000

description:
wpa: reduce diff with upstream

diffstat:

 external/bsd/wpa/dist/src/drivers/driver_bsd.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 3c324ec95638 -r 17773b82acca external/bsd/wpa/dist/src/drivers/driver_bsd.c
--- a/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Wed Jan 29 11:57:36 2020 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Wed Jan 29 12:05:08 2020 +0000
@@ -9,11 +9,12 @@
 
 #include "includes.h"
 #include <sys/ioctl.h>
-#include <sys/param.h>
 
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_common.h"
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -43,8 +44,6 @@
 #include <net80211/ieee80211_netbsd.h>
 #endif
 
-#include "common/ieee802_11_defs.h"
-#include "common/wpa_common.h"
 #include "l2_packet/l2_packet.h"
 
 struct bsd_driver_global {
@@ -138,7 +137,7 @@
        ireq->i_data = arg;
 
        if (ioctl(drv->global->sock, SIOCG80211, ireq) < 0) {
-               wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, "
+               wpa_printf(MSG_ERROR, "ioctl[SIOCG80211, op=%u, "
                           "arg_len=%u]: %s", op, arg_len, strerror(errno));
                return -1;
        }
@@ -1570,7 +1569,7 @@
 #ifdef RO_MSGFILTER
        if (setsockopt(global->route, PF_ROUTE, RO_MSGFILTER,
            &msgfilter, sizeof(msgfilter)) < 0)
-               wpa_printf(MSG_ERROR, "setsockopt[PF_ROUTE,RO_MSGFILTER]: %s",
+               wpa_printf(MSG_ERROR, "socket[PF_ROUTE,RO_MSGFILTER]: %s",
                           strerror(errno));
 #endif