2 files changed, 9 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f8c20600e20..a0491af7b243 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2410,6 +2410,12 @@ L:	virtualization@lists.linux-foundation.org
 S:      Maintained
 F:      drivers/char/virtio_console.c
 
+iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+M:      Peter Jones <pjones@redhat.com>
+M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
+S:      Maintained
+F:      drivers/firmware/iscsi_ibft*
+
 GSPCA FINEPIX SUBDRIVER
 M:      Frank Zago <frank@zago.net>
 L:      linux-media@vger.kernel.org
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);