diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-20 17:44:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 17:44:58 +0000 |
| commit | 6575d483cc12747e8f6790e369ed59c15e3ff91a (patch) | |
| tree | 4b4a705a93295ccce1ff5c96bb6aed610d2d52dc | |
| parent | 7bd96d32a17553cf5772c7abf5a759636bcc4943 (diff) | |
| parent | a7212650e706031e12bab5c49b197dc9bbe934fb (diff) | |
| download | base-6575d483cc12747e8f6790e369ed59c15e3ff91a.tar.gz | |
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
| -rw-r--r-- | services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp b/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp index 9a17635721b8..3eaf48845a2f 100644 --- a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp +++ b/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp @@ -103,8 +103,8 @@ static jboolean android_server_connectivity_tethering_OffloadHardwareInterface_c // fd2 A file descriptor bound to the following netlink groups // (NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY). base::unique_fd - fd1(conntrackSocket(NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY)), - fd2(conntrackSocket(NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY)); + fd1(conntrackSocket(NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY)), + fd2(conntrackSocket(NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY)); if (fd1.get() < 0 || fd2.get() < 0) { ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno)); return false; |