inet: rename some inet_sock fields

[net-next-2.6.git] / net / ipv4 / inet_connection_sock.c

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 9139e8f6fdb129319963a9c9f753b9e38533d221..f6a0af759932b558354f89363b80d4c833b8e0a9 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -368,7 +368,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
                            .proto = sk->sk_protocol,
                            .flags = inet_sk_flowi_flags(sk),
                            .uli_u = { .ports =
-                                      { .sport = inet_sk(sk)->sport,
+                                      { .sport = inet_sk(sk)->inet_sport,
                                         .dport = ireq->rmt_port } } };
        struct net *net = sock_net(sk);
 
@@ -547,9 +547,9 @@ struct sock *inet_csk_clone(struct sock *sk, const struct request_sock *req,
                newsk->sk_state = TCP_SYN_RECV;
                newicsk->icsk_bind_hash = NULL;
 
-               inet_sk(newsk)->dport = inet_rsk(req)->rmt_port;
-               inet_sk(newsk)->num = ntohs(inet_rsk(req)->loc_port);
-               inet_sk(newsk)->sport = inet_rsk(req)->loc_port;
+               inet_sk(newsk)->inet_dport = inet_rsk(req)->rmt_port;
+               inet_sk(newsk)->inet_num = ntohs(inet_rsk(req)->loc_port);
+               inet_sk(newsk)->inet_sport = inet_rsk(req)->loc_port;
                newsk->sk_write_space = sk_stream_write_space;
 
                newicsk->icsk_retransmits = 0;
@@ -580,8 +580,8 @@ void inet_csk_destroy_sock(struct sock *sk)
        /* It cannot be in hash table! */
        WARN_ON(!sk_unhashed(sk));
 
-       /* If it has not 0 inet_sk(sk)->num, it must be bound */
-       WARN_ON(inet_sk(sk)->num && !inet_csk(sk)->icsk_bind_hash);
+       /* If it has not 0 inet_sk(sk)->inet_num, it must be bound */
+       WARN_ON(inet_sk(sk)->inet_num && !inet_csk(sk)->icsk_bind_hash);
 
        sk->sk_prot->destroy(sk);
 
@@ -616,8 +616,8 @@ int inet_csk_listen_start(struct sock *sk, const int nr_table_entries)
         * after validation is complete.
         */
        sk->sk_state = TCP_LISTEN;
-       if (!sk->sk_prot->get_port(sk, inet->num)) {
-               inet->sport = htons(inet->num);
+       if (!sk->sk_prot->get_port(sk, inet->inet_num)) {
+               inet->inet_sport = htons(inet->inet_num);
 
                sk_dst_reset(sk);
                sk->sk_prot->hash(sk);
@@ -693,8 +693,8 @@ void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)
        const struct inet_sock *inet = inet_sk(sk);
 
        sin->sin_family         = AF_INET;
-       sin->sin_addr.s_addr    = inet->daddr;
-       sin->sin_port           = inet->dport;
+       sin->sin_addr.s_addr    = inet->inet_daddr;
+       sin->sin_port           = inet->inet_dport;
 }
 
 EXPORT_SYMBOL_GPL(inet_csk_addr2sockaddr);