diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-07-05 17:40:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-05 17:40:10 -0400 |
| commit | 30e224d76f34e041c30df66a4dcbeeb53556ea3f (patch) | |
| tree | 0a2d6bb1e699a1df9b9350f5c5a235d825673248 /net/ipv4/ip_output.c | |
| parent | a31488ca4b8476a8dd301b21388631df52d05c5a (diff) | |
[IPV4]: Fix crash in ip_rcv while booting related to netconsole
Makes IPv4 ip_rcv registration happen last in af_inet.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 1bfa49eda96f..9de83e6e0f1d 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
| @@ -1328,23 +1328,8 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar | |||
| 1328 | ip_rt_put(rt); | 1328 | ip_rt_put(rt); |
| 1329 | } | 1329 | } |
| 1330 | 1330 | ||
| 1331 | /* | ||
| 1332 | * IP protocol layer initialiser | ||
| 1333 | */ | ||
| 1334 | |||
| 1335 | static struct packet_type ip_packet_type = { | ||
| 1336 | .type = __constant_htons(ETH_P_IP), | ||
| 1337 | .func = ip_rcv, | ||
| 1338 | }; | ||
| 1339 | |||
| 1340 | /* | ||
| 1341 | * IP registers the packet type and then calls the subprotocol initialisers | ||
| 1342 | */ | ||
| 1343 | |||
| 1344 | void __init ip_init(void) | 1331 | void __init ip_init(void) |
| 1345 | { | 1332 | { |
| 1346 | dev_add_pack(&ip_packet_type); | ||
| 1347 | |||
| 1348 | ip_rt_init(); | 1333 | ip_rt_init(); |
| 1349 | inet_initpeers(); | 1334 | inet_initpeers(); |
| 1350 | 1335 | ||
