diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-07-05 19:20:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-07-05 20:51:40 +0000 |
| commit | 6c935dc74fa9e997144499d7aa34ef5aad389fbb (patch) | |
| tree | 7d34363555f5aa115d850c02279d02646348731a /src/network/socket | |
| parent | b073ba57f821b2e79c553f974d9fba2cbb034ee9 (diff) | |
| parent | b5695bd5be908970244919bcd7c19cbf7ccca2c4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 7ef9d7f26b..fcb8a60c8f 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -902,10 +902,7 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS if (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_RECVIF && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(sockaddr_dl))) { sockaddr_dl *sdl = reinterpret_cast<sockaddr_dl *>(CMSG_DATA(cmsgptr)); -# if defined(Q_OS_OPENBSD) -# define LLINDEX(s) ((s)->sdl_index) -# endif - header->ifindex = LLINDEX(sdl); + header->ifindex = sdl->sdl_index; } # endif #endif |