X-Received: by 2002:a17:90a:6581:b0:1bc:951:5b2b with SMTP id k1-20020a17090a658100b001bc09515b2bmr2345501pjj.212.1645506520771; Mon, 21 Feb 2022 21:08:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645506520; cv=none; d=google.com; s=arc-20160816; b=VUJ8JkYgc8rXUwRxHYn6ZIoIhowUN4s/SyLfJZ9b7C3ea4d+zpJbqZR4E9t2RZxCQG K5eJN2UPO4uzkoFcC06ocrvH74X5FsvvoRbCN0Nl2ZgiMSn5AzEyRGfHBGu/W7XwiRk8 xaqjiAFnCA9I1Lv6txNNCII6u6gldfI0z/R2KKtfFCP2O4RallWGyAv6XRVkK9r7ojU9 gZGRkOzNvP4aQsRdY+sTAMU3uBYJz+w1TmHZce/UR3noykkA/KdLOD6CfZXYbRjcL24e bhUp2tVi1vDVkgi3LpeSl+gD45s1wHfL8KMx/cc1cmcYpx0UBbs7Q76cflzyJlfUQcTb bAbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mH1S916pL8gIpgMDWQy8iMNnY+L4JhTzzLrKrBE4CXo=; b=UUpztdI/zMaY5gLTS4ClFb7+kvykUQHGNSJ6pRa4RxOPMyPk2EivCHakVBorrGQbiz SEMgvhJNjh67fJbDTiBtn6k7ZWOo/m9PysoEHH9lJyru7jVrYhWAMnQcsQpQtEek1r1m zPITZy9EV9b0/kr3dDYUJ8Mv6p5S+g1cS2WPY+vEuOm/nzld+wKdEwxbxZi89VEU7tWH 9Bo+Mr4MDCH3U6UYPjuf/17Y2eDlGycbbtg81HsXsgC9gxuU0TeRsnLiM1GV0gfnBJ9A wIbbPBzLy9j81oJwotlHaL5ezkuBZWOOMvgZZ91MBd4OrGBL9cqNKzgM0lUtUvZhPRFY Wndg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uWTKWtAf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id 7si20387132pgc.71.2022.02.21.21.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 21:08:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uWTKWtAf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C5112BF64; Mon, 21 Feb 2022 20:41:45 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352000AbiBUJy5 (ORCPT + 99 others); Mon, 21 Feb 2022 04:54:57 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:43736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352960AbiBUJsE (ORCPT ); Mon, 21 Feb 2022 04:48:04 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B81632E4; Mon, 21 Feb 2022 01:22:00 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 2C484CE0E80; Mon, 21 Feb 2022 09:21:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11EBDC340E9; Mon, 21 Feb 2022 09:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645435317; bh=w9TKH42L6B9iXXuJURWlxaWPGp24Nh54zZwHeSNNMm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uWTKWtAf5g62SNW0X6TNkKAQVblE78yWkbdgVSUr5hXZ48jLqaZE/VDQqBKrSR6cz HXXSRVRIwOR8nUyLSt4ODbsYD2jU/C07uWDV1B3IUeLHwu96FoIkyNoWyn9wDgQ5Xv 3U2cVNUDfu/Sqh9KA9vwOGU04MdbYK7qg3wrxPjM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Danie du Toit , Louis Peens , Simon Horman , Jakub Kicinski Subject: [PATCH 5.16 122/227] nfp: flower: netdev offload check for ip6gretap Date: Mon, 21 Feb 2022 09:49:01 +0100 Message-Id: <20220221084938.910019696@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084934.836145070@linuxfoundation.org> References: <20220221084934.836145070@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Danie du Toit commit 7dbcda584eaa5bdb4a281c379207dacc1a5e6081 upstream. IPv6 GRE tunnels are not being offloaded, this is caused by a missing netdev offload check. The functionality of IPv6 GRE tunnel offloading was previously added but this check was not included. Adding the ip6gretap check allows IPv6 GRE tunnels to be offloaded correctly. Fixes: f7536ffb0986 ("nfp: flower: Allow ipv6gretap interface for offloading") Signed-off-by: Danie du Toit Signed-off-by: Louis Peens Signed-off-by: Simon Horman Link: https://lore.kernel.org/r/20220217124820.40436-1-louis.peens@corigine.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h index 784292b16290..1543e47456d5 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h @@ -723,6 +723,8 @@ static inline bool nfp_fl_is_netdev_to_offload(struct net_device *netdev) return true; if (netif_is_gretap(netdev)) return true; + if (netif_is_ip6gretap(netdev)) + return true; return false; } -- 2.35.1