Message ID | 20230801143129.40652-1-yuehaibing@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 2fca1b5ef898b131c430eed6f07b8972fb6c9673 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] ila: Remove unnecessary file net/ila.h | expand |
On Tue, Aug 01, 2023 at 10:31:29PM +0800, Yue Haibing wrote: > Commit 642c2c95585d ("ila: xlat changes") removed ila_xlat_outgoing() > and ila_xlat_incoming() functions, then this file became unnecessary. > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com> Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com> > --- > include/net/ila.h | 16 ---------------- > net/ipv6/ila/ila_main.c | 1 - > net/ipv6/ila/ila_xlat.c | 1 - > 3 files changed, 18 deletions(-) > delete mode 100644 include/net/ila.h > > diff --git a/include/net/ila.h b/include/net/ila.h > deleted file mode 100644 > index 73ebe5eab272..000000000000 > --- a/include/net/ila.h > +++ /dev/null > @@ -1,16 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-or-later */ > -/* > - * ILA kernel interface > - * > - * Copyright (c) 2015 Tom Herbert <tom@herbertland.com> > - */ > - > -#ifndef _NET_ILA_H > -#define _NET_ILA_H > - > -struct sk_buff; > - > -int ila_xlat_outgoing(struct sk_buff *skb); > -int ila_xlat_incoming(struct sk_buff *skb); > - > -#endif /* _NET_ILA_H */ > diff --git a/net/ipv6/ila/ila_main.c b/net/ipv6/ila/ila_main.c > index 3faf62530d6a..69caed07315f 100644 > --- a/net/ipv6/ila/ila_main.c > +++ b/net/ipv6/ila/ila_main.c > @@ -1,6 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > #include <net/genetlink.h> > -#include <net/ila.h> > #include <net/netns/generic.h> > #include <uapi/linux/genetlink.h> > #include "ila.h" > diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c > index bee45dfeb187..67e8c9440977 100644 > --- a/net/ipv6/ila/ila_xlat.c > +++ b/net/ipv6/ila/ila_xlat.c > @@ -5,7 +5,6 @@ > #include <linux/rhashtable.h> > #include <linux/vmalloc.h> > #include <net/genetlink.h> > -#include <net/ila.h> > #include <net/netns/generic.h> > #include <uapi/linux/genetlink.h> > #include "ila.h" > -- > 2.34.1 > >
On 8/1/23 8:31 AM, Yue Haibing wrote: > Commit 642c2c95585d ("ila: xlat changes") removed ila_xlat_outgoing() > and ila_xlat_incoming() functions, then this file became unnecessary. > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com> > --- > include/net/ila.h | 16 ---------------- > net/ipv6/ila/ila_main.c | 1 - > net/ipv6/ila/ila_xlat.c | 1 - > 3 files changed, 18 deletions(-) > delete mode 100644 include/net/ila.h > Reviewed-by: David Ahern <dsahern@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 1 Aug 2023 22:31:29 +0800 you wrote: > Commit 642c2c95585d ("ila: xlat changes") removed ila_xlat_outgoing() > and ila_xlat_incoming() functions, then this file became unnecessary. > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com> > --- > include/net/ila.h | 16 ---------------- > net/ipv6/ila/ila_main.c | 1 - > net/ipv6/ila/ila_xlat.c | 1 - > 3 files changed, 18 deletions(-) > delete mode 100644 include/net/ila.h Here is the summary with links: - [net-next] ila: Remove unnecessary file net/ila.h https://git.kernel.org/netdev/net-next/c/2fca1b5ef898 You are awesome, thank you!
diff --git a/include/net/ila.h b/include/net/ila.h deleted file mode 100644 index 73ebe5eab272..000000000000 --- a/include/net/ila.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * ILA kernel interface - * - * Copyright (c) 2015 Tom Herbert <tom@herbertland.com> - */ - -#ifndef _NET_ILA_H -#define _NET_ILA_H - -struct sk_buff; - -int ila_xlat_outgoing(struct sk_buff *skb); -int ila_xlat_incoming(struct sk_buff *skb); - -#endif /* _NET_ILA_H */ diff --git a/net/ipv6/ila/ila_main.c b/net/ipv6/ila/ila_main.c index 3faf62530d6a..69caed07315f 100644 --- a/net/ipv6/ila/ila_main.c +++ b/net/ipv6/ila/ila_main.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include <net/genetlink.h> -#include <net/ila.h> #include <net/netns/generic.h> #include <uapi/linux/genetlink.h> #include "ila.h" diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c index bee45dfeb187..67e8c9440977 100644 --- a/net/ipv6/ila/ila_xlat.c +++ b/net/ipv6/ila/ila_xlat.c @@ -5,7 +5,6 @@ #include <linux/rhashtable.h> #include <linux/vmalloc.h> #include <net/genetlink.h> -#include <net/ila.h> #include <net/netns/generic.h> #include <uapi/linux/genetlink.h> #include "ila.h"
Commit 642c2c95585d ("ila: xlat changes") removed ila_xlat_outgoing() and ila_xlat_incoming() functions, then this file became unnecessary. Signed-off-by: Yue Haibing <yuehaibing@huawei.com> --- include/net/ila.h | 16 ---------------- net/ipv6/ila/ila_main.c | 1 - net/ipv6/ila/ila_xlat.c | 1 - 3 files changed, 18 deletions(-) delete mode 100644 include/net/ila.h