diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /libnm-core/nm-setting-team.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'libnm-core/nm-setting-team.h')
| -rw-r--r-- | libnm-core/nm-setting-team.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index cd766d8e..a600053a 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -57,19 +57,19 @@ typedef struct NMTeamLinkWatcher NMTeamLinkWatcher; GType nm_team_link_watcher_get_type (void); NM_AVAILABLE_IN_1_12 -NMTeamLinkWatcher *nm_team_link_watcher_new_ethtool (gint delay_up, - gint delay_down, +NMTeamLinkWatcher *nm_team_link_watcher_new_ethtool (int delay_up, + int delay_down, GError **error); NM_AVAILABLE_IN_1_12 -NMTeamLinkWatcher *nm_team_link_watcher_new_nsna_ping (gint init_wait, - gint interval, - gint missed_max, +NMTeamLinkWatcher *nm_team_link_watcher_new_nsna_ping (int init_wait, + int interval, + int missed_max, const char *target_host, GError **error); NM_AVAILABLE_IN_1_12 -NMTeamLinkWatcher *nm_team_link_watcher_new_arp_ping (gint init_wait, - gint interval, - gint missed_max, +NMTeamLinkWatcher *nm_team_link_watcher_new_arp_ping (int init_wait, + int interval, + int missed_max, const char *target_host, const char *source_host, NMTeamLinkWatcherArpPingFlags flags, @@ -174,13 +174,13 @@ NMSetting * nm_setting_team_new (void); const char * nm_setting_team_get_config (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_notify_peers_count (NMSettingTeam *setting); +int nm_setting_team_get_notify_peers_count (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_notify_peers_interval (NMSettingTeam *setting); +int nm_setting_team_get_notify_peers_interval (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_mcast_rejoin_count (NMSettingTeam *setting); +int nm_setting_team_get_mcast_rejoin_count (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_mcast_rejoin_interval (NMSettingTeam *setting); +int nm_setting_team_get_mcast_rejoin_interval (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 const char * nm_setting_team_get_runner (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 @@ -188,15 +188,15 @@ const char * nm_setting_team_get_runner_hwaddr_policy (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 const char * nm_setting_team_get_runner_tx_balancer (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_runner_tx_balancer_interval (NMSettingTeam *setting); +int nm_setting_team_get_runner_tx_balancer_interval (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 gboolean nm_setting_team_get_runner_active (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 gboolean nm_setting_team_get_runner_fast_rate (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_runner_sys_prio (NMSettingTeam *setting); +int nm_setting_team_get_runner_sys_prio (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_runner_min_ports (NMSettingTeam *setting); +int nm_setting_team_get_runner_min_ports (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 const char * nm_setting_team_get_runner_agg_select_policy (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 |