From 5b3fc7aab25be908cab869dab5c0b2cb821d31dc Mon Sep 17 00:00:00 2001
From: Christy Perez <christy@linux.vnet.ibm.com>
Date: Fri, 26 Feb 2016 12:47:43 -0600
Subject: [PATCH] Match case for variables in sysinfo pkg

I noticied an inconsistency when reviewing docker/pull/20692.

Changing Ip to IP and Nf to NF.

More info: The golang folks recommend that you keep the initials consistent:
https://github.com/golang/go/wiki/CodeReviewComments#initialisms.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
---
 daemon/info.go                       | 4 ++--
 integration-cli/requirements_unix.go | 4 ++--
 pkg/sysinfo/sysinfo.go               | 4 ++--
 pkg/sysinfo/sysinfo_linux.go         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/daemon/info.go b/daemon/info.go
index 61eab2d7fd..4a75f352bd 100644
--- a/daemon/info.go
+++ b/daemon/info.go
@@ -75,8 +75,8 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 		DriverStatus:       daemon.layerStore.DriverStatus(),
 		Plugins:            daemon.showPluginsInfo(),
 		IPv4Forwarding:     !sysInfo.IPv4ForwardingDisabled,
-		BridgeNfIptables:   !sysInfo.BridgeNfCallIptablesDisabled,
-		BridgeNfIP6tables:  !sysInfo.BridgeNfCallIP6tablesDisabled,
+		BridgeNfIptables:   !sysInfo.BridgeNFCallIPTablesDisabled,
+		BridgeNfIP6tables:  !sysInfo.BridgeNFCallIP6TablesDisabled,
 		Debug:              utils.IsDebugEnabled(),
 		NFd:                fileutils.GetTotalUsedFds(),
 		NGoroutines:        runtime.NumGoroutine(),
diff --git a/integration-cli/requirements_unix.go b/integration-cli/requirements_unix.go
index 2e1d02c1ce..f625985b0a 100644
--- a/integration-cli/requirements_unix.go
+++ b/integration-cli/requirements_unix.go
@@ -83,13 +83,13 @@ var (
 	}
 	bridgeNfIptables = testRequirement{
 		func() bool {
-			return !SysInfo.BridgeNfCallIptablesDisabled
+			return !SysInfo.BridgeNFCallIPTablesDisabled
 		},
 		"Test requires that bridge-nf-call-iptables support be enabled in the daemon.",
 	}
 	bridgeNfIP6tables = testRequirement{
 		func() bool {
-			return !SysInfo.BridgeNfCallIP6tablesDisabled
+			return !SysInfo.BridgeNFCallIP6TablesDisabled
 		},
 		"Test requires that bridge-nf-call-ip6tables support be enabled in the daemon.",
 	}
diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go
index 285b3ba58f..3adaa9454b 100644
--- a/pkg/sysinfo/sysinfo.go
+++ b/pkg/sysinfo/sysinfo.go
@@ -19,10 +19,10 @@ type SysInfo struct {
 	IPv4ForwardingDisabled bool
 
 	// Whether bridge-nf-call-iptables is supported or not
-	BridgeNfCallIptablesDisabled bool
+	BridgeNFCallIPTablesDisabled bool
 
 	// Whether bridge-nf-call-ip6tables is supported or not
-	BridgeNfCallIP6tablesDisabled bool
+	BridgeNFCallIP6TablesDisabled bool
 
 	// Whether the cgroup has the mountpoint of "devices" or not
 	CgroupDevicesEnabled bool
diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go
index 766d13d4d9..7f584bbbdc 100644
--- a/pkg/sysinfo/sysinfo_linux.go
+++ b/pkg/sysinfo/sysinfo_linux.go
@@ -50,8 +50,8 @@ func New(quiet bool) *SysInfo {
 	sysInfo.CgroupDevicesEnabled = ok
 
 	sysInfo.IPv4ForwardingDisabled = !readProcBool("/proc/sys/net/ipv4/ip_forward")
-	sysInfo.BridgeNfCallIptablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables")
-	sysInfo.BridgeNfCallIP6tablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables")
+	sysInfo.BridgeNFCallIPTablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables")
+	sysInfo.BridgeNFCallIP6TablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables")
 
 	// Check if AppArmor is supported.
 	if _, err := os.Stat("/sys/kernel/security/apparmor"); !os.IsNotExist(err) {