| Message ID | 9d205b0e080153af0fbddee06ad0eb23457e1b1b.1610610937.git.mchehab+huawei@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fix several bad kernel-doc markups | expand |
On 1/14/21 3:04 AM, Mauro Carvalho Chehab wrote: > A function has a different name between their prototype > and its kernel-doc markup: > > ../net/tipc/link.c:2551: warning: expecting prototype for link_reset_stats(). Prototype was for tipc_link_reset_stats() instead > ../net/tipc/node.c:1678: warning: expecting prototype for is the general link level function for message sending(). Prototype was for tipc_node_xmit() instead > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > net/tipc/link.c | 2 +- > net/tipc/node.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/tipc/link.c b/net/tipc/link.c > index a6a694b78927..115109259430 100644 > --- a/net/tipc/link.c > +++ b/net/tipc/link.c > @@ -2544,7 +2544,7 @@ void tipc_link_set_queue_limits(struct tipc_link *l, u32 min_win, u32 max_win) > } > > /** > - * link_reset_stats - reset link statistics > + * tipc_link_reset_stats - reset link statistics > * @l: pointer to link > */ > void tipc_link_reset_stats(struct tipc_link *l) > diff --git a/net/tipc/node.c b/net/tipc/node.c > index 83d9eb830592..008670d1f43e 100644 > --- a/net/tipc/node.c > +++ b/net/tipc/node.c > @@ -1665,7 +1665,7 @@ static void tipc_lxc_xmit(struct net *peer_net, struct sk_buff_head *list) > } > > /** > - * tipc_node_xmit() is the general link level function for message sending > + * tipc_node_xmit() - general link level function for message sending > * @net: the applicable net namespace > * @list: chain of buffers containing message > * @dnode: address of destination node Acked-by: Jon Maloy <jmaloy@redhat.com>
On Thu, 14 Jan 2021 10:59:08 -0500 Jon Maloy wrote: > On 1/14/21 3:04 AM, Mauro Carvalho Chehab wrote: > > A function has a different name between their prototype > > and its kernel-doc markup: > > > > ../net/tipc/link.c:2551: warning: expecting prototype for link_reset_stats(). Prototype was for tipc_link_reset_stats() instead > > ../net/tipc/node.c:1678: warning: expecting prototype for is the general link level function for message sending(). Prototype was for tipc_node_xmit() instead > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > Acked-by: Jon Maloy <jmaloy@redhat.com> Thanks! Applied this one to net, the cfg80211 one does not apply to net, so I'll leave it to Johannes.
On Thu, 2021-01-14 at 10:34 -0800, Jakub Kicinski wrote: > On Thu, 14 Jan 2021 10:59:08 -0500 Jon Maloy wrote: > > On 1/14/21 3:04 AM, Mauro Carvalho Chehab wrote: > > > A function has a different name between their prototype > > > and its kernel-doc markup: > > > > > > ../net/tipc/link.c:2551: warning: expecting prototype for link_reset_stats(). Prototype was for tipc_link_reset_stats() instead > > > ../net/tipc/node.c:1678: warning: expecting prototype for is the general link level function for message sending(). Prototype was for tipc_node_xmit() instead > > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > > > Acked-by: Jon Maloy <jmaloy@redhat.com> > > Thanks! Applied this one to net, the cfg80211 one does not apply to > net, so I'll leave it to Johannes. Right, that was diffed against -next, and I've got a fix pending that I didn't send yet. I've applied this now, thanks. johannes
diff --git a/net/tipc/link.c b/net/tipc/link.c index a6a694b78927..115109259430 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -2544,7 +2544,7 @@ void tipc_link_set_queue_limits(struct tipc_link *l, u32 min_win, u32 max_win) } /** - * link_reset_stats - reset link statistics + * tipc_link_reset_stats - reset link statistics * @l: pointer to link */ void tipc_link_reset_stats(struct tipc_link *l) diff --git a/net/tipc/node.c b/net/tipc/node.c index 83d9eb830592..008670d1f43e 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -1665,7 +1665,7 @@ static void tipc_lxc_xmit(struct net *peer_net, struct sk_buff_head *list) } /** - * tipc_node_xmit() is the general link level function for message sending + * tipc_node_xmit() - general link level function for message sending * @net: the applicable net namespace * @list: chain of buffers containing message * @dnode: address of destination node
A function has a different name between their prototype and its kernel-doc markup: ../net/tipc/link.c:2551: warning: expecting prototype for link_reset_stats(). Prototype was for tipc_link_reset_stats() instead ../net/tipc/node.c:1678: warning: expecting prototype for is the general link level function for message sending(). Prototype was for tipc_node_xmit() instead Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- net/tipc/link.c | 2 +- net/tipc/node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)