From fdc79c5721b35622314dc1faaf54ad16d5e16cd9 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 20 Dec 2021 17:37:51 +0100
Subject: [PATCH] gluon-ebtables-limit-arp: declare clock as extern (#2343)
Declare the clock variable as extern in the header file.
Fixes compilation of gluon-ebtables-limit-arp with OpenWrt master:
multiple definition of `clock'; /gluon/openwrt/tmp/ccuynR0G.o:(.bss+0x230): first defined here
Signed-off-by: David Bauer <mail@david-bauer.net>
---
package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c | 2 ++
package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c b/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c
index 9c764006d..c14fce6bb 100644
--- a/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c
+++ b/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c
@@ -25,6 +25,8 @@
static struct addr_store ip_store;
static struct addr_store mac_store;
+int clock;
+
char *addr_mac_ntoa(void *addr)
{
return mac_ntoa((struct mac_addr *)addr);
diff --git a/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.h b/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.h
index 203ab2176..3715ed703 100644
--- a/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.h
+++ b/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.h
@@ -8,6 +8,6 @@
#ifndef _GLUON_ARP_LIMITER_H_
#define _GLUON_ARP_LIMITER_H_
-int clock;
+extern int clock;
#endif /* _GLUON_ARP_LIMITER_H_ */
--
GitLab