Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b0f976f authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[INET]: Remove struct net_proto_family* from _init calls. 



struct net_proto_family* is not used in icmp[v6]_init, ndisc_init,
igmp_init and tcp_v4_init. Remove it.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c563f76

include/linux/icmpv6.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ extern void icmpv6_send(struct sk_buff *skb, 
						    __u32 info, 

						    struct net_device *dev);



extern int				icmpv6_init(struct net_proto_family *ops);

extern int				icmpv6_init(void);

extern int				icmpv6_err_convert(int type, int code,

							   int *err);

extern void				icmpv6_cleanup(void);

include/net/icmp.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct sk_buff; 
extern void	icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);

extern int	icmp_rcv(struct sk_buff *skb);

extern int	icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);

extern void	icmp_init(struct net_proto_family *ops);

extern void	icmp_init(void);

extern void	icmp_out_count(unsigned char type);



/* Move into dst.h ? */

include/net/ndisc.h

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct nd_opt_hdr { 
} __attribute__((__packed__));





extern int			ndisc_init(struct net_proto_family *ops);

extern int			ndisc_init(void);



extern void			ndisc_cleanup(void);
@@ -107,7 +107,7 @@ extern int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *d 
/*

 *	IGMP

 */

extern int			igmp6_init(struct net_proto_family *ops);

extern int			igmp6_init(void);



extern void			igmp6_cleanup(void);

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@ struct tcp_request_sock_ops { 
#endif

};



extern void tcp_v4_init(struct net_proto_family *ops);

extern void tcp_v4_init(void);

extern void tcp_init(void);



#endif	/* _TCP_H */

net/ipv4/af_inet.c

+2 −2
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ static int __init inet_init(void) 


	ip_init();



	tcp_v4_init(&inet_family_ops);

	tcp_v4_init();



	/* Setup TCP slab cache for open requests. */

	tcp_init();
@@ -1430,7 +1430,7 @@ static int __init inet_init(void) 
	 *	Set the ICMP layer up

	 */



	icmp_init(&inet_family_ops);

	icmp_init();



	/*

	 *	Initialise the multicast router