Skip to contentSkip to conversation

+ Introduction

GIT PULL In review Konrad Rzeszutek Wilk 2 participants 4 messages Feb 26, 2010 – Mar 1, 2010 iSCSI boot firmware table (iBFT) driver

lore
Share & tools
lore

Konrad Rzeszutek Wilk

author maintainer
#0 lore raw

Hey Linus,

The following changes since commit 6ebdc661b608671e9ca572af8bb42d58108cc008:
Linus Torvalds (1):
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git ibft-fixes

There are two patches: one is a simple fix and the other adds me and Peter as the maintainers of the iBFT driver. In the past the maintainer for the iBFT was .. well nobody :-) Mike Christie and Greg KH were taking the patches but both agreed that it didn't make sense for it to be in their git tree since it wasn't per say in their baileywick.

Hence I am stepping up and becoming the maintainer for this driver.

Cheers,

Konrad

---
 MAINTAINERS                   |    6 ++++++
 drivers/firmware/iscsi_ibft.c |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
author maintainer
#1 lore raw

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

From: Joe Perches <[email protected]>

Convert netmask to __be32 and format it with %pI4

---
 drivers/firmware/iscsi_ibft.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/firmware/iscsi_ibft.c +3 -5
index 051d1eb..f82bcda 100644
@@ -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);
Signature · 1 line
1.7.0
author maintainer
#2 lore raw

PATCH 2/2 ibft: Update MAINTAINERS file.

In reply to Konrad Rzeszutek Wilk

Provide the right e-mail and names for me and Peter.

---
 MAINTAINERS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
MAINTAINERS +6 -0
index 317ed38..0d8a948 100644
@@ -2399,6 +2399,12 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/char/virtio_console.c
 
+iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+M:	Peter Jones <[email protected]>
+M:	Konrad Rzeszutek Wilk <[email protected]>
+S:	Maintained
+F:	drivers/firmware/iscsi_ibft*
+
 GSPCA FINEPIX SUBDRIVER
 M:	Frank Zago <[email protected]>
 L:	[email protected]
Signature · 1 line
1.7.0
maintainer
#3 lore raw

Re: [PATCH 2/2] ibft: Update MAINTAINERS file.

Quoted 3 lines · Konrad Rzeszutek Wilk

Provide the right e-mail and names for me and Peter.

Quoted 21 lines
---
 MAINTAINERS |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
MAINTAINERS +6 -0
index 317ed38..0d8a948 100644
@@ -2399,6 +2399,12 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/char/virtio_console.c
 
+iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+M:	Peter Jones <[email protected]>
+M:	Konrad Rzeszutek Wilk <[email protected]>
+S:	Maintained
+F:	drivers/firmware/iscsi_ibft*
+
 GSPCA FINEPIX SUBDRIVER
 M:	Frank Zago <[email protected]>
 L:	[email protected]
Signature · 4 lines
        Peter

First things first -- but not necessarily in that order.
		-- The Doctor