From 7001d85a8958af68b5145badecdb76d366a3902d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Tue, 5 Aug 2025 10:49:44 -0700
Subject: [PATCH] clatd: remove DEVICEPREFIX single use define
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test: TreeHugger
Flag: EXEMPT mainline
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibbeb4775f1b8484c7fb8ebb90f2a165af7ad031f
---
 clatd/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/clatd/main.c b/clatd/main.c
index d81a44ada7..de1c36a1e4 100644
--- a/clatd/main.c
+++ b/clatd/main.c
@@ -37,8 +37,6 @@
 #include "config.h"
 #include "logging.h"
 
-#define DEVICEPREFIX "v4-"
-
 /* function: handle_sigterm
  * signal handler: stop the event loop
  */
@@ -261,7 +259,7 @@ int main(int argc, char **argv) {
     exit(1);
   }
 
-  unsigned len = snprintf(tunnel.device4, sizeof(tunnel.device4), "%s%s", DEVICEPREFIX, uplink_interface);
+  unsigned len = snprintf(tunnel.device4, sizeof(tunnel.device4), "v4-%s", uplink_interface);
   if (len >= sizeof(tunnel.device4)) {
     logmsg(ANDROID_LOG_FATAL, "interface name too long '%s'", tunnel.device4);
     exit(1);