提交 00e7825b 编写于 作者: J Joe Perches 提交者: Konrad Rzeszutek Wilk

drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4

Convert netmask to __be32 and format it with %pI4
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NKonrad Rzeszutek <ketuzsezr@darnok.org>
Reviewed-by: NMike Christie <michaelc@cs.wisc.edu>
Cc: Peter Jones <pjones@redhat.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
上级 6ebdc661
...@@ -381,7 +381,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry, ...@@ -381,7 +381,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
void *ibft_loc = entry->header; void *ibft_loc = entry->header;
char *str = buf; char *str = buf;
char *mac; char *mac;
int val; __be32 val;
if (!nic) if (!nic)
return 0; return 0;
...@@ -397,10 +397,8 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry, ...@@ -397,10 +397,8 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
str += sprintf_ipaddr(str, nic->ip_addr); str += sprintf_ipaddr(str, nic->ip_addr);
break; break;
case ibft_eth_subnet_mask: case ibft_eth_subnet_mask:
val = ~((1 << (32-nic->subnet_mask_prefix))-1); val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
str += sprintf(str, NIPQUAD_FMT, str += sprintf(str, "%pI4", &val);
(u8)(val >> 24), (u8)(val >> 16),
(u8)(val >> 8), (u8)(val));
break; break;
case ibft_eth_origin: case ibft_eth_origin:
str += sprintf(str, "%d\n", nic->origin); str += sprintf(str, "%d\n", nic->origin);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册