| Message ID | ef6468a687f36da06f575c2131cd4612f6b7be88.1668526821.git.lucien.xin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 647541ea06a7bbbcf941e501c726b3e26328c102 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] sctp: move SCTP_PAD4 and SCTP_TRUNC4 to linux/sctp.h | expand |
On 15 Nov 10:40, Xin Long wrote: >Move these two macros from net/sctp/sctp.h to linux/sctp.h, so that >it will be enough to include only linux/sctp.h in nft_exthdr.c and >xt_sctp.c. It should not include "net/sctp/sctp.h" if a module does >not have a dependence on SCTP module. > >Signed-off-by: Xin Long <lucien.xin@gmail.com> LGTM as long as it builds: Reviewed-by: Saeed Mahameed <saeed@kernel.org>
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 15 Nov 2022 10:40:21 -0500 you wrote: > Move these two macros from net/sctp/sctp.h to linux/sctp.h, so that > it will be enough to include only linux/sctp.h in nft_exthdr.c and > xt_sctp.c. It should not include "net/sctp/sctp.h" if a module does > not have a dependence on SCTP module. > > Signed-off-by: Xin Long <lucien.xin@gmail.com> > > [...] Here is the summary with links: - [net-next] sctp: move SCTP_PAD4 and SCTP_TRUNC4 to linux/sctp.h https://git.kernel.org/netdev/net-next/c/647541ea06a7 You are awesome, thank you!
diff --git a/include/linux/sctp.h b/include/linux/sctp.h index a86e852507b3..358dc08e0831 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -820,4 +820,9 @@ struct sctp_new_encap_port_hdr { __be16 new_port; }; +/* Round an int up to the next multiple of 4. */ +#define SCTP_PAD4(s) (((s)+3)&~3) +/* Truncate to the previous multiple of 4. */ +#define SCTP_TRUNC4(s) ((s)&~3) + #endif /* __LINUX_SCTP_H__ */ diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 4d36846e8845..bfa1b89782e2 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -67,11 +67,6 @@ #define SCTP_PROTOSW_FLAG INET_PROTOSW_PERMANENT #endif -/* Round an int up to the next multiple of 4. */ -#define SCTP_PAD4(s) (((s)+3)&~3) -/* Truncate to the previous multiple of 4. */ -#define SCTP_TRUNC4(s) ((s)&~3) - /* * Function declarations. */ diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c index a67ea9c3ae57..d956c034ed8d 100644 --- a/net/netfilter/nft_exthdr.c +++ b/net/netfilter/nft_exthdr.c @@ -13,7 +13,6 @@ #include <linux/sctp.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> -#include <net/sctp/sctp.h> #include <net/tcp.h> struct nft_exthdr { diff --git a/net/netfilter/xt_sctp.c b/net/netfilter/xt_sctp.c index 680015ba7cb6..e8961094a282 100644 --- a/net/netfilter/xt_sctp.c +++ b/net/netfilter/xt_sctp.c @@ -4,7 +4,6 @@ #include <linux/skbuff.h> #include <net/ip.h> #include <net/ipv6.h> -#include <net/sctp/sctp.h> #include <linux/sctp.h> #include <linux/netfilter/x_tables.h>
Move these two macros from net/sctp/sctp.h to linux/sctp.h, so that it will be enough to include only linux/sctp.h in nft_exthdr.c and xt_sctp.c. It should not include "net/sctp/sctp.h" if a module does not have a dependence on SCTP module. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- include/linux/sctp.h | 5 +++++ include/net/sctp/sctp.h | 5 ----- net/netfilter/nft_exthdr.c | 1 - net/netfilter/xt_sctp.c | 1 - 4 files changed, 5 insertions(+), 7 deletions(-)