diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 16:43:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 16:43:30 (GMT) |
| commit | 7744f0d6bf5a8c4395ecf1a2bfe09c392e8d8cd1 (patch) | |
| tree | 6df370a52ba46fb4dbc70fa2bef1d2e6a75f8a82 /src | |
| parent | 79676734cc36ef9cf56cf4b09c86e2199aef5a30 (diff) | |
| parent | 004ad12669ef696eeba70fd57d1eb0c67c806d1d (diff) | |
| download | Qt-7744f0d6bf5a8c4395ecf1a2bfe09c392e8d8cd1.zip Qt-7744f0d6bf5a8c4395ecf1a2bfe09c392e8d8cd1.tar.gz Qt-7744f0d6bf5a8c4395ecf1a2bfe09c392e8d8cd1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix incorrect hardware address on systems without getifaddrs()
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 6098bde..7f251a7 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -219,7 +219,7 @@ static QNetworkInterfacePrivate *findInterface(int socket, QList<QNetworkInterfa #ifdef SIOCGIFHWADDR // Get the HW address if (qt_safe_ioctl(socket, SIOCGIFHWADDR, &req) >= 0) { - uchar *addr = (uchar *)&req.ifr_addr; + uchar *addr = (uchar *)req.ifr_addr.sa_data; iface->hardwareAddress = iface->makeHwAddress(6, addr); } #endif |