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>
Šī revīzija ir iekļauta:

revīziju iesūtīja
David S. Miller

vecāks
14d5e834f6
revīzija
21454aaad3
@@ -792,12 +792,10 @@ static int dccp_v4_rcv(struct sk_buff *skb)
|
||||
DCCP_SKB_CB(skb)->dccpd_seq = dccp_hdr_seq(dh);
|
||||
DCCP_SKB_CB(skb)->dccpd_type = dh->dccph_type;
|
||||
|
||||
dccp_pr_debug("%8.8s "
|
||||
"src=%u.%u.%u.%u@%-5d "
|
||||
"dst=%u.%u.%u.%u@%-5d seq=%llu",
|
||||
dccp_pr_debug("%8.8s src=%pI4@%-5d dst=%pI4@%-5d seq=%llu",
|
||||
dccp_packet_name(dh->dccph_type),
|
||||
NIPQUAD(iph->saddr), ntohs(dh->dccph_sport),
|
||||
NIPQUAD(iph->daddr), ntohs(dh->dccph_dport),
|
||||
&iph->saddr, ntohs(dh->dccph_sport),
|
||||
&iph->daddr, ntohs(dh->dccph_dport),
|
||||
(unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq);
|
||||
|
||||
if (dccp_packet_without_ack(skb)) {
|
||||
|
@@ -86,18 +86,18 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
|
||||
if (port == 0 || ntohs(inet->dport) == port ||
|
||||
ntohs(inet->sport) == port) {
|
||||
if (hctx)
|
||||
printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %u "
|
||||
printl("%pI4:%u %pI4:%u %d %d %d %d %u "
|
||||
"%llu %llu %d\n",
|
||||
NIPQUAD(inet->saddr), ntohs(inet->sport),
|
||||
NIPQUAD(inet->daddr), ntohs(inet->dport), size,
|
||||
&inet->saddr, ntohs(inet->sport),
|
||||
&inet->daddr, ntohs(inet->dport), size,
|
||||
hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
|
||||
hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
|
||||
hctx->ccid3hctx_x_recv >> 6,
|
||||
hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
|
||||
else
|
||||
printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
|
||||
NIPQUAD(inet->saddr), ntohs(inet->sport),
|
||||
NIPQUAD(inet->daddr), ntohs(inet->dport), size);
|
||||
printl("%pI4:%u %pI4:%u %d\n",
|
||||
&inet->saddr, ntohs(inet->sport),
|
||||
&inet->daddr, ntohs(inet->dport), size);
|
||||
}
|
||||
|
||||
jprobe_return();
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user