diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-08-09 16:54:06 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-15 18:56:14 -0700 |
| commit | de67763cbdbba8149eeb5d45ad0c6834f7c7b352 (patch) | |
| tree | 348c5b7f60ffd113075462112e6a3aa92fd417a0 | |
| parent | 100465a91a900699db9c64fb55063affd15c4362 (diff) | |
| download | linux-de67763cbdbba8149eeb5d45ad0c6834f7c7b352.tar.gz linux-de67763cbdbba8149eeb5d45ad0c6834f7c7b352.tar.bz2 linux-de67763cbdbba8149eeb5d45ad0c6834f7c7b352.zip | |
ip: Move INFINITY_LIFE_TIME to addrconf.h.
INFINITY_LIFE_TIME is the common value used in IPv4 and IPv6 but defined
in both .c files.
Also, 0xffffffff used in addrconf_timeout_fixup() is INFINITY_LIFE_TIME.
Let's move INFINITY_LIFE_TIME's definition to addrconf.h
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20240809235406.50187-6-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | include/net/addrconf.h | 4 | ||||
| -rw-r--r-- | net/ipv4/devinet.c | 2 | ||||
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index b18e81f0c9e1..c8ed31828db3 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -187,10 +187,12 @@ static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev) return 0; } +#define INFINITY_LIFE_TIME 0xFFFFFFFF + static inline unsigned long addrconf_timeout_fixup(u32 timeout, unsigned int unit) { - if (timeout == 0xffffffff) + if (timeout == INFINITY_LIFE_TIME) return ~0UL; /* diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index b5d2a9fd46c7..61be85154dd1 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -703,8 +703,6 @@ errout: return err; } -#define INFINITY_LIFE_TIME 0xFFFFFFFF - static void check_lifetime(struct work_struct *work) { unsigned long now, next, next_sec, next_sched; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c87d008aefa4..04ee75af2f6b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -92,8 +92,6 @@ #include <linux/export.h> #include <linux/ioam6.h> -#define INFINITY_LIFE_TIME 0xFFFFFFFF - #define IPV6_MAX_STRLEN \ sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") |