lkml.org 
[lkml]   [2020]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 35/64] l2tp: define parameters of l2tp_tunnel_find*() as "const"
    Date
    From: Guillaume Nault <g.nault@alphalink.fr>

    commit 2f858b928bf5a8174911aaec76b8b72a9ca0533d upstream.

    l2tp_tunnel_find() and l2tp_tunnel_find_nth() don't modify "net".

    Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Giuliano Procida <gprocida@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/l2tp/l2tp_core.c | 4 ++--
    net/l2tp/l2tp_core.h | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/net/l2tp/l2tp_core.c
    +++ b/net/l2tp/l2tp_core.c
    @@ -378,7 +378,7 @@ exist:

    /* 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);
    @@ -396,7 +396,7 @@ struct l2tp_tunnel *l2tp_tunnel_find(str
    }
    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;
    --- a/net/l2tp/l2tp_core.h
    +++ b/net/l2tp/l2tp_core.h
    @@ -239,8 +239,8 @@ struct l2tp_session *l2tp_session_get_nt
    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,

    \
     
     \ /
      Last update: 2020-05-26 21:31    [W:4.093 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site