diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-09-26 11:48:18 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-26 11:48:19 -0700 |
| commit | 73ce2ac63392bbf637d2c44fbf2ee4e70765d268 (patch) | |
| tree | 71d563a3a7af30af09e231ca64bdfaa9e7847d93 /include | |
| parent | net: dsa: make user ports return to init_net on netns deletion (diff) | |
| parent | net: Remove unused inline function dst_hold_and_use() (diff) | |
Merge branch 'remove-useless-inline-functions-from-net'
Gaosheng Cui says:
====================
Remove useless inline functions from net
====================
Link: https://lore.kernel.org/r/20220922083857.1430811-1-cuigaosheng1@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dst.h | 6 | ||||
| -rw-r--r-- | include/net/neighbour.h | 5 | ||||
| -rw-r--r-- | include/net/sock.h | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 6aa252c3fc55..00b479ce6b99 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -239,12 +239,6 @@ static inline void dst_use_noref(struct dst_entry *dst, unsigned long time) } } -static inline void dst_hold_and_use(struct dst_entry *dst, unsigned long time) -{ - dst_hold(dst); - dst_use_noref(dst, time); -} - static inline struct dst_entry *dst_clone(struct dst_entry *dst) { if (dst) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 3827a6b395fd..20745cf7ae1a 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -276,11 +276,6 @@ static inline void *neighbour_priv(const struct neighbour *n) extern const struct nla_policy nda_policy[]; -static inline bool neigh_key_eq16(const struct neighbour *n, const void *pkey) -{ - return *(const u16 *)n->primary_key == *(const u16 *)pkey; -} - static inline bool neigh_key_eq32(const struct neighbour *n, const void *pkey) { return *(const u32 *)n->primary_key == *(const u32 *)pkey; diff --git a/include/net/sock.h b/include/net/sock.h index 96a31026e35d..08038a385ef2 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -744,11 +744,6 @@ static inline void sk_node_init(struct hlist_node *node) node->pprev = NULL; } -static inline void sk_nulls_node_init(struct hlist_nulls_node *node) -{ - node->pprev = NULL; -} - static inline void __sk_del_node(struct sock *sk) { __hlist_del(&sk->sk_node); |