Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63

1 files changed, 6 insertions, 6 deletions

diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index 01c082059f..d3c830a66f 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -277,18 +277,18 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
             }
         }
 
-        // Get the interface netmask
-        if (qt_safe_ioctl(socket, SIOCGIFNETMASK, &req) >= 0) {
-            sockaddr *sa = &req.ifr_addr;
-	    entry.setNetmask(addressFromSockaddr(sa));
-        }
-
         // Get the address of the interface
         if (qt_safe_ioctl(socket, SIOCGIFADDR, &req) >= 0) {
             sockaddr *sa = &req.ifr_addr;
             entry.setIp(addressFromSockaddr(sa));
         }
 
+        // Get the interface netmask
+        if (qt_safe_ioctl(socket, SIOCGIFNETMASK, &req) >= 0) {
+            sockaddr *sa = &req.ifr_addr;
+            entry.setNetmask(addressFromSockaddr(sa));
+        }
+
         iface->addressEntries << entry;
     }