Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e917d7d authored by Niranjan Pendharkar's avatar Niranjan Pendharkar Committed by android-build-merger
Browse files

Merge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c am: 6d36b265 

am: 9c2576fa

Change-Id: I2dcebec1c08bb7b067621331533d8a65dd7b5083
parents 00c93238 9c2576fa

services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;