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

Commit adce22ea authored by Nate Jiang's avatar Nate Jiang
Browse files

resolve merge conflicts of 0bb061f8 to master 

Change-Id: I0b13f3fc6edcfb2d5982ec13728753906f158c30
parents 3b26edb9 0bb061f8

wifi/1.5/default/wifi_nan_iface.cpp

+3 −0
Original line number Diff line number Diff line
@@ -534,6 +534,9 @@ WifiNanIface::WifiNanIface( 
}



void WifiNanIface::invalidate() {

    if (!isValid()) {

        return;

    }

    // send commands to HAL to actually disable and destroy interfaces

    legacy_hal_.lock()->nanDisableRequest(ifname_, 0xFFFF);

    legacy_hal_.lock()->nanDataInterfaceDelete(ifname_, 0xFFFE, "aware_data0");