Commit 7d06b2e0 authored by Brian Haley's avatar Brian Haley Committed by David S. Miller
Browse files

net: change proto destroy method to return void 



Change struct proto destroy function pointer to return void.  Noticed
by Al Viro.

Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ae127d1

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/net/transp_v6.h

+1 −1
Original line number Diff line number Diff line
@@ -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

net/dccp/dccp.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ extern int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 
				const struct dccp_hdr *dh, const unsigned len);



extern int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);

extern int dccp_destroy_sock(struct sock *sk);

extern void dccp_destroy_sock(struct sock *sk);



extern void		dccp_close(struct sock *sk, long timeout);

extern struct sk_buff	*dccp_make_response(struct sock *sk,

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -1091,10 +1091,10 @@ static int dccp_v6_init_sock(struct sock *sk) 
	return err;

}



static int dccp_v6_destroy_sock(struct sock *sk)

static void dccp_v6_destroy_sock(struct sock *sk)

{

	dccp_destroy_sock(sk);

	return inet6_destroy_sock(sk);

	inet6_destroy_sock(sk);

}



static struct timewait_sock_ops dccp6_timewait_sock_ops = {