git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
net
/
ipv4
/
inet_hashtables.c
diff --git
a/net/ipv4/inet_hashtables.c
b/net/ipv4/inet_hashtables.c
index
984ec65
..
4afcf31
100644
(file)
--- a/
net/ipv4/inet_hashtables.c
+++ b/
net/ipv4/inet_hashtables.c
@@
-268,7
+268,7
@@
begintw:
}
if (unlikely(!INET_TW_MATCH(sk, net, hash, acookie,
saddr, daddr, ports, dif))) {
-
sock_put(sk
);
+
inet_twsk_put(inet_twsk(sk)
);
goto begintw;
}
goto out;