Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpa: reduce diff with upstream

Browse Source
This commit is contained in:
roy 2020-01-29 12:05:08 +00:00
parent 7f802f6689
commit 7e3fe3ae49
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/bsd/wpa/dist/src/drivers/driver_bsd.c vendored
View File

@ -9,11 +9,12 @@
#include "includes.h" #include "includes.h"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/param.h>
#include "common.h" #include "common.h"
#include "driver.h" #include "driver.h"
#include "eloop.h" #include "eloop.h"
#include "common/ieee802_11_defs.h"
#include "common/wpa_common.h"
#include <net/if.h> #include <net/if.h>
#include <net/if_media.h> #include <net/if_media.h>
@ -43,8 +44,6 @@
#include <net80211/ieee80211_netbsd.h> #include <net80211/ieee80211_netbsd.h>
#endif #endif
#include "common/ieee802_11_defs.h"
#include "common/wpa_common.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
struct bsd_driver_global { struct bsd_driver_global {
@ -138,7 +137,7 @@ bsd_get80211(void *priv, struct ieee80211req *ireq, int op, void *arg,
ireq->i_data = arg; ireq->i_data = arg;
if (ioctl(drv->global->sock, SIOCG80211, ireq) < 0) { 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)); "arg_len=%u]: %s", op, arg_len, strerror(errno));
return -1; return -1;
} }
@ -1570,7 +1569,7 @@ bsd_global_init(void *ctx)
#ifdef RO_MSGFILTER #ifdef RO_MSGFILTER
if (setsockopt(global->route, PF_ROUTE, RO_MSGFILTER, if (setsockopt(global->route, PF_ROUTE, RO_MSGFILTER,
&msgfilter, sizeof(msgfilter)) < 0) &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)); strerror(errno));
#endif #endif