NAN: Do not expire USD services based on last TX/RX message

This behavior is not described in the Wi-Fi Aware specification, so
remove it and instead, expect services to terminate USD explicitly when
no further Follow-up messages are needed.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/common/nan_de.c b/src/common/nan_de.c
index 2783d9e1116264e96ae0278841f21f822b9d2d48..7a40c9bb7b0c36c8de6b3793d9a133b3cd2590df 100644 (file)
--- a/src/common/nan_de.c
+++ b/src/common/nan_de.c
@@ -406,8 +406,6 @@ static bool nan_de_srv_expired(struct nan_de_service *srv,
                        return false;
                if (!srv->publish.fsd)
                        return true;
-               if (os_reltime_expired(now, &srv->last_multicast, 1))
-                       return true;
        }
 
        if (srv->type == NAN_DE_SUBSCRIBE) {
@@ -417,8 +415,6 @@ static bool nan_de_srv_expired(struct nan_de_service *srv,
                        return false;
                if (!srv->needs_fsd)
                        return true;
-               if (os_reltime_expired(now, &srv->first_discovered, 1))
-                       return true;
        }
 
        return false;