diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 16:06:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 16:06:44 (GMT) |
| commit | b205fca78bcede0b2eefc8c0b12fed040e77eff1 (patch) | |
| tree | d2d836324535d5e9961be5e401dc47bde580750c /src/network/kernel | |
| parent | 2bb185d5e65be09b4e1f73eadd0ab87f9d6aecbb (diff) | |
| parent | bfa6ac28c57d62f9add7fa27f029eac7f3835fab (diff) | |
| download | Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.zip Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.tar.gz Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/network/kernel')
| -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 |