Skip to content

Commit 6bb0dcb

Browse files
igsilyakuba-moo
authored andcommitted
net: openvswitch: fix kernel-doc warnings in internal headers
Some field descriptions were missing, some were not very accurate. Not touching the uAPI header or .c files for now. Formatting of those comments isn't great in general, but at least they are not missing anything now. Before: $ ./scripts/kernel-doc -none -Wall net/openvswitch/*.h 2>&1 | wc -l 16 After: $ ./scripts/kernel-doc -none -Wall net/openvswitch/*.h 2>&1 | wc -l 0 Signed-off-by: Ilya Maximets <[email protected]> Acked-by: Eelco Chaudron <[email protected]> Reviewed-by: Aaron Conole <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ca1914a commit 6bb0dcb

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

net/openvswitch/datapath.h

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
* datapath.
3030
* @n_hit: Number of received packets for which a matching flow was found in
3131
* the flow table.
32-
* @n_miss: Number of received packets that had no matching flow in the flow
33-
* table. The sum of @n_hit and @n_miss is the number of packets that have
32+
* @n_missed: Number of received packets that had no matching flow in the flow
33+
* table. The sum of @n_hit and @n_missed is the number of packets that have
3434
* been received by the datapath.
3535
* @n_lost: Number of received packets that had no matching flow in the flow
3636
* table that could not be sent to userspace (normally due to an overflow in
@@ -40,6 +40,7 @@
4040
* up per packet.
4141
* @n_cache_hit: The number of received packets that had their mask found using
4242
* the mask cache.
43+
* @syncp: Synchronization point for 64bit counters.
4344
*/
4445
struct dp_stats_percpu {
4546
u64 n_hit;
@@ -74,8 +75,10 @@ struct dp_nlsk_pids {
7475
* ovs_mutex and RCU.
7576
* @stats_percpu: Per-CPU datapath statistics.
7677
* @net: Reference to net namespace.
77-
* @max_headroom: the maximum headroom of all vports in this datapath; it will
78+
* @user_features: Bitmap of enabled %OVS_DP_F_* features.
79+
* @max_headroom: The maximum headroom of all vports in this datapath; it will
7880
* be used by all the internal vports in this dp.
81+
* @meter_tbl: Meter table.
7982
* @upcall_portids: RCU protected 'struct dp_nlsk_pids'.
8083
*
8184
* Context: See the comment on locking at the top of datapath.c for additional
@@ -128,10 +131,13 @@ struct ovs_skb_cb {
128131
#define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
129132

130133
/**
131-
* struct dp_upcall - metadata to include with a packet to send to userspace
134+
* struct dp_upcall_info - metadata to include with a packet sent to userspace
132135
* @cmd: One of %OVS_PACKET_CMD_*.
133136
* @userdata: If nonnull, its variable-length value is passed to userspace as
134137
* %OVS_PACKET_ATTR_USERDATA.
138+
* @actions: If nonnull, its variable-length value is passed to userspace as
139+
* %OVS_PACKET_ATTR_ACTIONS.
140+
* @actions_len: The length of the @actions.
135141
* @portid: Netlink portid to which packet should be sent. If @portid is 0
136142
* then no packet is sent and the packet is accounted in the datapath's @n_lost
137143
* counter.
@@ -152,6 +158,10 @@ struct dp_upcall_info {
152158
* struct ovs_net - Per net-namespace data for ovs.
153159
* @dps: List of datapaths to enable dumping them all out.
154160
* Protected by genl_mutex.
161+
* @dp_notify_work: A work notifier to handle port unregistering.
162+
* @masks_rebalance: A work to periodically optimize flow table caches.
163+
* @ct_limit_info: A hash table of conntrack zone connection limits.
164+
* @xt_label: Whether connlables are configured for the network or not.
155165
*/
156166
struct ovs_net {
157167
struct list_head dps;
@@ -160,8 +170,6 @@ struct ovs_net {
160170
#if IS_ENABLED(CONFIG_NETFILTER_CONNCOUNT)
161171
struct ovs_ct_limit_info *ct_limit_info;
162172
#endif
163-
164-
/* Module reference for configuring conntrack. */
165173
bool xt_label;
166174
};
167175

net/openvswitch/vport.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ struct vport {
9797
* @desired_ifindex: New vport's ifindex.
9898
* @dp: New vport's datapath.
9999
* @port_no: New vport's port number.
100+
* @upcall_portids: %OVS_VPORT_ATTR_UPCALL_PID attribute from Netlink message,
101+
* %NULL if none was supplied.
100102
*/
101103
struct vport_parms {
102104
const char *name;
@@ -125,6 +127,8 @@ struct vport_parms {
125127
* have any configuration.
126128
* @send: Send a packet on the device.
127129
* zero for dropped packets or negative for error.
130+
* @owner: Module that implements this vport type.
131+
* @list: List entry in the global list of vport types.
128132
*/
129133
struct vport_ops {
130134
enum ovs_vport_type type;
@@ -144,6 +148,7 @@ struct vport_ops {
144148
/**
145149
* struct vport_upcall_stats_percpu - per-cpu packet upcall statistics for
146150
* a given vport.
151+
* @syncp: Synchronization point for 64bit counters.
147152
* @n_success: Number of packets that upcall to userspace succeed.
148153
* @n_fail: Number of packets that upcall to userspace failed.
149154
*/
@@ -164,6 +169,8 @@ void ovs_vport_free(struct vport *);
164169
*
165170
* @vport: vport to access
166171
*
172+
* Returns: A void pointer to a private data allocated in the @vport.
173+
*
167174
* If a nonzero size was passed in priv_size of vport_alloc() a private data
168175
* area was allocated on creation. This allows that area to be accessed and
169176
* used for any purpose needed by the vport implementer.
@@ -178,6 +185,8 @@ static inline void *vport_priv(const struct vport *vport)
178185
*
179186
* @priv: Start of private data area.
180187
*
188+
* Returns: A reference to a vport structure that contains @priv.
189+
*
181190
* It is sometimes useful to translate from a pointer to the private data
182191
* area to the vport, such as in the case where the private data pointer is
183192
* the result of a hash table lookup. @priv must point to the start of the

0 commit comments

Comments
 (0)