diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2022-05-17 15:30:19 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2022-05-17 15:30:19 +0200 |
| commit | 1e636d8e5e986b9f2260c36bb87fb499d724085c (patch) | |
| tree | ac613b9372adf622496a7d616050d7e1c09b4fba /src/core/nm-l3cfg.h | |
| parent | f4966e573c855d4667e6c236d8197d9949020e21 (diff) | |
| parent | 1a31bc3c63474ca02c83b02add85ea4e740e5597 (diff) | |
Merge remote-tracking branch 'debian/debian/master' into ubuntu/master
Diffstat (limited to 'src/core/nm-l3cfg.h')
| -rw-r--r-- | src/core/nm-l3cfg.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/core/nm-l3cfg.h b/src/core/nm-l3cfg.h index 0ea68646..f6ec39ce 100644 --- a/src/core/nm-l3cfg.h +++ b/src/core/nm-l3cfg.h @@ -363,15 +363,6 @@ typedef enum _nm_packed { /* Don't touch the interface. */ NM_L3_CFG_COMMIT_TYPE_NONE, - /* ASSUME means to keep any pre-existing extra routes/addresses, while - * also not adding routes/addresses that are not present yet. This is to - * gracefully take over after restart, where the existing IP configuration - * should not change. - * - * The flag NM_L3CFG_CONFIG_FLAGS_ASSUME_CONFIG_ONCE can make certain addresses/ - * routes commitable also during "assume". */ - NM_L3_CFG_COMMIT_TYPE_ASSUME, - /* UPDATE means to add new addresses/routes, while also removing addresses/routes * that are no longer present (but were previously configured by NetworkManager). * Routes/addresses that were removed externally won't be re-added, and routes/addresses |