* [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h
@ 2017-11-04 15:53 Eric Dumazet
2017-11-05 0:10 ` David Ahern
2017-11-05 0:18 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2017-11-04 15:53 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
IN6_ADDR_HSIZE is private to addrconf.c, move it here to avoid
confusion.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
Should be applied after pktgen fix, thanks !
include/net/addrconf.h | 3 ---
net/ipv6/addrconf.c | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 3357332ea375b53dfb7704ea5eb8274a904f59b8..b623b65a79d1687602ba319cf9047a4c41b6396b 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -59,9 +59,6 @@ struct in6_validator_info {
struct netlink_ext_ack *extack;
};
-#define IN6_ADDR_HSIZE_SHIFT 8
-#define IN6_ADDR_HSIZE (1 << IN6_ADDR_HSIZE_SHIFT)
-
int addrconf_init(void);
void addrconf_cleanup(void);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 69b8cdb43aa2a7289b9133a4fcad3da5d148a7fb..66d8c3d912fdb3de8d1bc157e8e7fe3750fd9005 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -157,6 +157,8 @@ static int ipv6_generate_stable_address(struct in6_addr *addr,
u8 dad_count,
const struct inet6_dev *idev);
+#define IN6_ADDR_HSIZE_SHIFT 8
+#define IN6_ADDR_HSIZE (1 << IN6_ADDR_HSIZE_SHIFT)
/*
* Configured unicast address hash table
*/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h
2017-11-04 15:53 [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h Eric Dumazet
@ 2017-11-05 0:10 ` David Ahern
2017-11-05 0:18 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Ahern @ 2017-11-05 0:10 UTC (permalink / raw)
To: Eric Dumazet, David Miller; +Cc: netdev
On 11/5/17 12:53 AM, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> IN6_ADDR_HSIZE is private to addrconf.c, move it here to avoid
> confusion.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> ---
> Should be applied after pktgen fix, thanks !
>
> include/net/addrconf.h | 3 ---
> net/ipv6/addrconf.c | 2 ++
> 2 files changed, 2 insertions(+), 3 deletions(-)
Acked-by: David Ahern <dsahern@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h
2017-11-04 15:53 [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h Eric Dumazet
2017-11-05 0:10 ` David Ahern
@ 2017-11-05 0:18 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-11-05 0:18 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 04 Nov 2017 08:53:27 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> IN6_ADDR_HSIZE is private to addrconf.c, move it here to avoid
> confusion.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> ---
> Should be applied after pktgen fix, thanks !
Thanks for resolving this, scary to see something like this :)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-05 0:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-04 15:53 [PATCH net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h Eric Dumazet
2017-11-05 0:10 ` David Ahern
2017-11-05 0:18 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).