lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source
This commit is contained in:
David S. Miller
2009-02-24 03:50:29 -08:00
parent d18921a0e3 f7e603ad8f
commit e70049b9e7
380 changed files with 10886 additions and 2118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/sock.c
View File

@@ -725,7 +725,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
if (len < 0)
return -EINVAL;
v.val = 0;
memset(&v, 0, sizeof(v));
switch(optname) {
case SO_DEBUG:
@@ -1185,7 +1185,6 @@ void sock_rfree(struct sk_buff *skb)
{
struct sock *sk = skb->sk;
skb_truesize_check(skb);
atomic_sub(skb->truesize, &sk->sk_rmem_alloc);
sk_mem_uncharge(skb->sk, skb->truesize);
}