Skip to content

Commit a6af25c

Browse files
committed
link: Rename MacSecValidation to MacSecValidate
Make sure the name is align with kernel constant name. Signed-off-by: Gris Ge <[email protected]>
1 parent 1418939 commit a6af25c

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/link/link_info/macsec.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ impl From<MacSecCipherId> for u64 {
7878

7979
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
8080
#[non_exhaustive]
81-
pub enum MacSecValidation {
81+
pub enum MacSecValidate {
8282
Disabled,
8383
Check,
8484
Strict,
8585
Other(u8),
8686
}
8787

88-
impl From<u8> for MacSecValidation {
88+
impl From<u8> for MacSecValidate {
8989
fn from(d: u8) -> Self {
9090
match d {
9191
MACSEC_VALIDATE_DISABLED => Self::Disabled,
@@ -96,13 +96,13 @@ impl From<u8> for MacSecValidation {
9696
}
9797
}
9898

99-
impl From<MacSecValidation> for u8 {
100-
fn from(d: MacSecValidation) -> Self {
99+
impl From<MacSecValidate> for u8 {
100+
fn from(d: MacSecValidate) -> Self {
101101
match d {
102-
MacSecValidation::Disabled => MACSEC_VALIDATE_DISABLED,
103-
MacSecValidation::Check => MACSEC_VALIDATE_CHECK,
104-
MacSecValidation::Strict => MACSEC_VALIDATE_STRICT,
105-
MacSecValidation::Other(value) => value,
102+
MacSecValidate::Disabled => MACSEC_VALIDATE_DISABLED,
103+
MacSecValidate::Check => MACSEC_VALIDATE_CHECK,
104+
MacSecValidate::Strict => MACSEC_VALIDATE_STRICT,
105+
MacSecValidate::Other(value) => value,
106106
}
107107
}
108108
}
@@ -153,7 +153,7 @@ pub enum InfoMacSec {
153153
Es(u8),
154154
Scb(u8),
155155
ReplayProtect(u8),
156-
Validation(MacSecValidation),
156+
Validation(MacSecValidate),
157157
Offload(MacSecOffload),
158158
Other(DefaultNla),
159159
}

src/link/link_info/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub use self::ipoib::InfoIpoib;
4242
pub use self::ipvlan::InfoIpVlan;
4343
pub use self::mac_vlan::{InfoMacVlan, InfoMacVtap};
4444
pub use self::macsec::{
45-
InfoMacSec, MacSecCipherId, MacSecOffload, MacSecValidation,
45+
InfoMacSec, MacSecCipherId, MacSecOffload, MacSecValidate,
4646
};
4747
pub use self::sit::InfoSitTun;
4848
pub use self::tun::InfoTun;

src/link/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub use self::link_info::{
4343
InfoGreTun6, InfoGtp, InfoHsr, InfoIpVlan, InfoIpoib, InfoKind, InfoMacSec,
4444
InfoMacVlan, InfoMacVtap, InfoPortData, InfoPortKind, InfoSitTun, InfoTun,
4545
InfoVeth, InfoVlan, InfoVrf, InfoVti, InfoVxlan, InfoXfrm, LinkInfo,
46-
LinkXstats, MacSecCipherId, MacSecOffload, MacSecValidation, MiiStatus,
46+
LinkXstats, MacSecCipherId, MacSecOffload, MacSecValidate, MiiStatus,
4747
VlanQosMapping,
4848
};
4949
pub use self::link_layer_type::LinkLayerType;

src/link/tests/macsec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use netlink_packet_utils::{Emitable, Parseable};
55
use crate::link::{
66
InfoData, InfoKind, InfoMacSec, LinkAttribute, LinkFlag, LinkHeader,
77
LinkInfo, LinkLayerType, LinkMessage, LinkMessageBuffer, MacSecCipherId,
8-
MacSecOffload, MacSecValidation,
8+
MacSecOffload, MacSecValidate,
99
};
1010
use crate::AddressFamily;
1111

@@ -54,7 +54,7 @@ fn test_macsec_link_info() {
5454
InfoMacSec::Es(0),
5555
InfoMacSec::Scb(0),
5656
InfoMacSec::ReplayProtect(0),
57-
InfoMacSec::Validation(MacSecValidation::Strict),
57+
InfoMacSec::Validation(MacSecValidate::Strict),
5858
InfoMacSec::Offload(MacSecOffload::Off),
5959
])),
6060
])],

0 commit comments

Comments
 (0)