diff options
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r-- | net/ipv4/ip_output.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6ce5c3292f9f..9de83e6e0f1d 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -389,7 +389,6 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) | |||
389 | to->pkt_type = from->pkt_type; | 389 | to->pkt_type = from->pkt_type; |
390 | to->priority = from->priority; | 390 | to->priority = from->priority; |
391 | to->protocol = from->protocol; | 391 | to->protocol = from->protocol; |
392 | to->security = from->security; | ||
393 | dst_release(to->dst); | 392 | dst_release(to->dst); |
394 | to->dst = dst_clone(from->dst); | 393 | to->dst = dst_clone(from->dst); |
395 | to->dev = from->dev; | 394 | to->dev = from->dev; |
@@ -1329,23 +1328,8 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar | |||
1329 | ip_rt_put(rt); | 1328 | ip_rt_put(rt); |
1330 | } | 1329 | } |
1331 | 1330 | ||
1332 | /* | ||
1333 | * IP protocol layer initialiser | ||
1334 | */ | ||
1335 | |||
1336 | static struct packet_type ip_packet_type = { | ||
1337 | .type = __constant_htons(ETH_P_IP), | ||
1338 | .func = ip_rcv, | ||
1339 | }; | ||
1340 | |||
1341 | /* | ||
1342 | * IP registers the packet type and then calls the subprotocol initialisers | ||
1343 | */ | ||
1344 | |||
1345 | void __init ip_init(void) | 1331 | void __init ip_init(void) |
1346 | { | 1332 | { |
1347 | dev_add_pack(&ip_packet_type); | ||
1348 | |||
1349 | ip_rt_init(); | 1333 | ip_rt_init(); |
1350 | inet_initpeers(); | 1334 | inet_initpeers(); |
1351 | 1335 | ||