diff options
| author | Eric W. Biederman | 2015-09-16 03:04:11 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-09-18 02:18:36 +0200 |
| commit | adb28c9d3371c845c7a28bfd4fb163aca0d0dc37 (patch) | |
| tree | e270eb0d437f65f23bf378ef9961a6fd7354cb0a /net/ipv6/raw.c | |
| parent | ipv6: Cache net in ip6_output (diff) | |
| download | kernel-qcow2-linux-adb28c9d3371c845c7a28bfd4fb163aca0d0dc37.tar.gz kernel-qcow2-linux-adb28c9d3371c845c7a28bfd4fb163aca0d0dc37.tar.xz kernel-qcow2-linux-adb28c9d3371c845c7a28bfd4fb163aca0d0dc37.zip | |
ipv6: Compute net once in raw6_send_hdrinc
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
| -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 1636537705f5..5aa461302716 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -614,6 +614,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, 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; @@ -652,7 +653,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, 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, sk, skb, NULL, rt->dst.dev, dst_output); if (err > 0) @@ -666,7 +667,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; |