On 02/01/2016 10:45 PM, Mike Christie wrote: > On 01/22/2016 01:49 PM, Lee Duncan wrote: >> From: Hannes Reinecke <hare@xxxxxxx> >> >> Some older user-space code might rely on the netmask attribute >> being present, so we should always display it. >> This fixes a regression introduced by commit >> 0b2eb3c4060a16f3ec11a4d6d4c934e7e5d5334f. >> >> Signed-off-by: Hannes Reinecke <hare@xxxxxxx> >> Signed-off-by: Lee Duncan <lduncan@xxxxxxxx> >> --- >> drivers/firmware/iscsi_ibft.c | 8 +------- >> 1 file changed, 1 insertion(+), 7 deletions(-) >> >> diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c >> index 2dd1fbb8cccc..81037e5fe301 100644 >> --- a/drivers/firmware/iscsi_ibft.c >> +++ b/drivers/firmware/iscsi_ibft.c >> @@ -464,14 +464,8 @@ static umode_t ibft_check_nic_for(void *data, int type) >> rc = S_IRUGO; >> break; >> case ISCSI_BOOT_ETH_PREFIX_LEN: >> - if (nic->subnet_mask_prefix) >> - rc = S_IRUGO; >> - break; >> case ISCSI_BOOT_ETH_SUBNET_MASK: >> - if (!memcmp(nic->ip_addr, nulls, 10) && >> - (nic->ip_addr[10] == 0xff) && >> - (nic->ip_addr[11] == 0xff) && >> - nic->subnet_mask_prefix) >> + if (nic->subnet_mask_prefix) >> rc = S_IRUGO; >> break; >> case ISCSI_BOOT_ETH_ORIGIN: >> > > Sorry. I thought I sent this mail already. > > Is the commit id above supposed to be referencing the first patch? I > could not match it to anything. If so, then shouldn't this patch just be > combined with the second patch and some comment about us always > displaying it for compat reasons added to the code? > > Also, you should normally cc Konrad for iscsi_ibft.c patches, because he > is actually the maintainer. Hi Mike: I'm sorry I didn't reply sooner. I let this get buried in a side folder and missed it. The commit ID in Patch 2 was from the SUSE repository. The bottom line is that I think you are correct, these two patches could easily be combined. I will resubmit them as one combined patch. I submitted them as two because I was just feeding patching that Hannes had done upstream, but I should have noticed they could be combined. -- Lee Duncan SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
