Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp564678imu; Thu, 20 Dec 2018 01:27:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vusgl7M1v4cL6S3aCZUDg7Pgj/uZFWXRePfiS3lnM5evfZYZ+VVCtABWOzdqH63BPR5XW5 X-Received: by 2002:a65:41c2:: with SMTP id b2mr22172869pgq.67.1545298024893; Thu, 20 Dec 2018 01:27:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545298024; cv=none; d=google.com; s=arc-20160816; b=JXY9Em0NE99FR0WrOGKbSdfEKEnnvr97lstbQuJ9eT9m+fna49kUFjgM2GfwaogdOi fHl3qNdyXPDYwPeFE5n1frQ4cbAFivDFFngz4KbGsSL5+vV7tC8e5j7o7wm/LTLXKnzI 9mH9rR9sZfzVFDRh0uySWLf3sUXfT9qheuZR/T02dw2b/jZnWAPUqsV1BuMdS9hyO6qb 15yNWqJQWl/3U7PHydNBc/fpiWaAKO8k3/NdcMRQxH3PbZgM/cB5+Fzv5rmc0awiwBkV NyDeKiT9ImT/wHkyzb+q9hOBJGut8NA4av45FAdxDetnQWG5J5PorXkOmH8G+vpR+TTv f9bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/kk9HDpEfju2mebJWRU93j4RBk/cBsEH15t/rGU0UsQ=; b=MoSl5nT/PNTYNSVonC6rrg1KoDRqvua/I7sYsufRmK5ZoOQXnX76u6hJVYGeLdVXoy pAznLas0SAOhDb/METK7fjWDuI10DPrUQr/bL9OQPwhWlIfRhvwZGWfrwoH81nfrYZSB PtLbi2ss+BRKwfkmD1iUdiMll1+xQNIlGjd2d84dMHal38QL+/RvKx2fGIEaEvxQkjmi SEMrDm86gCoGyJsQgxOaqIs36KxTuAiRMv3dNk+gnDbl/vttsETx9eU9eICVrVxfHCz7 WPVazxR+ct0ujT8cgg0vNFkDqTySW8AUqcbOVUBHErpDgB0UlCbgmaviV0Qx0+ROVO7T DvjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="b4jBEk/j"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s11si18819256pgi.324.2018.12.20.01.26.49; Thu, 20 Dec 2018 01:27:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="b4jBEk/j"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731856AbeLTJYo (ORCPT + 99 others); Thu, 20 Dec 2018 04:24:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:36954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729727AbeLTJYh (ORCPT ); Thu, 20 Dec 2018 04:24:37 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8F6862186A; Thu, 20 Dec 2018 09:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297877; bh=3k2xav6ukYY/BL2+JQOca9QpSwkOa3V7JYufJZuBopU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b4jBEk/jnqVow8dWH4e5l+eXTEL5UosfbWpOBmX1J9UTgzBbzFjaJJmO1gKRqrMk3 rjjVJGv53dZ4o6zuNra/P2dWQ1z0oVK9nbIovUj+YvmNYD9MfAqTdzn5qYsCqRmNWR 2FEC2tCua04SZwOnB6KSr1i2Xm+Wo7NZ90K7Cmmk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Saeed Mahameed , Tariq Toukan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 49/61] net/mlx4_en: Fix build break when CONFIG_INET is off Date: Thu, 20 Dec 2018 10:18:49 +0100 Message-Id: <20181220085845.737486585@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085843.743900603@linuxfoundation.org> References: <20181220085843.743900603@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 1b603f9e4313348608f256b564ed6e3d9e67f377 ] MLX4_EN depends on NETDEVICES, ETHERNET and INET Kconfigs. Make sure they are listed in MLX4_EN Kconfig dependencies. This fixes the following build break: drivers/net/ethernet/mellanox/mlx4/en_rx.c:582:18: warning: ‘struct iphdr’ declared inside parameter list [enabled by default] struct iphdr *iph) ^ drivers/net/ethernet/mellanox/mlx4/en_rx.c:582:18: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/net/ethernet/mellanox/mlx4/en_rx.c: In function ‘get_fixed_ipv4_csum’: drivers/net/ethernet/mellanox/mlx4/en_rx.c:586:20: error: dereferencing pointer to incomplete type _u8 ipproto = iph->protocol; Signed-off-by: Saeed Mahameed Signed-off-by: Tariq Toukan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig index 5098e7f21987..a0eb4e4bc525 100644 --- a/drivers/net/ethernet/mellanox/mlx4/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig @@ -5,7 +5,7 @@ config MLX4_EN tristate "Mellanox Technologies 1/10/40Gbit Ethernet support" depends on MAY_USE_DEVLINK - depends on PCI + depends on PCI && NETDEVICES && ETHERNET && INET select MLX4_CORE select PTP_1588_CLOCK ---help--- -- 2.19.1