Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 5aeb3b541c80..a3600e3ed0fa 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -380,7 +380,7 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
         struct ibft_nic *nic = entry->nic;
         void *ibft_loc = entry->header;
         char *str = buf;
-        int val;
+        __be32 val;
 
         if (!nic)
                 return 0;
@@ -396,10 +396,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);