Lines 1722-1728
Link Here
|
1722 |
return TRUE; |
1722 |
return TRUE; |
1723 |
case NM_DEVICE_STATE_ACTIVATED: |
1723 |
case NM_DEVICE_STATE_ACTIVATED: |
1724 |
/* Need to do further checks when activated */ |
1724 |
/* Need to do further checks when activated */ |
1725 |
break; |
1725 |
/* Don't scan when actived, and screw the checks */ |
|
|
1726 |
return FALSE; |
1726 |
} |
1727 |
} |
1727 |
|
1728 |
|
1728 |
/* Don't scan if the supplicant is busy */ |
1729 |
/* Don't scan if the supplicant is busy */ |
Lines 1789-1799
Link Here
|
1789 |
NMDeviceWifi *self = NM_DEVICE_WIFI (user_data); |
1790 |
NMDeviceWifi *self = NM_DEVICE_WIFI (user_data); |
1790 |
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); |
1791 |
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); |
1791 |
gboolean backoff = FALSE; |
1792 |
gboolean backoff = FALSE; |
|
|
1793 |
NMDeviceState state; |
1794 |
|
1795 |
state = nm_device_get_state (NM_DEVICE (self)); |
1792 |
|
1796 |
|
1793 |
if (check_scanning_allowed (self)) { |
1797 |
if (check_scanning_allowed (self)) { |
1794 |
if (nm_supplicant_interface_request_scan (priv->supplicant.iface)) { |
1798 |
if (nm_supplicant_interface_request_scan (priv->supplicant.iface)) { |
1795 |
/* success */ |
1799 |
if ((state == NM_DEVICE_STATE_ACTIVATED) || (nm_supplicant_interface_request_scan (priv->supplicant.iface))) { |
1796 |
backoff = TRUE; |
1800 |
/* success */ |
|
|
1801 |
backoff = TRUE; |
1802 |
} |
1797 |
} |
1803 |
} |
1798 |
} |
1804 |
} |
1799 |
|
1805 |
|