Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00e7825b authored by Joe Perches's avatar Joe Perches Committed by Konrad Rzeszutek Wilk
Browse files

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



Convert netmask to __be32 and format it with %pI4

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKonrad Rzeszutek <ketuzsezr@darnok.org>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Cc: Peter Jones <pjones@redhat.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6ebdc661

drivers/firmware/iscsi_ibft.c

+3 −5
Original line number Diff line number Diff line
@@ -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);