From 31afdd227438e1c927f3b5c70c0c366ceb95eec8 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 26 Mar 2016 11:40:35 +0200 Subject: [PATCH] Use TIOCOUTQ instead of SIOCOUTQ to avoid need for linux/sockios.h All that the kernel header was doing here is defining SIOCOUTQ to be TIOCOUTQ. Instead of pulling in the header, we might as well use TIOCOUTQ directly. Signed-off-by: Jouni Malinen --- wpa_supplicant/ctrl_iface_unix.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c index 2fc89a926..4db712fff 100644 --- a/wpa_supplicant/ctrl_iface_unix.c +++ b/wpa_supplicant/ctrl_iface_unix.c @@ -15,7 +15,6 @@ #include #ifdef __linux__ #include -#include #endif /* __linux__ */ #ifdef ANDROID #include @@ -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 (ioctl(sock, SIOCOUTQ, &outq) < 0) + if (ioctl(sock, TIOCOUTQ, &outq) < 0) 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 || - ioctl(sock, SIOCOUTQ, &outq) < 0 || + ioctl(sock, TIOCOUTQ, &outq) < 0 || sndbuf <= 0 || outq < 0) return 0; return outq > sndbuf / 2;