Commit a956996e authored by Jan Grulich's avatar Jan Grulich

Merge branch 'Plasma/5.10'

parents aba4b9c4 029e8170
......@@ -308,7 +308,7 @@ void KCMNetworkmanagement::onRequestCreateConnection(int connectionType, const Q
if (wifiDev) {
if (wifiDev->wirelessCapabilities().testFlag(NetworkManager::WirelessDevice::ApCap)) {
wifiSetting->setMode(NetworkManager::WirelessSetting::Ap);
wifiSetting->setMacAddress(NetworkManager::macAddressFromString(wifiDev->hardwareAddress()));
wifiSetting->setMacAddress(NetworkManager::macAddressFromString(wifiDev->permanentHardwareAddress()));
}
}
}
......
......@@ -143,9 +143,9 @@ QVariant HwAddrComboBox::hwAddressFromDevice(const NetworkManager::Device::Ptr&
QVariant data;
if (type == NetworkManager::Device::Ethernet) {
data = device->as<NetworkManager::WiredDevice>()->hardwareAddress();
data = device->as<NetworkManager::WiredDevice>()->permanentHardwareAddress();
} else if (type == NetworkManager::Device::Wifi) {
data = device->as<NetworkManager::WirelessDevice>()->hardwareAddress();
data = device->as<NetworkManager::WirelessDevice>()->permanentHardwareAddress();
} else if (type == NetworkManager::Device::Bluetooth) {
data = device->as<NetworkManager::BluetoothDevice>()->hardwareAddress();
} else if (type == NetworkManager::Device::OlpcMesh) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment