diff options
| author | Brian Haley <brian.haley@hp.com> | 2008-06-14 17:04:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-14 17:04:49 -0700 |
| commit | 7d06b2e053d2d536348e3a0f6bb02982a41bea37 (patch) | |
| tree | ec6a5c3f448e84cd431a0397b9e2a87ca25aec17 /include | |
| parent | 4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (diff) | |
| download | linux-stable-7d06b2e053d2d536348e3a0f6bb02982a41bea37.tar.gz linux-stable-7d06b2e053d2d536348e3a0f6bb02982a41bea37.tar.bz2 linux-stable-7d06b2e053d2d536348e3a0f6bb02982a41bea37.zip | |
net: change proto destroy method to return void
Change struct proto destroy function pointer to return void. Noticed
by Al Viro.
Signed-off-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 2 | ||||
| -rw-r--r-- | include/net/tcp.h | 2 | ||||
| -rw-r--r-- | include/net/transp_v6.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index dc42b44c2aa1..0a80961a83c0 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -524,7 +524,7 @@ struct proto { int (*ioctl)(struct sock *sk, int cmd, unsigned long arg); int (*init)(struct sock *sk); - int (*destroy)(struct sock *sk); + void (*destroy)(struct sock *sk); void (*shutdown)(struct sock *sk, int how); int (*setsockopt)(struct sock *sk, int level, int optname, char __user *optval, diff --git a/include/net/tcp.h b/include/net/tcp.h index b5a1b9eb12e8..6b827cc6c52f 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1366,7 +1366,7 @@ extern void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo); extern struct request_sock_ops tcp_request_sock_ops; extern struct request_sock_ops tcp6_request_sock_ops; -extern int tcp_v4_destroy_sock(struct sock *sk); +extern void tcp_v4_destroy_sock(struct sock *sk); extern int tcp_v4_gso_send_check(struct sk_buff *skb); extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features); diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index 112934a3288d..876b6f2bb4fd 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h @@ -53,7 +53,7 @@ extern int datagram_send_ctl(struct net *net, */ extern struct inet_connection_sock_af_ops ipv4_specific; -extern int inet6_destroy_sock(struct sock *sk); +extern void inet6_destroy_sock(struct sock *sk); #endif |