* [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment
@ 2018-03-04 2:29 Jonathan Neuschäfer
2018-03-04 2:29 ` [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency Jonathan Neuschäfer
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jonathan Neuschäfer @ 2018-03-04 2:29 UTC (permalink / raw)
To: linux-kernel; +Cc: Jonathan Neuschäfer, David S. Miller, netdev
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
include/net/dst_cache.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/dst_cache.h b/include/net/dst_cache.h
index 72fd5067c353..844906fbf8c9 100644
--- a/include/net/dst_cache.h
+++ b/include/net/dst_cache.h
@@ -71,7 +71,7 @@ struct dst_entry *dst_cache_get_ip6(struct dst_cache *dst_cache,
* dst_cache_reset - invalidate the cache contents
* @dst_cache: the cache
*
- * This do not free the cached dst to avoid races and contentions.
+ * This does not free the cached dst to avoid races and contentions.
* the dst will be freed on later cache lookup.
*/
static inline void dst_cache_reset(struct dst_cache *dst_cache)
--
2.16.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency
2018-03-04 2:29 [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment Jonathan Neuschäfer
@ 2018-03-04 2:29 ` Jonathan Neuschäfer
2018-03-05 17:53 ` David Miller
2018-03-04 2:29 ` [PATCH 3/3] net: core: dst: Add kernel-doc for 'net' parameter Jonathan Neuschäfer
2018-03-05 17:53 ` [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Jonathan Neuschäfer @ 2018-03-04 2:29 UTC (permalink / raw)
To: linux-kernel; +Cc: Jonathan Neuschäfer, David S. Miller, netdev
The other dst_cache_{get,set}_ip{4,6} functions, and the doc comment for
dst_cache_set_ip6 use 'saddr' for their source address parameter. Rename
the parameter to increase consistency.
This fixes the following kernel-doc warnings:
./include/net/dst_cache.h:58: warning: Function parameter or member 'addr' not described in 'dst_cache_set_ip6'
./include/net/dst_cache.h:58: warning: Excess function parameter 'saddr' description in 'dst_cache_set_ip6'
Fixes: 911362c70df5 ("net: add dst_cache support")
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
include/net/dst_cache.h | 2 +-
net/core/dst_cache.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/dst_cache.h b/include/net/dst_cache.h
index 844906fbf8c9..67634675e919 100644
--- a/include/net/dst_cache.h
+++ b/include/net/dst_cache.h
@@ -54,7 +54,7 @@ void dst_cache_set_ip4(struct dst_cache *dst_cache, struct dst_entry *dst,
* local BH must be disabled.
*/
void dst_cache_set_ip6(struct dst_cache *dst_cache, struct dst_entry *dst,
- const struct in6_addr *addr);
+ const struct in6_addr *saddr);
/**
* dst_cache_get_ip6 - perform cache lookup and fetch ipv6 source address
diff --git a/net/core/dst_cache.c b/net/core/dst_cache.c
index 554d36449231..64cef977484a 100644
--- a/net/core/dst_cache.c
+++ b/net/core/dst_cache.c
@@ -107,7 +107,7 @@ EXPORT_SYMBOL_GPL(dst_cache_set_ip4);
#if IS_ENABLED(CONFIG_IPV6)
void dst_cache_set_ip6(struct dst_cache *dst_cache, struct dst_entry *dst,
- const struct in6_addr *addr)
+ const struct in6_addr *saddr)
{
struct dst_cache_pcpu *idst;
@@ -117,7 +117,7 @@ void dst_cache_set_ip6(struct dst_cache *dst_cache, struct dst_entry *dst,
idst = this_cpu_ptr(dst_cache->cache);
dst_cache_per_cpu_dst_set(this_cpu_ptr(dst_cache->cache), dst,
rt6_get_cookie((struct rt6_info *)dst));
- idst->in6_saddr = *addr;
+ idst->in6_saddr = *saddr;
}
EXPORT_SYMBOL_GPL(dst_cache_set_ip6);
--
2.16.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] net: core: dst: Add kernel-doc for 'net' parameter
2018-03-04 2:29 [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment Jonathan Neuschäfer
2018-03-04 2:29 ` [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency Jonathan Neuschäfer
@ 2018-03-04 2:29 ` Jonathan Neuschäfer
2018-03-05 17:53 ` David Miller
2018-03-05 17:53 ` [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Jonathan Neuschäfer @ 2018-03-04 2:29 UTC (permalink / raw)
To: linux-kernel; +Cc: Jonathan Neuschäfer, David S. Miller, netdev
This fixes the following kernel-doc warning:
./include/net/dst.h:366: warning: Function parameter or member 'net' not described in 'skb_tunnel_rx'
Fixes: ea23192e8e57 ("tunnels: harmonize cleanup done on skb on rx path")
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
include/net/dst.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/net/dst.h b/include/net/dst.h
index c63d2c37f6e9..b3219cd8a5a1 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -356,6 +356,7 @@ static inline void __skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev,
* skb_tunnel_rx - prepare skb for rx reinsert
* @skb: buffer
* @dev: tunnel device
+ * @net: netns for packet i/o
*
* After decapsulation, packet is going to re-enter (netif_rx()) our stack,
* so make some cleanups, and perform accounting.
--
2.16.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment
2018-03-04 2:29 [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment Jonathan Neuschäfer
2018-03-04 2:29 ` [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency Jonathan Neuschäfer
2018-03-04 2:29 ` [PATCH 3/3] net: core: dst: Add kernel-doc for 'net' parameter Jonathan Neuschäfer
@ 2018-03-05 17:53 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-03-05 17:53 UTC (permalink / raw)
To: j.neuschaefer; +Cc: linux-kernel, netdev
From: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Date: Sun, 4 Mar 2018 03:29:51 +0100
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Applied to net-next.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency
2018-03-04 2:29 ` [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency Jonathan Neuschäfer
@ 2018-03-05 17:53 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-03-05 17:53 UTC (permalink / raw)
To: j.neuschaefer; +Cc: linux-kernel, netdev
From: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Date: Sun, 4 Mar 2018 03:29:52 +0100
> The other dst_cache_{get,set}_ip{4,6} functions, and the doc comment for
> dst_cache_set_ip6 use 'saddr' for their source address parameter. Rename
> the parameter to increase consistency.
>
> This fixes the following kernel-doc warnings:
>
> ./include/net/dst_cache.h:58: warning: Function parameter or member 'addr' not described in 'dst_cache_set_ip6'
> ./include/net/dst_cache.h:58: warning: Excess function parameter 'saddr' description in 'dst_cache_set_ip6'
>
> Fixes: 911362c70df5 ("net: add dst_cache support")
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Applied to net-next.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] net: core: dst: Add kernel-doc for 'net' parameter
2018-03-04 2:29 ` [PATCH 3/3] net: core: dst: Add kernel-doc for 'net' parameter Jonathan Neuschäfer
@ 2018-03-05 17:53 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-03-05 17:53 UTC (permalink / raw)
To: j.neuschaefer; +Cc: linux-kernel, netdev
From: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Date: Sun, 4 Mar 2018 03:29:53 +0100
> This fixes the following kernel-doc warning:
>
> ./include/net/dst.h:366: warning: Function parameter or member 'net' not described in 'skb_tunnel_rx'
>
> Fixes: ea23192e8e57 ("tunnels: harmonize cleanup done on skb on rx path")
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Applied to net-next.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-05 17:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-04 2:29 [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment Jonathan Neuschäfer
2018-03-04 2:29 ` [PATCH 2/3] net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency Jonathan Neuschäfer
2018-03-05 17:53 ` David Miller
2018-03-04 2:29 ` [PATCH 3/3] net: core: dst: Add kernel-doc for 'net' parameter Jonathan Neuschäfer
2018-03-05 17:53 ` David Miller
2018-03-05 17:53 ` [PATCH 1/3] net: core: dst_cache: Fix a typo in a comment David Miller
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).