Commit 30e224d7 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPV4]: Fix crash in ip_rcv while booting related to netconsole 



Makes IPv4 ip_rcv registration happen last in af_inet.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a31488ca

net/ipv4/af_inet.c

+11 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,15 @@ static int __init init_ipv4_mibs(void) 
static int ipv4_proc_init(void);

extern void ipfrag_init(void);



/*

 *	IP protocol layer initialiser

 */



static struct packet_type ip_packet_type = {

	.type = __constant_htons(ETH_P_IP),

	.func = ip_rcv,

};



static int __init inet_init(void)

{

	struct sk_buff *dummy_skb;
@@ -1102,6 +1111,8 @@ static int __init inet_init(void) 


	ipfrag_init();



	dev_add_pack(&ip_packet_type);



	rc = 0;

out:

	return rc;

net/ipv4/ip_output.c

+0 −15
Original line number Diff line number Diff line
@@ -1328,23 +1328,8 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar 
	ip_rt_put(rt);

}



/*

 *	IP protocol layer initialiser

 */



static struct packet_type ip_packet_type = {

	.type = __constant_htons(ETH_P_IP),

	.func = ip_rcv,

};



/*

 *	IP registers the packet type and then calls the subprotocol initialisers

 */



void __init ip_init(void)

{

	dev_add_pack(&ip_packet_type);



	ip_rt_init();

	inet_initpeers();