* [PATCH nf-next] include: fix header file name in 3 comments
@ 2021-07-05 12:38 Duncan Roe
2021-07-05 18:34 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Duncan Roe @ 2021-07-05 12:38 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
include/uapi/linux/netfilter/nfnetlink_log.h | 2 +-
include/uapi/linux/netfilter/nfnetlink_queue.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/uapi/linux/netfilter/nfnetlink_log.h b/include/uapi/linux/netfilter/nfnetlink_log.h
index 45c8d3b027e0..0af9c113d665 100644
--- a/include/uapi/linux/netfilter/nfnetlink_log.h
+++ b/include/uapi/linux/netfilter/nfnetlink_log.h
@@ -61,7 +61,7 @@ enum nfulnl_attr_type {
NFULA_HWTYPE, /* hardware type */
NFULA_HWHEADER, /* hardware header */
NFULA_HWLEN, /* hardware header length */
- NFULA_CT, /* nf_conntrack_netlink.h */
+ NFULA_CT, /* nfnetlink_conntrack.h */
NFULA_CT_INFO, /* enum ip_conntrack_info */
NFULA_VLAN, /* nested attribute: packet vlan info */
NFULA_L2HDR, /* full L2 header */
diff --git a/include/uapi/linux/netfilter/nfnetlink_queue.h b/include/uapi/linux/netfilter/nfnetlink_queue.h
index bcb2cb5d40b9..aed90c4df0c8 100644
--- a/include/uapi/linux/netfilter/nfnetlink_queue.h
+++ b/include/uapi/linux/netfilter/nfnetlink_queue.h
@@ -51,11 +51,11 @@ enum nfqnl_attr_type {
NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
NFQA_HWADDR, /* nfqnl_msg_packet_hw */
NFQA_PAYLOAD, /* opaque data payload */
- NFQA_CT, /* nf_conntrack_netlink.h */
+ NFQA_CT, /* nfnetlink_conntrack.h */
NFQA_CT_INFO, /* enum ip_conntrack_info */
NFQA_CAP_LEN, /* __u32 length of captured packet */
NFQA_SKB_INFO, /* __u32 skb meta information */
- NFQA_EXP, /* nf_conntrack_netlink.h */
+ NFQA_EXP, /* nfnetlink_conntrack.h */
NFQA_UID, /* __u32 sk uid */
NFQA_GID, /* __u32 sk gid */
NFQA_SECCTX, /* security context string */
--
2.17.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH nf-next] include: fix header file name in 3 comments
2021-07-05 12:38 [PATCH nf-next] include: fix header file name in 3 comments Duncan Roe
@ 2021-07-05 18:34 ` Pablo Neira Ayuso
2021-07-05 18:35 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2021-07-05 18:34 UTC (permalink / raw)
To: Duncan Roe; +Cc: netfilter-devel
Please, add description to this patch, even one line should be fine,
e.g.
nf_conntrack_netlink.h does not exist, refer to nfnetlink_netlink.h
instead.
I suggest a more specific subject, such as:
netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h
Apart from these nitpicks, patch LGTM.
net-next is still closed (so it is nf-next too), but I'll keep this
patch in patchwork until it opens up again.
Please revamp and send v2, thanks.
On Mon, Jul 05, 2021 at 10:38:29PM +1000, Duncan Roe wrote:
> Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
> ---
> include/uapi/linux/netfilter/nfnetlink_log.h | 2 +-
> include/uapi/linux/netfilter/nfnetlink_queue.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/uapi/linux/netfilter/nfnetlink_log.h b/include/uapi/linux/netfilter/nfnetlink_log.h
> index 45c8d3b027e0..0af9c113d665 100644
> --- a/include/uapi/linux/netfilter/nfnetlink_log.h
> +++ b/include/uapi/linux/netfilter/nfnetlink_log.h
> @@ -61,7 +61,7 @@ enum nfulnl_attr_type {
> NFULA_HWTYPE, /* hardware type */
> NFULA_HWHEADER, /* hardware header */
> NFULA_HWLEN, /* hardware header length */
> - NFULA_CT, /* nf_conntrack_netlink.h */
> + NFULA_CT, /* nfnetlink_conntrack.h */
> NFULA_CT_INFO, /* enum ip_conntrack_info */
> NFULA_VLAN, /* nested attribute: packet vlan info */
> NFULA_L2HDR, /* full L2 header */
> diff --git a/include/uapi/linux/netfilter/nfnetlink_queue.h b/include/uapi/linux/netfilter/nfnetlink_queue.h
> index bcb2cb5d40b9..aed90c4df0c8 100644
> --- a/include/uapi/linux/netfilter/nfnetlink_queue.h
> +++ b/include/uapi/linux/netfilter/nfnetlink_queue.h
> @@ -51,11 +51,11 @@ enum nfqnl_attr_type {
> NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
> NFQA_HWADDR, /* nfqnl_msg_packet_hw */
> NFQA_PAYLOAD, /* opaque data payload */
> - NFQA_CT, /* nf_conntrack_netlink.h */
> + NFQA_CT, /* nfnetlink_conntrack.h */
> NFQA_CT_INFO, /* enum ip_conntrack_info */
> NFQA_CAP_LEN, /* __u32 length of captured packet */
> NFQA_SKB_INFO, /* __u32 skb meta information */
> - NFQA_EXP, /* nf_conntrack_netlink.h */
> + NFQA_EXP, /* nfnetlink_conntrack.h */
> NFQA_UID, /* __u32 sk uid */
> NFQA_GID, /* __u32 sk gid */
> NFQA_SECCTX, /* security context string */
> --
> 2.17.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH nf-next] include: fix header file name in 3 comments
2021-07-05 18:34 ` Pablo Neira Ayuso
@ 2021-07-05 18:35 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2021-07-05 18:35 UTC (permalink / raw)
To: Duncan Roe; +Cc: netfilter-devel
On Mon, Jul 05, 2021 at 08:34:35PM +0200, Pablo Neira Ayuso wrote:
> net-next is still closed (so it is nf-next too), but I'll keep this
> patch in patchwork until it opens up again.
Thinking it well, I can take this small fix to nf instead of nf-next,
so this fix propagates swifly upstream.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-05 18:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-05 12:38 [PATCH nf-next] include: fix header file name in 3 comments Duncan Roe
2021-07-05 18:34 ` Pablo Neira Ayuso
2021-07-05 18:35 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).