2020-11-13 13:56:30

by Lukas Bulwahn

Subject: [PATCH] ipv6: remove unused function ipv6_skb_idev()

Commit bdb7cc643fc9 ("ipv6: Count interface receive statistics on the
ingress netdev") removed all callees for ipv6_skb_idev(). Hence, since
then, ipv6_skb_idev() is unused and make CC=clang W=1 warns:

net/ipv6/exthdrs.c:909:33:
warning: unused function 'ipv6_skb_idev' [-Wunused-function]

So, remove this unused function and a -Wunused-function warning.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
Alexey, Hideaki-san, please ack.

David, Jakub, please pick this minor non-urgent clean-up patch.

net/ipv6/exthdrs.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 374105e4394f..584d1b06eb90 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -906,10 +906,6 @@ void ipv6_exthdrs_exit(void)
/*
* Note: we cannot rely on skb_dst(skb) before we assign it in ip6_route_input().
*/
-static inline struct inet6_dev *ipv6_skb_idev(struct sk_buff *skb)
-{
- return skb_dst(skb) ? ip6_dst_idev(skb_dst(skb)) : __in6_dev_get(skb->dev);
-}

static inline struct net *ipv6_skb_net(struct sk_buff *skb)
{
--
2.17.1

2020-11-13 18:38:55

by Nathan Chancellor

Subject: Re: [PATCH] ipv6: remove unused function ipv6_skb_idev()

On Fri, Nov 13, 2020 at 02:50:12PM +0100, Lukas Bulwahn wrote:
> Commit bdb7cc643fc9 ("ipv6: Count interface receive statistics on the
> ingress netdev") removed all callees for ipv6_skb_idev(). Hence, since
> then, ipv6_skb_idev() is unused and make CC=clang W=1 warns:
>
> net/ipv6/exthdrs.c:909:33:
> warning: unused function 'ipv6_skb_idev' [-Wunused-function]
>
> So, remove this unused function and a -Wunused-function warning.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> Alexey, Hideaki-san, please ack.
>
> David, Jakub, please pick this minor non-urgent clean-up patch.
>
> net/ipv6/exthdrs.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
> index 374105e4394f..584d1b06eb90 100644
> --- a/net/ipv6/exthdrs.c
> +++ b/net/ipv6/exthdrs.c
> @@ -906,10 +906,6 @@ void ipv6_exthdrs_exit(void)
> /*
> * Note: we cannot rely on skb_dst(skb) before we assign it in ip6_route_input().
> */
> -static inline struct inet6_dev *ipv6_skb_idev(struct sk_buff *skb)
> -{
> - return skb_dst(skb) ? ip6_dst_idev(skb_dst(skb)) : __in6_dev_get(skb->dev);
> -}
>
> static inline struct net *ipv6_skb_net(struct sk_buff *skb)
> {
> --
> 2.17.1
>

2020-11-14 20:07:24

by Jakub Kicinski

Subject: Re: [PATCH] ipv6: remove unused function ipv6_skb_idev()

On Fri, 13 Nov 2020 11:36:49 -0700 Nathan Chancellor wrote:
> On Fri, Nov 13, 2020 at 02:50:12PM +0100, Lukas Bulwahn wrote:
> > Commit bdb7cc643fc9 ("ipv6: Count interface receive statistics on the
> > ingress netdev") removed all callees for ipv6_skb_idev(). Hence, since
> > then, ipv6_skb_idev() is unused and make CC=clang W=1 warns:
> >
> > net/ipv6/exthdrs.c:909:33:
> > warning: unused function 'ipv6_skb_idev' [-Wunused-function]
> >
> > So, remove this unused function and a -Wunused-function warning.
> >
> > Signed-off-by: Lukas Bulwahn <[email protected]>
>
> Reviewed-by: Nathan Chancellor <[email protected]>

Applied, thanks!