diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /src/core/nm-dispatcher.h | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'src/core/nm-dispatcher.h')
| -rw-r--r-- | src/core/nm-dispatcher.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/nm-dispatcher.h b/src/core/nm-dispatcher.h index d588de4e..8e4f01cb 100644 --- a/src/core/nm-dispatcher.h +++ b/src/core/nm-dispatcher.h @@ -19,11 +19,14 @@ typedef enum { NM_DISPATCHER_ACTION_VPN_UP, NM_DISPATCHER_ACTION_VPN_PRE_DOWN, NM_DISPATCHER_ACTION_VPN_DOWN, - NM_DISPATCHER_ACTION_DHCP4_CHANGE, - NM_DISPATCHER_ACTION_DHCP6_CHANGE, + NM_DISPATCHER_ACTION_DHCP_CHANGE_4, + NM_DISPATCHER_ACTION_DHCP_CHANGE_6, NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE } NMDispatcherAction; +#define NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4) \ + ((IS_IPv4) ? NM_DISPATCHER_ACTION_DHCP_CHANGE_4 : NM_DISPATCHER_ACTION_DHCP_CHANGE_6) + typedef struct NMDispatcherCallId NMDispatcherCallId; typedef void (*NMDispatcherFunc)(NMDispatcherCallId *call_id, gpointer user_data); |