| Message ID | 20220128235347.40666-1-dsahern@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 47ed9442b2ecfcdc72889667236d6c59b6a3337e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] ipv4: Make ip_idents_reserve static | expand |
On Fri, Jan 28, 2022 at 3:53 PM David Ahern <dsahern@kernel.org> wrote: > > ip_idents_reserve is only used in net/ipv4/route.c. Make it static > and remove the export. > > Signed-off-by: David Ahern <dsahern@kernel.org> > Cc: Eric Dumazet <edumazet@google.com> > --- Thanks, this came after commit 62f20e068ccc ipv6: use prandom_u32() for ID generation Reviewed-by: Eric Dumazet <edumazet@google.com>
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 28 Jan 2022 16:53:47 -0700 you wrote: > ip_idents_reserve is only used in net/ipv4/route.c. Make it static > and remove the export. > > Signed-off-by: David Ahern <dsahern@kernel.org> > Cc: Eric Dumazet <edumazet@google.com> > --- > include/net/ip.h | 1 - > net/ipv4/route.c | 3 +-- > 2 files changed, 1 insertion(+), 3 deletions(-) Here is the summary with links: - [net-next] ipv4: Make ip_idents_reserve static https://git.kernel.org/netdev/net-next/c/47ed9442b2ec You are awesome, thank you!
diff --git a/include/net/ip.h b/include/net/ip.h index b51bae43b0dd..4fcb48598d2d 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -517,7 +517,6 @@ void ip_dst_metrics_put(struct dst_entry *dst) kfree(p); } -u32 ip_idents_reserve(u32 hash, int segs); void __ip_select_ident(struct net *net, struct iphdr *iph, int segs); static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb, diff --git a/net/ipv4/route.c b/net/ipv4/route.c index e42e283b5515..8b35075088e1 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -457,7 +457,7 @@ static u32 *ip_tstamps __read_mostly; * if one generator is seldom used. This makes hard for an attacker * to infer how many packets were sent between two points in time. */ -u32 ip_idents_reserve(u32 hash, int segs) +static u32 ip_idents_reserve(u32 hash, int segs) { u32 bucket, old, now = (u32)jiffies; atomic_t *p_id; @@ -478,7 +478,6 @@ u32 ip_idents_reserve(u32 hash, int segs) */ return atomic_add_return(segs + delta, p_id) - segs; } -EXPORT_SYMBOL(ip_idents_reserve); void __ip_select_ident(struct net *net, struct iphdr *iph, int segs) {
ip_idents_reserve is only used in net/ipv4/route.c. Make it static and remove the export. Signed-off-by: David Ahern <dsahern@kernel.org> Cc: Eric Dumazet <edumazet@google.com> --- include/net/ip.h | 1 - net/ipv4/route.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)