diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 03:54:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:54:56 -0400 |
commit | 21454aaad30651ba0dcc16fe5271bc12ee21f132 (patch) | |
tree | eb525494d6f80a0e855840bc588ae1f422348b04 /net/rxrpc/ar-local.c | |
parent | 14d5e834f6b36667c7da56374645f99b6cf30814 (diff) |
net: replace NIPQUAD() in net/*/
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/ar-local.c')
-rw-r--r-- | net/rxrpc/ar-local.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c index f3a2bd747a8f..807535ff29b5 100644 --- a/net/rxrpc/ar-local.c +++ b/net/rxrpc/ar-local.c | |||
@@ -131,10 +131,10 @@ struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx) | |||
131 | struct rxrpc_local *local; | 131 | struct rxrpc_local *local; |
132 | int ret; | 132 | int ret; |
133 | 133 | ||
134 | _enter("{%d,%u,%u.%u.%u.%u+%hu}", | 134 | _enter("{%d,%u,%pI4+%hu}", |
135 | srx->transport_type, | 135 | srx->transport_type, |
136 | srx->transport.family, | 136 | srx->transport.family, |
137 | NIPQUAD(srx->transport.sin.sin_addr), | 137 | &srx->transport.sin.sin_addr, |
138 | ntohs(srx->transport.sin.sin_port)); | 138 | ntohs(srx->transport.sin.sin_port)); |
139 | 139 | ||
140 | down_write(&rxrpc_local_sem); | 140 | down_write(&rxrpc_local_sem); |
@@ -143,10 +143,10 @@ struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx) | |||
143 | read_lock_bh(&rxrpc_local_lock); | 143 | read_lock_bh(&rxrpc_local_lock); |
144 | 144 | ||
145 | list_for_each_entry(local, &rxrpc_locals, link) { | 145 | list_for_each_entry(local, &rxrpc_locals, link) { |
146 | _debug("CMP {%d,%u,%u.%u.%u.%u+%hu}", | 146 | _debug("CMP {%d,%u,%pI4+%hu}", |
147 | local->srx.transport_type, | 147 | local->srx.transport_type, |
148 | local->srx.transport.family, | 148 | local->srx.transport.family, |
149 | NIPQUAD(local->srx.transport.sin.sin_addr), | 149 | &local->srx.transport.sin.sin_addr, |
150 | ntohs(local->srx.transport.sin.sin_port)); | 150 | ntohs(local->srx.transport.sin.sin_port)); |
151 | 151 | ||
152 | if (local->srx.transport_type != srx->transport_type || | 152 | if (local->srx.transport_type != srx->transport_type || |
@@ -188,11 +188,11 @@ struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx) | |||
188 | 188 | ||
189 | up_write(&rxrpc_local_sem); | 189 | up_write(&rxrpc_local_sem); |
190 | 190 | ||
191 | _net("LOCAL new %d {%d,%u,%u.%u.%u.%u+%hu}", | 191 | _net("LOCAL new %d {%d,%u,%pI4+%hu}", |
192 | local->debug_id, | 192 | local->debug_id, |
193 | local->srx.transport_type, | 193 | local->srx.transport_type, |
194 | local->srx.transport.family, | 194 | local->srx.transport.family, |
195 | NIPQUAD(local->srx.transport.sin.sin_addr), | 195 | &local->srx.transport.sin.sin_addr, |
196 | ntohs(local->srx.transport.sin.sin_port)); | 196 | ntohs(local->srx.transport.sin.sin_port)); |
197 | 197 | ||
198 | _leave(" = %p [new]", local); | 198 | _leave(" = %p [new]", local); |
@@ -203,11 +203,11 @@ found_local: | |||
203 | read_unlock_bh(&rxrpc_local_lock); | 203 | read_unlock_bh(&rxrpc_local_lock); |
204 | up_write(&rxrpc_local_sem); | 204 | up_write(&rxrpc_local_sem); |
205 | 205 | ||
206 | _net("LOCAL old %d {%d,%u,%u.%u.%u.%u+%hu}", | 206 | _net("LOCAL old %d {%d,%u,%pI4+%hu}", |
207 | local->debug_id, | 207 | local->debug_id, |
208 | local->srx.transport_type, | 208 | local->srx.transport_type, |
209 | local->srx.transport.family, | 209 | local->srx.transport.family, |
210 | NIPQUAD(local->srx.transport.sin.sin_addr), | 210 | &local->srx.transport.sin.sin_addr, |
211 | ntohs(local->srx.transport.sin.sin_port)); | 211 | ntohs(local->srx.transport.sin.sin_port)); |
212 | 212 | ||
213 | _leave(" = %p [reuse]", local); | 213 | _leave(" = %p [reuse]", local); |