Skip to content

Commit

Permalink
Merge pull request #5452 from freddy77/more_specific_name
Browse files Browse the repository at this point in the history
Make clear which drivers list we are getting
  • Loading branch information
robhoes committed Feb 12, 2024
2 parents 13d9599 + 9adbc5b commit b4f6563
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ocaml/networkd/bin/network_server.ml
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
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

0 comments on commit b4f6563

Please sign in to comment.