diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-12 11:30:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 11:30:00 -0500 |
| commit | 291f59600b7857bbec6f340d3ceec6e2e9ce923f (patch) | |
| tree | 401aaa4e56cbe585582fa1124a9cd77a83ae21a9 /libpod/networking_linux.go | |
| parent | 1b284a298c0bde20561321f325d4a7ad00e7bd25 (diff) | |
| parent | 78c8a87362ee27ba1d2a62b7c9d73adc313c7d7e (diff) | |
| download | podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.tar.gz podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.tar.bz2 podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.zip | |
Merge pull request #9331 from Luap99/lint
Enable more golangci-lint linters
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 55d338e7d..de6f75d3e 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -480,9 +480,8 @@ func (r *Runtime) setupSlirp4netns(ctr *Container) error { if havePortMapping { if isSlirpHostForward { return r.setupRootlessPortMappingViaSlirp(ctr, cmd, apiSocket) - } else { - return r.setupRootlessPortMappingViaRLK(ctr, netnsPath) } + return r.setupRootlessPortMappingViaRLK(ctr, netnsPath) } return nil } |