From 00e7825b943f486e80ff1305cd0594d8791870f8 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Thu, 14 Jan 2010 11:34:19 -0500 Subject: [PATCH 1/2] drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4 Convert netmask to __be32 and format it with %pI4 Signed-off-by: Joe Perches Signed-off-by: Konrad Rzeszutek Reviewed-by: Mike Christie Cc: Peter Jones Cc: James Bottomley Signed-off-by: Andrew Morton --- drivers/firmware/iscsi_ibft.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 051d1ebbd287..f82bcdae130b 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c @@ -381,7 +381,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry, void *ibft_loc = entry->header; char *str = buf; char *mac; - int val; + __be32 val; if (!nic) return 0; @@ -397,10 +397,8 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry, str += sprintf_ipaddr(str, nic->ip_addr); break; case ibft_eth_subnet_mask: - val = ~((1 << (32-nic->subnet_mask_prefix))-1); - str += sprintf(str, NIPQUAD_FMT, - (u8)(val >> 24), (u8)(val >> 16), - (u8)(val >> 8), (u8)(val)); + val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1)); + str += sprintf(str, "%pI4", &val); break; case ibft_eth_origin: str += sprintf(str, "%d\n", nic->origin); From c4d1409bbed8cf2a11b48ce3a075e142f686a588 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 26 Feb 2010 03:53:00 +0000 Subject: [PATCH 2/2] ibft: Update MAINTAINERS file. Provide the right e-mail and names for me and Peter. Signed-off-by: Konrad Rzeszutek Wilk --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 317ed38826d7..0d8a948878e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2399,6 +2399,12 @@ L: virtualization@lists.linux-foundation.org S: Maintained F: drivers/char/virtio_console.c +iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER +M: Peter Jones +M: Konrad Rzeszutek Wilk +S: Maintained +F: drivers/firmware/iscsi_ibft* + GSPCA FINEPIX SUBDRIVER M: Frank Zago L: linux-media@vger.kernel.org