diff options
| author | Karsten Hopp <karsten@redhat.com> | 2011-04-12 15:38:08 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-04-12 15:38:08 -0500 |
| commit | 38d3f0b181bd214ba1202cc11d7d518ae79428dc (patch) | |
| tree | 5eb6aced746f0cbbe81058dee34d48ad0f18f0ad /libnm-util/nm-setting-wired.c | |
| parent | 5af6a4baec63a12efa53565a0fabadb06cde49de (diff) | |
| download | NetworkManager-38d3f0b181bd214ba1202cc11d7d518ae79428dc.tar.gz | |
libnm-util: fix s390 CTC nettype and whitelist ctcprot option (bgo #647578) (rh #641986)
Diffstat (limited to 'libnm-util/nm-setting-wired.c')
| -rw-r--r-- | libnm-util/nm-setting-wired.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index ad47ac943c..8691aeee03 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -107,7 +107,7 @@ static const char *valid_s390_opts[] = { "route6", "fake_broadcast", "broadcast_mode", "canonical_macaddr", "checksumming", "sniffer", "large_send", "ipato_enable", "ipato_invert4", "ipato_add4", "ipato_invert6", "ipato_add6", "vipa_add4", "vipa_add6", - "rxip_add4", "rxip_add6", "lancmd_timeout", + "rxip_add4", "rxip_add6", "lancmd_timeout", "ctcprot", NULL }; @@ -197,7 +197,7 @@ nm_setting_wired_get_s390_subchannels (NMSettingWired *setting) * @setting: the #NMSettingWired * * Returns the s390 device type this connection should apply to. Will be one - * of 'qeth', 'lcs', or 'ctcm'. + * of 'qeth', 'lcs', or 'ctc'. * * Returns: the s390 device type **/ @@ -361,7 +361,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (setting); const char *valid_ports[] = { "tp", "aui", "bnc", "mii", NULL }; const char *valid_duplex[] = { "half", "full", NULL }; - const char *valid_nettype[] = { "qeth", "lcs", "ctcm", NULL }; + const char *valid_nettype[] = { "qeth", "lcs", "ctc", NULL }; GHashTableIter iter; const char *key, *value; |