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

Merge pull request #626 from Luap99/tuning-mac

Browse Source 
tuning: always update MAC in CNI result
This commit is contained in:
Dan Williams
2021-05-05 10:24:13 -05:00
committed by GitHub
parent a5b79632bd bdaaa20ef2
commit faf6d2629d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/meta/tuning/tuning.go
View File

@ -152,7 +152,7 @@ func changeMacAddr(ifName string, newMacAddr string) error {
return netlink.LinkSetHardwareAddr(link, addr)
}
func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) {
func updateResultsMacAddr(config *TuningConf, ifName string, newMacAddr string) {
// Parse previous result.
if config.PrevResult == nil {
return
@ -166,6 +166,7 @@ func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) {
i.Mac = newMacAddr
}
}
config.PrevResult = result
}
func changePromisc(ifName string, val bool) error {
@ -356,7 +357,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
}
updateResultsMacAddr(*tuningConf, args.IfName, tuningConf.Mac)
updateResultsMacAddr(tuningConf, args.IfName, tuningConf.Mac)
}
if tuningConf.Promisc != false {