diff --git a/src/link/link_info/macsec.rs b/src/link/link_info/macsec.rs index 3382363d..c8d24111 100644 --- a/src/link/link_info/macsec.rs +++ b/src/link/link_info/macsec.rs @@ -78,14 +78,14 @@ impl From for u64 { #[derive(Debug, PartialEq, Eq, Clone, Copy)] #[non_exhaustive] -pub enum MacSecValidation { +pub enum MacSecValidate { Disabled, Check, Strict, Other(u8), } -impl From for MacSecValidation { +impl From for MacSecValidate { fn from(d: u8) -> Self { match d { MACSEC_VALIDATE_DISABLED => Self::Disabled, @@ -96,13 +96,13 @@ impl From for MacSecValidation { } } -impl From for u8 { - fn from(d: MacSecValidation) -> Self { +impl From for u8 { + fn from(d: MacSecValidate) -> Self { match d { - MacSecValidation::Disabled => MACSEC_VALIDATE_DISABLED, - MacSecValidation::Check => MACSEC_VALIDATE_CHECK, - MacSecValidation::Strict => MACSEC_VALIDATE_STRICT, - MacSecValidation::Other(value) => value, + MacSecValidate::Disabled => MACSEC_VALIDATE_DISABLED, + MacSecValidate::Check => MACSEC_VALIDATE_CHECK, + MacSecValidate::Strict => MACSEC_VALIDATE_STRICT, + MacSecValidate::Other(value) => value, } } } @@ -153,7 +153,7 @@ pub enum InfoMacSec { Es(u8), Scb(u8), ReplayProtect(u8), - Validation(MacSecValidation), + Validation(MacSecValidate), Offload(MacSecOffload), Other(DefaultNla), } diff --git a/src/link/link_info/mod.rs b/src/link/link_info/mod.rs index 17ad31ac..b7a09f6a 100644 --- a/src/link/link_info/mod.rs +++ b/src/link/link_info/mod.rs @@ -42,7 +42,7 @@ pub use self::ipoib::InfoIpoib; pub use self::ipvlan::InfoIpVlan; pub use self::mac_vlan::{InfoMacVlan, InfoMacVtap}; pub use self::macsec::{ - InfoMacSec, MacSecCipherId, MacSecOffload, MacSecValidation, + InfoMacSec, MacSecCipherId, MacSecOffload, MacSecValidate, }; pub use self::sit::InfoSitTun; pub use self::tun::InfoTun; diff --git a/src/link/mod.rs b/src/link/mod.rs index 01f59ea2..0641f8f2 100644 --- a/src/link/mod.rs +++ b/src/link/mod.rs @@ -43,7 +43,7 @@ pub use self::link_info::{ InfoGreTun6, InfoGtp, InfoHsr, InfoIpVlan, InfoIpoib, InfoKind, InfoMacSec, InfoMacVlan, InfoMacVtap, InfoPortData, InfoPortKind, InfoSitTun, InfoTun, InfoVeth, InfoVlan, InfoVrf, InfoVti, InfoVxlan, InfoXfrm, LinkInfo, - LinkXstats, MacSecCipherId, MacSecOffload, MacSecValidation, MiiStatus, + LinkXstats, MacSecCipherId, MacSecOffload, MacSecValidate, MiiStatus, VlanQosMapping, }; pub use self::link_layer_type::LinkLayerType; diff --git a/src/link/tests/macsec.rs b/src/link/tests/macsec.rs index 40536879..779492a4 100644 --- a/src/link/tests/macsec.rs +++ b/src/link/tests/macsec.rs @@ -5,7 +5,7 @@ use netlink_packet_utils::{Emitable, Parseable}; use crate::link::{ InfoData, InfoKind, InfoMacSec, LinkAttribute, LinkFlag, LinkHeader, LinkInfo, LinkLayerType, LinkMessage, LinkMessageBuffer, MacSecCipherId, - MacSecOffload, MacSecValidation, + MacSecOffload, MacSecValidate, }; use crate::AddressFamily; @@ -54,7 +54,7 @@ fn test_macsec_link_info() { InfoMacSec::Es(0), InfoMacSec::Scb(0), InfoMacSec::ReplayProtect(0), - InfoMacSec::Validation(MacSecValidation::Strict), + InfoMacSec::Validation(MacSecValidate::Strict), InfoMacSec::Offload(MacSecOffload::Off), ])), ])],