diff options
author | David S. Miller <davem@davemloft.net> | 2013-10-09 03:07:53 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-09 03:07:53 (GMT) |
commit | 53af53ae83fe960ceb9ef74cac7915e9088f4266 (patch) | |
tree | 0cd5309f2a931d3f210aa3d2025aae64f2276e8c /net/ipv4/inet_hashtables.c | |
parent | b343ca84b4e3ba65508503333c923a797801a588 (diff) | |
parent | 9684d7b0dab3cf3a897edd85dca501d413888d56 (diff) | |
download | linux-fsl-qoriq-53af53ae83fe960ceb9ef74cac7915e9088f4266.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/linux/netdevice.h
net/core/sock.c
Trivial merge issues.
Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.
Two parallel line additions in net/core/sock.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
-rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 2779037..ae19959 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -287,7 +287,7 @@ begintw: if (unlikely(!INET_TW_MATCH(sk, net, acookie, saddr, daddr, ports, dif))) { - sock_put(sk); + inet_twsk_put(inet_twsk(sk)); goto begintw; } goto out; |