Merge lp://qastaging/~phablet-team/network-manager/lp1461593-wily into lp://qastaging/~network-manager/network-manager/ubuntu
Status: | Merged |
---|---|
Approved by: | Mathieu Trudel-Lapierre |
Approved revision: | 969 |
Merged at revision: | 968 |
Proposed branch: | lp://qastaging/~phablet-team/network-manager/lp1461593-wily |
Merge into: | lp://qastaging/~network-manager/network-manager/ubuntu |
Prerequisite: | lp://qastaging/~phablet-team/network-manager/lp1435776-wily |
Diff against target: |
331 lines (+223/-10) 6 files modified
debian/changelog (+10/-0) debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch (+16/-9) debian/patches/add_ofono_settings_support.patch (+5/-1) debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch (+117/-0) debian/patches/lp1461593-add-nm-settings-connection-reset-retries-methods.patch (+73/-0) debian/patches/series (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~phablet-team/network-manager/lp1461593-wily |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
Review via email: mp+264894@code.qastaging.launchpad.net |
Description of the change
This change adds a 5s delay into NM_POLICY's re-connect logic, specifically so that the retry_limit of the associated connection isn't exhausted immediately whenever the connection drops, which then used to result in a 5m timer being set.
There are two changes...
1. The afore-mentioned 5m timer is now reduced to 30s for modem devices. In theory, connections shouldn't be getting disabled anymore due to the above fix, so this is a just-in-case change.
2. The low-level NM_MODEM_OFONO code wasn't setting the modem state to DISCONNECTING when disconnect() was called. This is now done, and in the associated callback ( disconnect_cb ) the new state is now determined by the ofono cached properties ( online && powered && attached ).
Ofono bits probably should be folded in to the main patch; anything that touches the core NM code should be split out by itself, so that we can upstream just that independently from any ofono support code.
If you want, I could possibly do the patch mangling.