diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 12:27:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 12:27:22 -0800 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /include/net/sock.h | |
| parent | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff) | |
| parent | 4b8fe66300acb2fba8b16d62606e0d30204022fc (diff) | |
| download | linux-b4aa9e05a61b845541fa6f5b1d246976922601f0.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 82e86034702f..21a02f7e4f45 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -769,6 +769,7 @@ struct proto { void (*unhash)(struct sock *sk); void (*rehash)(struct sock *sk); int (*get_port)(struct sock *sk, unsigned short snum); + void (*clear_sk)(struct sock *sk, int size); /* Keeping track of sockets in use */ #ifdef CONFIG_PROC_FS @@ -867,6 +868,8 @@ static inline void __sk_prot_rehash(struct sock *sk) sk->sk_prot->hash(sk); } +void sk_prot_clear_portaddr_nulls(struct sock *sk, int size); + /* About 10 seconds */ #define SOCK_DESTROY_TIME (10*HZ) |