From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB80BC47247 for ; Fri, 8 May 2020 12:42:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3E8B21835 for ; Fri, 8 May 2020 12:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941730; bh=QnA5e/swKIZPucP09Yx8qvSickkdiQEwsBpFGjTzc9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dNipSzAQFiqC/xrdcpF5D9MKMLl6vv4hP5pWJocSKf04jjamFw8GY5AettOXVBdsR lJYW7RGTsmZKKAo2FvC/B6r2wOhId6UawXkKHhykZdXtN1j3dzOE23cFPv0keXTclo iZA2/8LogtcnJt3A5nUwjngMJyJA7YqFtJOjFOd4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728477AbgEHMmH (ORCPT ); Fri, 8 May 2020 08:42:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:38414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728905AbgEHMmF (ORCPT ); Fri, 8 May 2020 08:42:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 AB6262495F; Fri, 8 May 2020 12:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941725; bh=QnA5e/swKIZPucP09Yx8qvSickkdiQEwsBpFGjTzc9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=clGhx8bKR7/jyaiUbXe1r4c2RwB4ONAoMx7IWNNNpLBwT2RV+i1DGlep6ts++Y+DA WGcXQNfno3LmggEUFDO3R8mBY53wF4xpjgc8z8ID55WXcZVQ5fmA+4Ydj9Wuvisyi/ WIX4VeagerGfqrcgVvY7hjAX1dus5Fn/jbdrDzgw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yotam Gigi , Ido Schimmel , Jiri Pirko , "David S. Miller" Subject: [PATCH 4.4 109/312] mlxsw: spectrum: Fix misuse of hard_header_len Date: Fri, 8 May 2020 14:31:40 +0200 Message-Id: <20200508123132.158392167@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yotam Gigi commit feb7d387a6cf6c1ec66d4a2b6d4b2cc52309876e upstream. In order to specify that the mlxsw spectrum driver needs additional headroom for packets, there have been use of the hard_header_len field of the netdevice struct. This commit changes that to use needed_headroom instead, as this is the correct way to do that. Fixes: 56ade8fe3fe1 ("mlxsw: spectrum: Add initial support for Spectrum ASIC") Signed-off-by: Yotam Gigi Acked-by: Ido Schimmel Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1261,7 +1261,7 @@ static int mlxsw_sp_port_create(struct m /* Each packet needs to have a Tx header (metadata) on top all other * headers. */ - dev->hard_header_len += MLXSW_TXHDR_LEN; + dev->needed_headroom = MLXSW_TXHDR_LEN; err = mlxsw_sp_port_module_check(mlxsw_sp_port, &usable); if (err) {