diff options
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 5750a2b2a0d6..cf358c84c440 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -550,7 +550,7 @@ int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr, | |||
550 | if (err < 0) | 550 | if (err < 0) |
551 | goto out; | 551 | goto out; |
552 | 552 | ||
553 | sock->state = SS_CONNECTING; | 553 | sock->state = SS_CONNECTING; |
554 | 554 | ||
555 | /* Just entered SS_CONNECTING state; the only | 555 | /* Just entered SS_CONNECTING state; the only |
556 | * difference is that return value in non-blocking | 556 | * difference is that return value in non-blocking |
@@ -878,36 +878,36 @@ static struct net_proto_family inet_family_ops = { | |||
878 | */ | 878 | */ |
879 | static struct inet_protosw inetsw_array[] = | 879 | static struct inet_protosw inetsw_array[] = |
880 | { | 880 | { |
881 | { | 881 | { |
882 | .type = SOCK_STREAM, | 882 | .type = SOCK_STREAM, |
883 | .protocol = IPPROTO_TCP, | 883 | .protocol = IPPROTO_TCP, |
884 | .prot = &tcp_prot, | 884 | .prot = &tcp_prot, |
885 | .ops = &inet_stream_ops, | 885 | .ops = &inet_stream_ops, |
886 | .capability = -1, | 886 | .capability = -1, |
887 | .no_check = 0, | 887 | .no_check = 0, |
888 | .flags = INET_PROTOSW_PERMANENT | | 888 | .flags = INET_PROTOSW_PERMANENT | |
889 | INET_PROTOSW_ICSK, | 889 | INET_PROTOSW_ICSK, |
890 | }, | 890 | }, |
891 | 891 | ||
892 | { | 892 | { |
893 | .type = SOCK_DGRAM, | 893 | .type = SOCK_DGRAM, |
894 | .protocol = IPPROTO_UDP, | 894 | .protocol = IPPROTO_UDP, |
895 | .prot = &udp_prot, | 895 | .prot = &udp_prot, |
896 | .ops = &inet_dgram_ops, | 896 | .ops = &inet_dgram_ops, |
897 | .capability = -1, | 897 | .capability = -1, |
898 | .no_check = UDP_CSUM_DEFAULT, | 898 | .no_check = UDP_CSUM_DEFAULT, |
899 | .flags = INET_PROTOSW_PERMANENT, | 899 | .flags = INET_PROTOSW_PERMANENT, |
900 | }, | 900 | }, |
901 | 901 | ||
902 | 902 | ||
903 | { | 903 | { |
904 | .type = SOCK_RAW, | 904 | .type = SOCK_RAW, |
905 | .protocol = IPPROTO_IP, /* wild card */ | 905 | .protocol = IPPROTO_IP, /* wild card */ |
906 | .prot = &raw_prot, | 906 | .prot = &raw_prot, |
907 | .ops = &inet_sockraw_ops, | 907 | .ops = &inet_sockraw_ops, |
908 | .capability = CAP_NET_RAW, | 908 | .capability = CAP_NET_RAW, |
909 | .no_check = UDP_CSUM_DEFAULT, | 909 | .no_check = UDP_CSUM_DEFAULT, |
910 | .flags = INET_PROTOSW_REUSE, | 910 | .flags = INET_PROTOSW_REUSE, |
911 | } | 911 | } |
912 | }; | 912 | }; |
913 | 913 | ||
@@ -946,7 +946,7 @@ void inet_register_protosw(struct inet_protosw *p) | |||
946 | /* Add the new entry after the last permanent entry if any, so that | 946 | /* Add the new entry after the last permanent entry if any, so that |
947 | * the new entry does not override a permanent entry when matched with | 947 | * the new entry does not override a permanent entry when matched with |
948 | * a wild-card protocol. But it is allowed to override any existing | 948 | * a wild-card protocol. But it is allowed to override any existing |
949 | * non-permanent entry. This means that when we remove this entry, the | 949 | * non-permanent entry. This means that when we remove this entry, the |
950 | * system automatically returns to the old behavior. | 950 | * system automatically returns to the old behavior. |
951 | */ | 951 | */ |
952 | list_add_rcu(&p->list, last_perm); | 952 | list_add_rcu(&p->list, last_perm); |
@@ -1073,7 +1073,7 @@ int inet_sk_rebuild_header(struct sock *sk) | |||
1073 | }, | 1073 | }, |
1074 | }, | 1074 | }, |
1075 | }; | 1075 | }; |
1076 | 1076 | ||
1077 | security_sk_classify_flow(sk, &fl); | 1077 | security_sk_classify_flow(sk, &fl); |
1078 | err = ip_route_output_flow(&rt, &fl, sk, 0); | 1078 | err = ip_route_output_flow(&rt, &fl, sk, 0); |
1079 | } | 1079 | } |
@@ -1273,10 +1273,10 @@ static int __init inet_init(void) | |||
1273 | goto out_unregister_udp_proto; | 1273 | goto out_unregister_udp_proto; |
1274 | 1274 | ||
1275 | /* | 1275 | /* |
1276 | * Tell SOCKET that we are alive... | 1276 | * Tell SOCKET that we are alive... |
1277 | */ | 1277 | */ |
1278 | 1278 | ||
1279 | (void)sock_register(&inet_family_ops); | 1279 | (void)sock_register(&inet_family_ops); |
1280 | 1280 | ||
1281 | /* | 1281 | /* |
1282 | * Add all the base protocols. | 1282 | * Add all the base protocols. |
@@ -1306,9 +1306,9 @@ static int __init inet_init(void) | |||
1306 | 1306 | ||
1307 | arp_init(); | 1307 | arp_init(); |
1308 | 1308 | ||
1309 | /* | 1309 | /* |
1310 | * Set the IP module up | 1310 | * Set the IP module up |
1311 | */ | 1311 | */ |
1312 | 1312 | ||
1313 | ip_init(); | 1313 | ip_init(); |
1314 | 1314 | ||
@@ -1334,11 +1334,11 @@ static int __init inet_init(void) | |||
1334 | #endif | 1334 | #endif |
1335 | /* | 1335 | /* |
1336 | * Initialise per-cpu ipv4 mibs | 1336 | * Initialise per-cpu ipv4 mibs |
1337 | */ | 1337 | */ |
1338 | 1338 | ||
1339 | if(init_ipv4_mibs()) | 1339 | if(init_ipv4_mibs()) |
1340 | printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n"); ; | 1340 | printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n"); ; |
1341 | 1341 | ||
1342 | ipv4_proc_init(); | 1342 | ipv4_proc_init(); |
1343 | 1343 | ||
1344 | ipfrag_init(); | 1344 | ipfrag_init(); |