projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TDLS: Declare tdls_testing as extern in a header file
[mech_eap.git]
/
wpa_supplicant
/
ctrl_iface_unix.c
diff --git
a/wpa_supplicant/ctrl_iface_unix.c
b/wpa_supplicant/ctrl_iface_unix.c
index
2fc89a9
..
4db712f
100644
(file)
--- a/
wpa_supplicant/ctrl_iface_unix.c
+++ b/
wpa_supplicant/ctrl_iface_unix.c
@@
-15,7
+15,6
@@
#include <fcntl.h>
#ifdef __linux__
#include <sys/ioctl.h>
#include <fcntl.h>
#ifdef __linux__
#include <sys/ioctl.h>
-#include <linux/sockios.h>
#endif /* __linux__ */
#ifdef ANDROID
#include <cutils/sockets.h>
#endif /* __linux__ */
#ifdef ANDROID
#include <cutils/sockets.h>
@@
-90,7
+89,7
@@
static void wpas_ctrl_sock_debug(const char *title, int sock, const char *buf,
if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, &optlen) < 0)
sndbuf = -1;
if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, &optlen) < 0)
sndbuf = -1;
- if (ioctl(sock,
S
IOCOUTQ, &outq) < 0)
+ if (ioctl(sock,
T
IOCOUTQ, &outq) < 0)
outq = -1;
wpa_printf(level,
outq = -1;
wpa_printf(level,
@@
-289,7
+288,7
@@
static int wpas_ctrl_iface_throttle(int sock)
optlen = sizeof(sndbuf);
sndbuf = 0;
if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, &optlen) < 0 ||
optlen = sizeof(sndbuf);
sndbuf = 0;
if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, &optlen) < 0 ||
- ioctl(sock,
S
IOCOUTQ, &outq) < 0 ||
+ ioctl(sock,
T
IOCOUTQ, &outq) < 0 ||
sndbuf <= 0 || outq < 0)
return 0;
return outq > sndbuf / 2;
sndbuf <= 0 || outq < 0)
return 0;
return outq > sndbuf / 2;