ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #831 from mlguerrero12/fixerrorignored

Browse Source 
Fix overwritten error var in getMTUByName
This commit is contained in:
Dan Williams 2023-02-20 10:13:34 -06:00 committed by GitHub
commit 286064b9ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/main/macvlan/macvlan.go
View File

@ -148,7 +148,8 @@ func getMTUByName(ifName string, namespace string, inContainer bool) (int, error
var link netlink.Link var link netlink.Link
var err error var err error
if inContainer { if inContainer {
netns, err := ns.GetNS(namespace) var netns ns.NetNS
netns, err = ns.GetNS(namespace)
if err != nil { if err != nil {
return 0, fmt.Errorf("failed to open netns %q: %v", netns, err) return 0, fmt.Errorf("failed to open netns %q: %v", netns, err)
} }

3
plugins/main/vlan/vlan.go
View File

@ -75,7 +75,8 @@ func getMTUByName(ifName string, namespace string, inContainer bool) (int, error
var link netlink.Link var link netlink.Link
var err error var err error
if inContainer { if inContainer {
netns, err := ns.GetNS(namespace) var netns ns.NetNS
netns, err = ns.GetNS(namespace)
if err != nil { if err != nil {
return 0, fmt.Errorf("failed to open netns %q: %v", netns, err) return 0, fmt.Errorf("failed to open netns %q: %v", netns, err)
} }