Merge pull request #444 from mars1024/bugfix/ptp_redundant
ptp: remove some redundant lines
This commit is contained in:
commit
8bf6a7b362
@ -228,7 +228,7 @@ func cmdAdd(args *skel.CmdArgs) error {
|
|||||||
}
|
}
|
||||||
defer netns.Close()
|
defer netns.Close()
|
||||||
|
|
||||||
hostInterface, containerInterface, err := setupContainerVeth(netns, args.IfName, conf.MTU, result)
|
hostInterface, _, err := setupContainerVeth(netns, args.IfName, conf.MTU, result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -254,8 +254,6 @@ func cmdAdd(args *skel.CmdArgs) error {
|
|||||||
result.DNS = conf.DNS
|
result.DNS = conf.DNS
|
||||||
}
|
}
|
||||||
|
|
||||||
result.Interfaces = []*current.Interface{hostInterface, containerInterface}
|
|
||||||
|
|
||||||
return types.PrintResult(result, conf.CNIVersion)
|
return types.PrintResult(result, conf.CNIVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user