projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[cascardo/linux.git]
/
net
/
ipv6
/
raw.c
diff --git
a/net/ipv6/raw.c
b/net/ipv6/raw.c
index
e53e493
..
2ba04d4
100644
(file)
--- a/
net/ipv6/raw.c
+++ b/
net/ipv6/raw.c
@@
-638,7
+638,7
@@
static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
if (err)
goto error_fault;
if (err)
goto error_fault;
- IP6_INC_STATS(rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS);
+ IP6_INC_STATS(
sock_net(sk),
rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS);
err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
dst_output);
if (err > 0)
err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
dst_output);
if (err > 0)
@@
-652,7
+652,7
@@
error_fault:
err = -EFAULT;
kfree_skb(skb);
error:
err = -EFAULT;
kfree_skb(skb);
error:
- IP6_INC_STATS(rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
+ IP6_INC_STATS(
sock_net(sk),
rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
return err;
}
return err;
}