diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-26 01:40:32 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-26 01:40:32 (GMT) |
| commit | 848ddd11363479629ff384784937a099d94109df (patch) | |
| tree | 1d05c58ade52f9a20353ba73f551c74c66629bc2 | |
| parent | bd4ab4ae4074b4039617fd3afd224f894b9a65c7 (diff) | |
| parent | f17ba38d5380e458b50ae543b34c52b2a2df8e7e (diff) | |
| download | Qt-848ddd11363479629ff384784937a099d94109df.zip Qt-848ddd11363479629ff384784937a099d94109df.tar.gz Qt-848ddd11363479629ff384784937a099d94109df.tar.bz2 | |
Merge commit 'f17ba38d5380e458b50ae543b34c52b2a2df8e7e' into bearermanagement/staging
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index a95b14b..ccf1057 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -125,14 +125,11 @@ static QString qGetInterfaceType(const QString &interface) ifreq request; strncpy(request.ifr_name, interface.toLocal8Bit().data(), sizeof(request.ifr_name)); - if (ioctl(sock, SIOCGIFHWADDR, &request) >= 0) { - switch (request.ifr_hwaddr.sa_family) { - case ARPHRD_ETHER: - return QLatin1String("Ethernet"); - } - } - + int result = ioctl(sock, SIOCGIFHWADDR, &request); close(sock); + + if (result >= 0 && request.ifr_hwaddr.sa_family == ARPHRD_ETHER) + return QLatin1String("Ethernet"); #else Q_UNUSED(interface); #endif |