| Message ID | 1509810807.2849.76.camel@edumazet-glaptop3.roam.corp.google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] ipv6: remove IN6_ADDR_HSIZE from addrconf.h | expand |
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>
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 :)
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 */