From 6b106252588fb66d69c78e7c9da63df13bb0a72d Mon Sep 17 00:00:00 2001
From: Joel Roggeman <joelroggeman@gmail.com>
Date: Tue, 31 Oct 2017 18:47:17 +0000
Subject: [PATCH] network: Remove the unneeded files to restrict to simple
 refactoring

---
 network/{ipmasq_linux.go => ipmasq.go}        |  0
 .../{ipmasq_linux_test.go => ipmasq_test.go}  |  0
 network/ipmasq_unspecified.go                 | 27 -------------------
 network/ipmasq_windows.go                     | 23 ----------------
 4 files changed, 50 deletions(-)
 rename network/{ipmasq_linux.go => ipmasq.go} (100%)
 rename network/{ipmasq_linux_test.go => ipmasq_test.go} (100%)
 delete mode 100644 network/ipmasq_unspecified.go
 delete mode 100644 network/ipmasq_windows.go

diff --git a/network/ipmasq_linux.go b/network/ipmasq.go
similarity index 100%
rename from network/ipmasq_linux.go
rename to network/ipmasq.go
diff --git a/network/ipmasq_linux_test.go b/network/ipmasq_test.go
similarity index 100%
rename from network/ipmasq_linux_test.go
rename to network/ipmasq_test.go
diff --git a/network/ipmasq_unspecified.go b/network/ipmasq_unspecified.go
deleted file mode 100644
index 220549df2a..0000000000
--- a/network/ipmasq_unspecified.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build !linux,!windows
-
-// Copyright 2015 flannel authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"errors"
-
-	"github.com/coreos/flannel/pkg/ip"
-	"github.com/coreos/flannel/subnet"
-)
-
-func SetupAndEnsureIPMasq(network ip.IP4Net, lease *subnet.Lease) {
-}
diff --git a/network/ipmasq_windows.go b/network/ipmasq_windows.go
deleted file mode 100644
index 8dc10830f7..0000000000
--- a/network/ipmasq_windows.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 flannel authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"github.com/coreos/flannel/pkg/ip"
-	"github.com/coreos/flannel/subnet"
-)
-
-func SetupAndEnsureIPMasq(network ip.IP4Net, lease *subnet.Lease) {
-}