diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-15 20:04:11 -0500 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-03 19:24:03 +0200 |
| commit | ef6aafdba4c0683bdaeb55b5236f104577fee270 (patch) | |
| tree | 9ac02ab30d93945732b70c211a3e49f44716f5f6 /net | |
| parent | e769e2311aee9f3d0f40bc379fb8499ff5149f65 (diff) | |
ipv6: Compute net once in raw6_send_hdrinc
commit adb28c9d3371c845c7a28bfd4fb163aca0d0dc37 upstream.
Change-Id: I7c73ecac0b2e590d29a34bf1c8ebebd56b8fa4aa
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/raw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 7345fed1d..81a07e31b 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -608,6 +608,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, 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; @@ -647,7 +648,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, 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) @@ -661,7 +662,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; |