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>,
	Pravin B Shelar <pshelar@ovn.org>
Subject: [PATCH net-next 13/20] net: openvswitch: kerneldoc fixes
Date: Mon, 13 Jul 2020 01:15:09 +0200	[thread overview]
Message-ID: <20200712231516.1139335-14-andrew@lunn.ch> (raw)
In-Reply-To: <20200712231516.1139335-1-andrew@lunn.ch>

Simple fixes which require no deep knowledge of the code.

Cc: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/openvswitch/flow_netlink.c | 6 +++---
 net/openvswitch/vport.c        | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 79252d4887ff..9d3e50c4d29f 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -1763,11 +1763,11 @@ static void mask_set_nlattr(struct nlattr *attr, u8 val)
  * does not include any don't care bit.
  * @net: Used to determine per-namespace field support.
  * @match: receives the extracted flow match information.
- * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
+ * @nla_key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
  * sequence. The fields should of the packet that triggered the creation
  * of this flow.
- * @mask: Optional. Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink
- * attribute specifies the mask field of the wildcarded flow.
+ * @nla_mask: Optional. Netlink attribute holding nested %OVS_KEY_ATTR_*
+ * Netlink attribute specifies the mask field of the wildcarded flow.
  * @log: Boolean to allow kernel error logging.  Normally true, but when
  * probing for feature compatibility this should be passed in as false to
  * suppress unnecessary error logging.
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 47febb4504f0..0d44c5c013fa 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -87,6 +87,7 @@ EXPORT_SYMBOL_GPL(ovs_vport_ops_unregister);
 /**
  *	ovs_vport_locate - find a port that has already been created
  *
+ * @net: network namespace
  * @name: name of port to find
  *
  * Must be called with ovs or RCU read lock.
@@ -418,7 +419,7 @@ u32 ovs_vport_find_upcall_portid(const struct vport *vport, struct sk_buff *skb)
  *
  * @vport: vport that received the packet
  * @skb: skb that was received
- * @tun_key: tunnel (if any) that carried packet
+ * @tun_info: tunnel (if any) that carried packet
  *
  * Must be called with rcu_read_lock.  The packet cannot be shared and
  * skb->data should point to the Ethernet header.
-- 
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 ` [PATCH net-next 10/20] net: netfilter: " Andrew Lunn
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 ` Andrew Lunn [this message]
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-14-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=pshelar@ovn.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).