summaryrefslogtreecommitdiffstats
path: root/include/net/inet_hashtables.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-21 17:21:34 +0200
committerDavid S. Miller <davem@davemloft.net>2010-10-21 17:21:34 +0200
commit9941fb62762253774cc6177d0b9172ece5133fe1 (patch)
tree641fc2b376e2f84c7023aa0cd8b9d76f954cc3a1 /include/net/inet_hashtables.h
parentcxgb3: function namespace cleanup (diff)
parentMerge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h... (diff)
downloadlinux-9941fb62762253774cc6177d0b9172ece5133fe1.tar.xz
linux-9941fb62762253774cc6177d0b9172ece5133fe1.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/net/inet_hashtables.h')
-rw-r--r--include/net/inet_hashtables.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 74358d1b3f43..e9c2ed8af864 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -245,7 +245,7 @@ static inline int inet_sk_listen_hashfn(const struct sock *sk)
}
/* Caller must disable local BH processing. */
-extern void __inet_inherit_port(struct sock *sk, struct sock *child);
+extern int __inet_inherit_port(struct sock *sk, struct sock *child);
extern void inet_put_port(struct sock *sk);