summaryrefslogtreecommitdiffstats
path: root/server/NetworkController.cpp
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2021-10-15 18:06:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-15 18:06:22 +0000
commit97e83e5e7585dab0be1d0346520e43bf6e11540f (patch)
treea5a9c2dcd44d5b8a56163b2c09cceb6ebb93d9c3 /server/NetworkController.cpp
parentbd8d0563ffdf9ff26043a2f106b41ecc38eaaee5 (diff)
parent7584784a8c971f3ff5dccbf8caddb1350240493d (diff)
downloadplatform_system_netd-master.tar.gz
platform_system_netd-master.tar.bz2
platform_system_netd-master.zip
Merge changes I9e70e0ba,I40082f7dHEADmaster
* changes: add prio parameter to tcFilterDelDev rename OffloadUtils to TcUtils
Diffstat (limited to 'server/NetworkController.cpp')
-rw-r--r--server/NetworkController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 602639cb1..1b99556b8 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -36,9 +36,9 @@
#include "DummyNetwork.h"
#include "Fwmark.h"
#include "LocalNetwork.h"
-#include "OffloadUtils.h"
#include "PhysicalNetwork.h"
#include "RouteController.h"
+#include "TcUtils.h"
#include "UnreachableNetwork.h"
#include "VirtualNetwork.h"
#include "netdutils/DumpWriter.h"