lkml.org 
[lkml]   [2018]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 297/328] ipv6: Compute net once in raw6_send_hdrinc
    3.16.62-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Eric W. Biederman" <ebiederm@xmission.com>

    commit adb28c9d3371c845c7a28bfd4fb163aca0d0dc37 upstream.

    Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/ipv6/raw.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/net/ipv6/raw.c
    +++ b/net/ipv6/raw.c
    @@ -618,6 +618,7 @@ static int rawv6_send_hdrinc(struct sock
    unsigned int flags)
    {
    struct ipv6_pinfo *np = inet6_sk(sk);
    + struct net *net = sock_net(sk);
    struct ipv6hdr *iph;
    struct sk_buff *skb;
    int err;
    @@ -656,7 +657,7 @@ static int rawv6_send_hdrinc(struct sock
    if (err)
    goto error_fault;

    - IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
    + IP6_UPD_PO_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
    err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL,
    rt->dst.dev, dst_output);
    if (err > 0)
    @@ -670,7 +671,7 @@ error_fault:
    err = -EFAULT;
    kfree_skb(skb);
    error:
    - IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
    + IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
    if (err == -ENOBUFS && !np->recverr)
    err = 0;
    return err;
    \
     
     \ /
      Last update: 2018-12-09 22:57    [W:4.039 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site