* [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*()
@ 2017-04-12 8:05 Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 1/2] l2tp: define parameters of l2tp_session_get*() as "const" Guillaume Nault
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Guillaume Nault @ 2017-04-12 8:05 UTC (permalink / raw)
To: netdev; +Cc: James Chapman
Declare parameters of these functions as "const" where possible.
Guillaume Nault (2):
l2tp: define parameters of l2tp_session_get*() as "const"
l2tp: define parameters of l2tp_tunnel_find*() as "const"
net/l2tp/l2tp_core.c | 11 ++++++-----
net/l2tp/l2tp_core.h | 9 +++++----
2 files changed, 11 insertions(+), 9 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] l2tp: define parameters of l2tp_session_get*() as "const"
2017-04-12 8:05 [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() Guillaume Nault
@ 2017-04-12 8:05 ` Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 2/2] l2tp: define parameters of l2tp_tunnel_find*() " Guillaume Nault
2017-04-12 14:44 ` [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Guillaume Nault @ 2017-04-12 8:05 UTC (permalink / raw)
To: netdev; +Cc: James Chapman
Make l2tp_pernet()'s parameter constant, so that l2tp_session_get*() can
declare their "net" variable as "const".
Also constify "ifname" in l2tp_session_get_by_ifname().
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
---
net/l2tp/l2tp_core.c | 7 ++++---
net/l2tp/l2tp_core.h | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 154974be1eed..4828111c9ea7 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -120,7 +120,7 @@ static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk)
return sk->sk_user_data;
}
-static inline struct l2tp_net *l2tp_pernet(struct net *net)
+static inline struct l2tp_net *l2tp_pernet(const struct net *net)
{
BUG_ON(!net);
@@ -232,7 +232,7 @@ l2tp_session_id_hash(struct l2tp_tunnel *tunnel, u32 session_id)
/* Lookup a session. A new reference is held on the returned session.
* Optionally calls session->ref() too if do_ref is true.
*/
-struct l2tp_session *l2tp_session_get(struct net *net,
+struct l2tp_session *l2tp_session_get(const struct net *net,
struct l2tp_tunnel *tunnel,
u32 session_id, bool do_ref)
{
@@ -307,7 +307,8 @@ EXPORT_SYMBOL_GPL(l2tp_session_get_nth);
/* Lookup a session by interface name.
* This is very inefficient but is only used by management interfaces.
*/
-struct l2tp_session *l2tp_session_get_by_ifname(struct net *net, char *ifname,
+struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,
+ const char *ifname,
bool do_ref)
{
struct l2tp_net *pn = l2tp_pernet(net);
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index a3248e18badb..1a46bc44632f 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -230,12 +230,13 @@ static inline struct l2tp_tunnel *l2tp_sock_to_tunnel(struct sock *sk)
return tunnel;
}
-struct l2tp_session *l2tp_session_get(struct net *net,
+struct l2tp_session *l2tp_session_get(const struct net *net,
struct l2tp_tunnel *tunnel,
u32 session_id, bool do_ref);
struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth,
bool do_ref);
-struct l2tp_session *l2tp_session_get_by_ifname(struct net *net, char *ifname,
+struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,
+ const char *ifname,
bool do_ref);
struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id);
struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth);
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] l2tp: define parameters of l2tp_tunnel_find*() as "const"
2017-04-12 8:05 [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 1/2] l2tp: define parameters of l2tp_session_get*() as "const" Guillaume Nault
@ 2017-04-12 8:05 ` Guillaume Nault
2017-04-12 14:44 ` [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Guillaume Nault @ 2017-04-12 8:05 UTC (permalink / raw)
To: netdev; +Cc: James Chapman
l2tp_tunnel_find() and l2tp_tunnel_find_nth() don't modify "net".
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
---
net/l2tp/l2tp_core.c | 4 ++--
net/l2tp/l2tp_core.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 4828111c9ea7..fa0342574b89 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -379,7 +379,7 @@ static int l2tp_session_add_to_tunnel(struct l2tp_tunnel *tunnel,
/* Lookup a tunnel by id
*/
-struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id)
+struct l2tp_tunnel *l2tp_tunnel_find(const struct net *net, u32 tunnel_id)
{
struct l2tp_tunnel *tunnel;
struct l2tp_net *pn = l2tp_pernet(net);
@@ -397,7 +397,7 @@ struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id)
}
EXPORT_SYMBOL_GPL(l2tp_tunnel_find);
-struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth)
+struct l2tp_tunnel *l2tp_tunnel_find_nth(const struct net *net, int nth)
{
struct l2tp_net *pn = l2tp_pernet(net);
struct l2tp_tunnel *tunnel;
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index 1a46bc44632f..eec5ad2ebb93 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -238,8 +238,8 @@ struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth,
struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,
const char *ifname,
bool do_ref);
-struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id);
-struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth);
+struct l2tp_tunnel *l2tp_tunnel_find(const struct net *net, u32 tunnel_id);
+struct l2tp_tunnel *l2tp_tunnel_find_nth(const struct net *net, int nth);
int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id,
u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*()
2017-04-12 8:05 [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 1/2] l2tp: define parameters of l2tp_session_get*() as "const" Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 2/2] l2tp: define parameters of l2tp_tunnel_find*() " Guillaume Nault
@ 2017-04-12 14:44 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2017-04-12 14:44 UTC (permalink / raw)
To: g.nault; +Cc: netdev, jchapman
From: Guillaume Nault <g.nault@alphalink.fr>
Date: Wed, 12 Apr 2017 10:05:28 +0200
> Declare parameters of these functions as "const" where possible.
Series applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-12 14:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12 8:05 [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 1/2] l2tp: define parameters of l2tp_session_get*() as "const" Guillaume Nault
2017-04-12 8:05 ` [PATCH net-next 2/2] l2tp: define parameters of l2tp_tunnel_find*() " Guillaume Nault
2017-04-12 14:44 ` [PATCH net-next 0/2] l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*() David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.