projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysrq: add commentary on why we use the console loglevel over using KERN_EMERG
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
firmware
/
iscsi_ibft.c
diff --git
a/drivers/firmware/iscsi_ibft.c
b/drivers/firmware/iscsi_ibft.c
index 4353414a0b770c368b938760e8630f50bd065346..3ab3e4a41d670f48af0583c841dae8a6d040748f 100644
(file)
--- a/
drivers/firmware/iscsi_ibft.c
+++ b/
drivers/firmware/iscsi_ibft.c
@@
-284,15
+284,12
@@
static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
/*
* IPV4
*/
/*
* IPV4
*/
- str += sprintf(buf, NIPQUAD_FMT, ip[12],
- ip[13], ip[14], ip[15]);
+ str += sprintf(buf, "%pI4", ip + 12);
} else {
/*
* IPv6
*/
} else {
/*
* IPv6
*/
- str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]),
- ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
- ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
+ str += sprintf(str, "%pI6", ip);
}
str += sprintf(str, "\n");
return str - buf;
}
str += sprintf(str, "\n");
return str - buf;