inet: rename some inet_sock fields

In order to have better cache layouts of struct sock (separate zones
for rx/tx paths), we need this preliminary patch.

Goal is to transfert fields used at lookup time in the first
read-mostly cache line (inside struct sock_common) and move sk_refcnt
to a separate cache line (only written by rx path)

This patch adds inet_ prefix to daddr, rcv_saddr, dport, num, saddr,
sport and id fields. This allows a future patch to define these
fields as macros, like sk_refcnt, without name clashes.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 3bb90b6f1dd3..e04566a2c4e5 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -273,11 +273,11 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                         case AF_INET: {
                                 struct inet_sock *inet = inet_sk(sk);
 
-                                print_ipv4_addr(ab, inet->rcv_saddr,
-                                                inet->sport,
+                                print_ipv4_addr(ab, inet->inet_rcv_saddr,
+                                                inet->inet_sport,
                                                 "laddr", "lport");
-                                print_ipv4_addr(ab, inet->daddr,
-                                                inet->dport,
+                                print_ipv4_addr(ab, inet->inet_daddr,
+                                                inet->inet_dport,
                                                 "faddr", "fport");
                                 break;
                         }
@@ -286,10 +286,10 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                                 struct ipv6_pinfo *inet6 = inet6_sk(sk);
 
                                 print_ipv6_addr(ab, &inet6->rcv_saddr,
-                                                inet->sport,
+                                                inet->inet_sport,
                                                 "laddr", "lport");
                                 print_ipv6_addr(ab, &inet6->daddr,
-                                                inet->dport,
+                                                inet->inet_dport,
                                                 "faddr", "fport");
                                 break;
                         }