diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-23 06:15:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 06:15:11 -0800 |
| commit | 8098cbbee192e644de505e62c4aa0341f4acb4a5 (patch) | |
| tree | 50af7ba7e829ab4d6fc9ba143e13f79dc04f4f64 /vendor/github.com/vishvananda/netlink/protinfo_linux.go | |
| parent | c5f3899cb4133922a9732aff4680bb7eea3d391b (diff) | |
| parent | 9f927c4709a51ef72d84bb557fc371d535c19fba (diff) | |
| download | podman-8098cbbee192e644de505e62c4aa0341f4acb4a5.tar.gz podman-8098cbbee192e644de505e62c4aa0341f4acb4a5.tar.bz2 podman-8098cbbee192e644de505e62c4aa0341f4acb4a5.zip | |
Merge pull request #4946 from containers/dependabot/go_modules/github.com/vishvananda/netlink-1.1.0
build(deps): bump github.com/vishvananda/netlink from 1.0.0 to 1.1.0
Diffstat (limited to 'vendor/github.com/vishvananda/netlink/protinfo_linux.go')
| -rw-r--r-- | vendor/github.com/vishvananda/netlink/protinfo_linux.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/github.com/vishvananda/netlink/protinfo_linux.go b/vendor/github.com/vishvananda/netlink/protinfo_linux.go index 43c465f05..15b65123c 100644 --- a/vendor/github.com/vishvananda/netlink/protinfo_linux.go +++ b/vendor/github.com/vishvananda/netlink/protinfo_linux.go @@ -41,7 +41,7 @@ func (h *Handle) LinkGetProtinfo(link Link) (Protinfo, error) { if err != nil { return pi, err } - pi = *parseProtinfo(infos) + pi = parseProtinfo(infos) return pi, nil } @@ -49,8 +49,7 @@ func (h *Handle) LinkGetProtinfo(link Link) (Protinfo, error) { return pi, fmt.Errorf("Device with index %d not found", base.Index) } -func parseProtinfo(infos []syscall.NetlinkRouteAttr) *Protinfo { - var pi Protinfo +func parseProtinfo(infos []syscall.NetlinkRouteAttr) (pi Protinfo) { for _, info := range infos { switch info.Attr.Type { case nl.IFLA_BRPORT_MODE: @@ -71,5 +70,5 @@ func parseProtinfo(infos []syscall.NetlinkRouteAttr) *Protinfo { pi.ProxyArpWiFi = byteToBool(info.Value[0]) } } - return &pi + return } |