vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix P45 and P53 patch line numbers and missing dependencies

Browse Source 
P53: Change itr_tracker insertion point from line 46 to 47
so it applies after NetworkScheme::new() closing, not inside it.

P45: Add log.workspace = true to ixgbed Cargo.toml since
P45 adds log::error! usage to ixgbed main.rs.
This commit is contained in:
Admin Pupkin
2026-05-20 23:56:25 +03:00
parent 4d914a0321
commit 2e477bbc90
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/base/P45-net-msix-adoption.patch
+6
View File
@@ -58,3 +58,9 @@ index 4a6ce74d..f06898ec 100644
@@ -77 +79 @@ fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
- irq_file.write(&mut irq).unwrap();
+ irq_file.irq_handle().write(&mut irq).unwrap();
diff --git a/drivers/net/ixgbed/Cargo.toml b/drivers/net/ixgbed/Cargo.toml
index d97ff398..fcaf4b19 100644
--- a/drivers/net/ixgbed/Cargo.toml
+++ b/drivers/net/ixgbed/Cargo.toml
@@ -9,0 +10 @@ libredox.workspace = true
+log.workspace = true
local/patches/base/P53-e1000d-itr-coalescing.patch
+1 -1
View File
@@ -104,7 +104,7 @@ index 373ea9b3..1a4b0667 100644
+++ b/drivers/net/e1000d/src/main.rs
@@ -8,0 +9 @@ pub mod device;
+pub mod itr;
@@ -46,0 +48,2 @@ fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
@@ -47,0 +49,2 @@ fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
+ let mut itr_tracker = itr::ItrTracker::new();
+
@@ -74,0 +78 @@ fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {