lkml.org 
[lkml]   [2020]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 28/49] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp()
    Date
    From: Yoshiyuki Kurauchi <ahochauwaaaaa@gmail.com>

    [ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ]

    In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI
    flag since it returns multipart message.
    This patch adds a new arg "flags" in gtp_genl_fill_info() so that
    flags can be set by the callers.

    Signed-off-by: Yoshiyuki Kurauchi <ahochauwaaaaa@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/gtp.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
    index 3a53d222bfcc1..d89ec99abcd63 100644
    --- a/drivers/net/gtp.c
    +++ b/drivers/net/gtp.c
    @@ -1172,11 +1172,11 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info)
    static struct genl_family gtp_genl_family;

    static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq,
    - u32 type, struct pdp_ctx *pctx)
    + int flags, u32 type, struct pdp_ctx *pctx)
    {
    void *genlh;

    - genlh = genlmsg_put(skb, snd_portid, snd_seq, &gtp_genl_family, 0,
    + genlh = genlmsg_put(skb, snd_portid, snd_seq, &gtp_genl_family, flags,
    type);
    if (genlh == NULL)
    goto nlmsg_failure;
    @@ -1230,8 +1230,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info)
    goto err_unlock;
    }

    - err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid,
    - info->snd_seq, info->nlhdr->nlmsg_type, pctx);
    + err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq,
    + 0, info->nlhdr->nlmsg_type, pctx);
    if (err < 0)
    goto err_unlock_free;

    @@ -1274,6 +1274,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb,
    gtp_genl_fill_info(skb,
    NETLINK_CB(cb->skb).portid,
    cb->nlh->nlmsg_seq,
    + NLM_F_MULTI,
    cb->nlh->nlmsg_type, pctx)) {
    cb->args[0] = i;
    cb->args[1] = j;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-05-14 20:54    [W:2.439 / U:0.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site