From patchwork Fri Jan 22 19:49:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Duncan X-Patchwork-Id: 8092501 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7356D9F8AA for ; Fri, 22 Jan 2016 19:51:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 805E6204AE for ; Fri, 22 Jan 2016 19:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EF5520595 for ; Fri, 22 Jan 2016 19:51:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754772AbcAVTvg (ORCPT ); Fri, 22 Jan 2016 14:51:36 -0500 Received: from mx2.suse.de ([195.135.220.15]:54967 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754429AbcAVTvc (ORCPT ); Fri, 22 Jan 2016 14:51:32 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1CFF2ACA7 for ; Fri, 22 Jan 2016 19:51:30 +0000 (UTC) Received: by worklaptop.gonzoleeman.net (Postfix, from userid 1000) id 1287840C86; Fri, 22 Jan 2016 11:49:19 -0800 (PST) From: Lee Duncan To: Cc: , Lee Duncan Subject: [PATCH 2/2] iscsi_ibft: Always display netmask Date: Fri, 22 Jan 2016 11:49:13 -0800 Message-Id: <71c84546d99332f77d1f462d735ec1e38aa1e7ba.1453419653.git.lduncan@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hannes Reinecke 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 Signed-off-by: Lee Duncan --- 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: