Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp863658imu; Thu, 20 Dec 2018 06:34:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vjv/hddZK8WwrQ5BbRH9gwGhgJwQvFI+05RiCSPG5igoSEXuEvU71wePE24wonAKhihLm2 X-Received: by 2002:a17:902:a5c3:: with SMTP id t3mr24062529plq.117.1545316449431; Thu, 20 Dec 2018 06:34:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545316449; cv=none; d=google.com; s=arc-20160816; b=QhRUTEHDGq/q5PI+ahPnGZ2s1fXYzn7wYShIDSt2YO8pOw/1TzY+X6FP/CAt4Ekh8U mw8C8ipYddxdFPWnprHphEx8Z7bOaqd3CeVHSmM+hUss97WhlqfdzlNW+XdXdY93Q3an Ggz2idQyt/HyTWWO9NtvAGTPo95KGoNMb8x3cH/T7qbj3lK0zrglLOeapsKo+0WSER0f yzuTuFNDr451fAqFyDkz6JQHkRVdInYnpcAvv8zgn6ey41N/iVvG6xzVV1GHwaNv1DX/ a3DUZTbtU0JtB19YUvoVXwpqgiPmgWtGjEI6bN9h9p+4yFKA0qFmpTY4rokzmOh0UqP0 n4Sg== 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=lqoXncN48JRBvzUS0mEkfaJ5xlCDcQq/qKGDzdUuA38=; b=Q3pAOgHFdaPUEz7/eMcJ3qLYNifNMC7BQFl2v94CwKmA4TL9yeedV+gHLZJ9EQeM4K i8yT6ri97H1h6snBSVYsPYuo5vvD8st/3RJVih7ecgfGio+WDUD5rx0zlvMzreDKEeOi +SPOwOH7S8SwhQFbkyT1tlbQjFys0bNVKNKz4EsyaxBGggWJqU5vgbEZTCyyoalv5dIW yskr4RGJRAnzOm5nzWUuEZPLuISWg7Qo6kwcJ2plbRfleGjy9aMKc45FokT0oMaGhkLZ ttIQ4POKskFONUT9XNG9xjPWBAIa9/6F/TO8t15V9oDB7yqXWDv53Hk1lIYRMk3Ao11z Cm6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="O4uvy/jC"; 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 a18si18347582pgj.77.2018.12.20.06.33.53; Thu, 20 Dec 2018 06:34:09 -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="O4uvy/jC"; 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 S1733267AbeLTJg2 (ORCPT + 99 others); Thu, 20 Dec 2018 04:36:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:40264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731617AbeLTJ1s (ORCPT ); Thu, 20 Dec 2018 04:27:48 -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 68C982177E; Thu, 20 Dec 2018 09:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298067; bh=kyGFla2IuOWMqIBLG4xbd+UsZiduptHw0LHSuVV3qik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O4uvy/jCioKN8ICkRWkV0kAn/KHenksDxKQ/Rq9vbOW3o6/C1oCN6Odc2RJU7TyLu wmjf/i2Q8nQS48hex3XEYX7OxDooaAnC/N/JqJ/L+Lc9gXIG0/NGZEEAER/9lA2bBW DvohssNJXZ5OUns7XvrQLS2VSFht6ndsN0+OdgF4= 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.14 58/72] net/mlx4_en: Fix build break when CONFIG_INET is off Date: Thu, 20 Dec 2018 10:18:57 +0100 Message-Id: <20181220085924.616256402@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085922.332225035@linuxfoundation.org> References: <20181220085922.332225035@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.14-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 22b1cc012bc9..c1a39be0dbe7 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 imply PTP_1588_CLOCK ---help--- -- 2.19.1