inet: rename some inet_sock fields

[mirror_ubuntu-zesty-kernel.git] / net / ipv6 / inet6_connection_sock.c

diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index a9f4a21b31ea3f619616f5c47d4ddee821a2608e..19dceef4fcca60e3b5a2eeb1a62398fd0e403f16 100644 (file)
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -132,7 +132,7 @@ void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr)
 
        sin6->sin6_family = AF_INET6;
        ipv6_addr_copy(&sin6->sin6_addr, &np->daddr);
-       sin6->sin6_port = inet_sk(sk)->dport;
+       sin6->sin6_port = inet_sk(sk)->inet_dport;
        /* We do not store received flowlabel for TCP */
        sin6->sin6_flowinfo = 0;
        sin6->sin6_scope_id = 0;
@@ -195,8 +195,8 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
        IP6_ECN_flow_xmit(sk, fl.fl6_flowlabel);
        fl.oif = sk->sk_bound_dev_if;
        fl.mark = sk->sk_mark;
-       fl.fl_ip_sport = inet->sport;
-       fl.fl_ip_dport = inet->dport;
+       fl.fl_ip_sport = inet->inet_sport;
+       fl.fl_ip_dport = inet->inet_dport;
        security_sk_classify_flow(sk, &fl);
 
        if (np->opt && np->opt->srcrt) {