Commit 41630959 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 

* 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
  ibft: Update MAINTAINERS file.
  drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4
parents 2b8c70b2 c4d1409b

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -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

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);