|
Lines 1036-1043
Link Here
|
| 1036 |
|
1036 |
|
| 1037 |
if (nm_supplicant_interface_get_scanning (priv->supplicant.iface)) |
1037 |
if (nm_supplicant_interface_get_scanning (priv->supplicant.iface)) |
| 1038 |
goto out; |
1038 |
goto out; |
| 1039 |
|
1039 |
if (state != NM_DEVICE_STATE_ACTIVATED) { |
| 1040 |
periodic_update (self); |
1040 |
periodic_update (self); |
|
|
1041 |
} |
| 1041 |
|
1042 |
|
| 1042 |
out: |
1043 |
out: |
| 1043 |
return TRUE; |
1044 |
return TRUE; |
|
Lines 1789-1804
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 |
|
| 1800 |
priv->pending_scan_id = 0; |
1806 |
priv->pending_scan_id = 0; |
| 1801 |
schedule_scan (self, backoff); |
1807 |
if ((state == NM_DEVICE_STATE_ACTIVATED) || (nm_supplicant_interface_request_scan (priv->supplicant.iface))) { |
|
|
1808 |
schedule_scan (self, backoff); |
| 1809 |
} |
| 1802 |
return FALSE; |
1810 |
return FALSE; |
| 1803 |
} |
1811 |
} |
| 1804 |
|
1812 |
|
|
Lines 1845-1851
Link Here
|
| 1845 |
/* Invalid combination; would cause continual rescheduling of |
1853 |
/* Invalid combination; would cause continual rescheduling of |
| 1846 |
* the scan and hog CPU. Reset to something minimally sane. |
1854 |
* the scan and hog CPU. Reset to something minimally sane. |
| 1847 |
*/ |
1855 |
*/ |
| 1848 |
priv->scan_interval = 5; |
1856 |
priv->scan_interval = 1; |
| 1849 |
} |
1857 |
} |
| 1850 |
} |
1858 |
} |
| 1851 |
} |
1859 |
} |
