summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 23:37:02 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 23:37:02 +0000
commit86c6692b7fe1a71a53faf2d224fa41e8ccb024c9 (patch)
tree867d699d62372db5c97824c038d043e72992448e /net
parent02131f5dd6e520b3f4e25702fe63793831bc0826 (diff)
downloadchromium_src-86c6692b7fe1a71a53faf2d224fa41e8ccb024c9.zip
chromium_src-86c6692b7fe1a71a53faf2d224fa41e8ccb024c9.tar.gz
chromium_src-86c6692b7fe1a71a53faf2d224fa41e8ccb024c9.tar.bz2
Revert 73690 - net: Add namespace net to network_change_notifier_netlink_linux.
BUG=64263 TEST=compiled locally and trybots Review URL: http://codereview.chromium.org/6368066 TBR=tfarina@chromium.org Review URL: http://codereview.chromium.org/6286093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/network_change_notifier_netlink_linux.cc6
-rw-r--r--net/base/network_change_notifier_netlink_linux.h6
2 files changed, 2 insertions, 10 deletions
diff --git a/net/base/network_change_notifier_netlink_linux.cc b/net/base/network_change_notifier_netlink_linux.cc
index 8135d6d..493e17a 100644
--- a/net/base/network_change_notifier_netlink_linux.cc
+++ b/net/base/network_change_notifier_netlink_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -57,8 +57,6 @@ bool IsDuplicateIPv6AddressUpdate(
} // namespace
-namespace net {
-
int InitializeNetlinkSocket() {
int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
if (sock < 0) {
@@ -129,5 +127,3 @@ bool HandleNetlinkMessage(char* buf, size_t len) {
return false;
}
-
-} // namespace net
diff --git a/net/base/network_change_notifier_netlink_linux.h b/net/base/network_change_notifier_netlink_linux.h
index 4433c01..13abbc6 100644
--- a/net/base/network_change_notifier_netlink_linux.h
+++ b/net/base/network_change_notifier_netlink_linux.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,14 +12,10 @@
#include <cstddef>
-namespace net {
-
// Returns the file descriptor if successful. Otherwise, returns -1.
int InitializeNetlinkSocket();
// Returns true if a network change has been detected, otherwise returns false.
bool HandleNetlinkMessage(char* buf, size_t len);
-} // namespace net
-
#endif // NET_BASE_NETWORK_CHANGE_NOTIFIER_NETLINK_LINUX_H_