diff --git a/src/lqos.example b/src/lqos.example index 83e01410..2cef811f 100644 --- a/src/lqos.example +++ b/src/lqos.example @@ -24,7 +24,7 @@ disable_offload = [ "gso", "tso", "lro", "sg", "gro" ] # For "on a stick": [bridge] -use_kernel_bridge = true +use_xdp_bridge = true interface_mapping = [ { name = "enp1s0f1", redirect_to = "enp1s0f1", scan_vlans = true } ] diff --git a/src/rust/lqos_config/src/etc.rs b/src/rust/lqos_config/src/etc.rs index de8b97ff..2f4e574b 100644 --- a/src/rust/lqos_config/src/etc.rs +++ b/src/rust/lqos_config/src/etc.rs @@ -57,7 +57,7 @@ pub struct Tunables { #[derive(Serialize, Deserialize, Clone, Debug)] pub struct BridgeConfig { /// Should the XDP bridge be enabled? - pub use_kernel_bridge: bool, + pub use_xdp_bridge: bool, /// A list of interface mappings. pub interface_mapping: Vec, diff --git a/src/rust/lqos_node_manager/static/config.html b/src/rust/lqos_node_manager/static/config.html index dd1d4cc1..87627c7c 100644 --- a/src/rust/lqos_node_manager/static/config.html +++ b/src/rust/lqos_node_manager/static/config.html @@ -477,7 +477,7 @@ $("#StickVLANCore").val(python_config.stick_vlans[0]); $("#StickVLANInternet").val(python_config.stick_vlans[1]); if (lqosd_config.bridge != null) { - $("#useKernelBridge").prop('checked', lqosd_config.bridge.use_kernel_bridge); + $("#useKernelBridge").prop('checked', lqosd_config.bridge.use_xdp_bridge); // Map Bifrost Interfaces let html = "

Interface Mapping

"; diff --git a/src/rust/lqos_sys/src/lqos_kernel.rs b/src/rust/lqos_sys/src/lqos_kernel.rs index e0e69998..3a8984ea 100644 --- a/src/rust/lqos_sys/src/lqos_kernel.rs +++ b/src/rust/lqos_sys/src/lqos_kernel.rs @@ -156,7 +156,7 @@ pub fn attach_xdp_and_tc_to_interface( // Attach to the ingress IF it is configured if let Ok(etc) = lqos_config::EtcLqos::load() { if let Some(bridge) = &etc.bridge { - if bridge.use_kernel_bridge { + if bridge.use_xdp_bridge { // Enable "promiscuous" mode on interfaces for mapping in bridge.interface_mapping.iter() { std::process::Command::new("/bin/ip") diff --git a/src/rust/lqosd/README.md b/src/rust/lqosd/README.md index cbf33301..6d562d58 100644 --- a/src/rust/lqosd/README.md +++ b/src/rust/lqosd/README.md @@ -41,7 +41,7 @@ To enable the kernel-side eBPF bridge, edit `/etc/lqos`: ```toml [bridge] -use_kernel_bridge = true +use_xdp_bridge = true interface_mapping = [ { name = "eth1", redirect_to = "eth2", scan_vlans = false }, { name = "eth2", redirect_to = "eth1", scan_vlans = false } @@ -53,7 +53,7 @@ Each interface must be a *physical* interface, not a VLAN. If you set `scan_vlan ```toml [bridge] -use_kernel_bridge = true +use_xdp_bridge = true interface_mapping = [ { name = "eth1", redirect_to = "eth1", scan_vlans = true }, ]