Skip to content

Make clear which drivers list we are getting #5452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Make clear which drivers list we are getting #5452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocaml/networkd/bin/network_server.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ let set_dns_interface _dbg name =
* constitutes adding a VLAN0 Linux device to strip those headers again.
*)
let need_enic_workaround () =
!backend_kind = Bridge && List.mem "enic" (Sysfs.list_drivers ())
!backend_kind = Bridge && List.mem "enic" (Sysfs.list_pci_drivers ())

module Sriov = struct
open S.Sriov
Expand Down
4 changes: 2 additions & 2 deletions ocaml/networkd/lib/network_utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ let fork_script ?on_error ?log script args =
check_n_run ?on_error ?log fork_script_internal script args

module Sysfs = struct
let list_drivers () =
let list_pci_drivers () =
try Array.to_list (Sys.readdir "/sys/bus/pci/drivers")
with _ ->
warn "Failed to obtain list of drivers from sysfs" ;
warn "Failed to obtain list of PCI drivers from sysfs" ;
[]

let getpath dev attr = Printf.sprintf "/sys/class/net/%s/%s" dev attr
Expand Down