Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6884b348ed759184032306c9435a727741a72298

Authored by Joe Perches
Committed by David S. Miller
1 parent 650b2ef5d7
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

net/rds: remove uses of NIPQUAD, use %pI4 

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andy Grover <andy.grover@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 8 additions and 9 deletions Side-by-side Diff

net/rds/tcp_connect.c
Diff comments   View file @ 6884b34
... ... @@ -90,8 +90,8 @@
90 90  
91 91 ret = sock->ops->bind(sock, (struct sockaddr *)&src, sizeof(src));
92 92 if (ret) {
93   - rdsdebug("bind failed with %d at address %u.%u.%u.%u\n",
94   - ret, NIPQUAD(conn->c_laddr));
  93 + rdsdebug("bind failed with %d at address %pI4\n",
  94 + ret, &conn->c_laddr);
95 95 goto out;
96 96 }
97 97  
... ... @@ -108,8 +108,7 @@
108 108 O_NONBLOCK);
109 109 sock = NULL;
110 110  
111   - rdsdebug("connect to address %u.%u.%u.%u returned %d\n",
112   - NIPQUAD(conn->c_faddr), ret);
  111 + rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret);
113 112 if (ret == -EINPROGRESS)
114 113 ret = 0;
115 114  
net/rds/tcp_listen.c
Diff comments   View file @ 6884b34
... ... @@ -66,9 +66,9 @@
66 66  
67 67 inet = inet_sk(new_sock->sk);
68 68  
69   - rdsdebug("accepted tcp %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n",
70   - NIPQUAD(inet->inet_saddr), ntohs(inet->inet_sport),
71   - NIPQUAD(inet->inet_daddr), ntohs(inet->inet_dport));
  69 + rdsdebug("accepted tcp %pI4:%u -> %pI4:%u\n",
  70 + &inet->inet_saddr, ntohs(inet->inet_sport),
  71 + &inet->inet_daddr, ntohs(inet->inet_dport));
72 72  
73 73 conn = rds_conn_create(inet->inet_saddr, inet->inet_daddr,
74 74 &rds_tcp_transport, GFP_KERNEL);
... ... @@ -193,9 +193,9 @@
193 193 rds_tcp_stats_inc(s_tcp_sndbuf_full);
194 194 ret = 0;
195 195 } else {
196   - printk(KERN_WARNING "RDS/tcp: send to %u.%u.%u.%u "
  196 + printk(KERN_WARNING "RDS/tcp: send to %pI4 "
197 197 "returned %d, disconnecting and reconnecting\n",
198   - NIPQUAD(conn->c_faddr), ret);
  198 + &conn->c_faddr, ret);
199 199 rds_conn_drop(conn);
200 200 }
201 201 }