aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 40887e76652c..8ee734ea5229 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -725,7 +725,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
725 if (len < 0) 725 if (len < 0)
726 return -EINVAL; 726 return -EINVAL;
727 727
728 v.val = 0; 728 memset(&v, 0, sizeof(v));
729 729
730 switch(optname) { 730 switch(optname) {
731 case SO_DEBUG: 731 case SO_DEBUG:
@@ -1185,7 +1185,6 @@ void sock_rfree(struct sk_buff *skb)
1185{ 1185{
1186 struct sock *sk = skb->sk; 1186 struct sock *sk = skb->sk;
1187 1187
1188 skb_truesize_check(skb);
1189 atomic_sub(skb->truesize, &sk->sk_rmem_alloc); 1188 atomic_sub(skb->truesize, &sk->sk_rmem_alloc);
1190 sk_mem_uncharge(skb->sk, skb->truesize); 1189 sk_mem_uncharge(skb->sk, skb->truesize);
1191} 1190}