netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>, Andrew Lunn <andrew@lunn.ch>,
	Pablo Neira Ayuso <pablo@netfilter.org>,
	Jozsef Kadlecsik <kadlec@netfilter.org>,
	Florian Westphal <fw@strlen.de>
Subject: [PATCH net-next 10/20] net: netfilter: kerneldoc fixes
Date: Mon, 13 Jul 2020 01:15:06 +0200	[thread overview]
Message-ID: <20200712231516.1139335-11-andrew@lunn.ch> (raw)
In-Reply-To: <20200712231516.1139335-1-andrew@lunn.ch>

Simple fixes which require no deep knowledge of the code.

Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/netfilter/nf_conntrack_core.c | 2 +-
 net/netfilter/nf_tables_api.c     | 8 ++++----
 net/netfilter/nft_set_pipapo.c    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 79cd9dde457b..cb83a1f8badd 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1006,7 +1006,7 @@ static int nf_ct_resolve_clash_harder(struct sk_buff *skb, u32 repl_idx)
  *
  * @skb: skb that causes the clash
  * @h: tuplehash of the clashing entry already in table
- * @hash_reply: hash slot for reply direction
+ * @reply_hash: hash slot for reply direction
  *
  * A conntrack entry can be inserted to the connection tracking table
  * if there is no existing entry with an identical tuple.
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index f96785586f64..6708a4f2eec8 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2375,7 +2375,7 @@ static int nf_tables_delchain(struct net *net, struct sock *nlsk,
 
 /**
  *	nft_register_expr - register nf_tables expr type
- *	@ops: expr type
+ *	@type: expr type
  *
  *	Registers the expr type for use with nf_tables. Returns zero on
  *	success or a negative errno code otherwise.
@@ -2394,7 +2394,7 @@ EXPORT_SYMBOL_GPL(nft_register_expr);
 
 /**
  *	nft_unregister_expr - unregister nf_tables expr type
- *	@ops: expr type
+ *	@type: expr type
  *
  * 	Unregisters the expr typefor use with nf_tables.
  */
@@ -5595,7 +5595,7 @@ struct nft_set_gc_batch *nft_set_gc_batch_alloc(const struct nft_set *set,
 
 /**
  *	nft_register_obj- register nf_tables stateful object type
- *	@obj: object type
+ *	@obj_type: object type
  *
  *	Registers the object type for use with nf_tables. Returns zero on
  *	success or a negative errno code otherwise.
@@ -5614,7 +5614,7 @@ EXPORT_SYMBOL_GPL(nft_register_obj);
 
 /**
  *	nft_unregister_obj - unregister nf_tables object type
- *	@obj: object type
+ *	@obj_type: object type
  *
  * 	Unregisters the object type for use with nf_tables.
  */
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index 313de1d73168..cc6082a5f7ad 100644
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -401,7 +401,7 @@ int pipapo_refill(unsigned long *map, int len, int rules, unsigned long *dst,
  * nft_pipapo_lookup() - Lookup function
  * @net:	Network namespace
  * @set:	nftables API set representation
- * @elem:	nftables API element representation containing key data
+ * @key:	nftables API element representation containing key data
  * @ext:	nftables API extension pointer, filled with matching reference
  *
  * For more details, see DOC: Theory of Operation.
@@ -1075,7 +1075,7 @@ static int pipapo_expand(struct nft_pipapo_field *f,
  * @m:		Matching data, including mapping table
  * @map:	Table of rule maps: array of first rule and amount of rules
  *		in next field a given rule maps to, for each field
- * @ext:	For last field, nft_set_ext pointer matching rules map to
+ * @e:		For last field, nft_set_ext pointer matching rules map to
  */
 static void pipapo_map(struct nft_pipapo_match *m,
 		       union nft_pipapo_map_bucket map[NFT_PIPAPO_MAX_FIELDS],
@@ -1099,7 +1099,7 @@ static void pipapo_map(struct nft_pipapo_match *m,
 /**
  * pipapo_realloc_scratch() - Reallocate scratch maps for partial match results
  * @clone:	Copy of matching data with pending insertions and deletions
- * @bsize_max	Maximum bucket size, scratch maps cover two buckets
+ * @bsize_max:	Maximum bucket size, scratch maps cover two buckets
  *
  * Return: 0 on success, -ENOMEM on failure.
  */
@@ -1447,7 +1447,7 @@ static void pipapo_unmap(union nft_pipapo_map_bucket *mt, int rules,
 /**
  * pipapo_drop() - Delete entry from lookup and mapping tables, given rule map
  * @m:		Matching data
- * @rulemap	Table of rule maps, arrays of first rule and amount of rules
+ * @rulemap:	Table of rule maps, arrays of first rule and amount of rules
  *		in next field a given entry maps to, for each field
  *
  * For each rule in lookup table buckets mapping to this set of rules, drop
-- 
2.27.0.rc2


  parent reply	other threads:[~2020-07-12 23:16 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-12 23:14 [PATCH net-next 00/20] net simple kerneldoc fixes Andrew Lunn
2020-07-12 23:14 ` [PATCH net-next 01/20] net: 9p: " Andrew Lunn
2020-07-13  8:13   ` Dominique Martinet
2020-07-12 23:14 ` [PATCH net-next 02/20] net: can: " Andrew Lunn
2020-07-12 23:14 ` [PATCH net-next 03/20] net: core: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 04/20] net: dccp: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 05/20] net: decnet: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 06/20] net: ipv4: " Andrew Lunn
2020-07-13 16:38   ` Paul Moore
2020-07-12 23:15 ` [PATCH net-next 07/20] net: ipv6: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 08/20] net: llc: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 09/20] net: mac80211: " Andrew Lunn
2020-07-12 23:15 ` Andrew Lunn [this message]
2020-07-12 23:15 ` [PATCH net-next 11/20] net: netlabel: " Andrew Lunn
2020-07-13 16:40   ` Paul Moore
2020-07-12 23:15 ` [PATCH net-next 12/20] net: nfc: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 13/20] net: openvswitch: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 14/20] net: rxrpc: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 15/20] net: sched: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 16/20] net: socket: Move kerneldoc next to function it documents Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 17/20] net: switchdev: kerneldoc fixes Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 18/20] net: tipc: " Andrew Lunn
2020-07-13 14:10   ` Jon Maloy
2020-07-12 23:15 ` [PATCH net-next 19/20] net: wireless: " Andrew Lunn
2020-07-12 23:15 ` [PATCH net-next 20/20] net: x25: " Andrew Lunn
2020-07-14  0:20 ` [PATCH net-next 00/20] net simple " David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200712231516.1139335-11-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=fw@strlen.de \
    --cc=kadlec@netfilter.org \
    --cc=netdev@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).