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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 79ECFC04AB6 for ; Mon, 3 Jun 2019 09:17:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 540AC27F77 for ; Mon, 3 Jun 2019 09:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559553442; bh=ZAwey9El/ODFZAWcujVsTBv2WCksD9veMZj0nHo1jek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=i3rLJgdMGH1BNFXkNqOecmGF8JeM6SLEv2GYfoYaHTg5x5pPVEmgOu49vXZzNgnyw vSzwsnio/QTScPXwXtVIPA6H66vM0CBJBXjsShfSnWkroV5zyiuqetQ0AL2j2aEo/R 4d6FpxpRL/bZEHM4EUM2/RUepfemRhbCG9cgLmO0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728442AbfFCJLj (ORCPT ); Mon, 3 Jun 2019 05:11:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:56822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728440AbfFCJLj (ORCPT ); Mon, 3 Jun 2019 05:11:39 -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 A495827E7A; Mon, 3 Jun 2019 09:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559553098; bh=ZAwey9El/ODFZAWcujVsTBv2WCksD9veMZj0nHo1jek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZNHwroYcfIM8d3VdLDTDU0p3c5HlLN96RtkG9H1sht6L5nITb7IgB0VnVo+Mz7fYA yrcteVe/cB7vojXTCeV+bavQyw9YVkyPqTtXZ2raH2Vv/ZkaXGQVHtrcgGnL/SEgam nZnFrbBVeBnEJi3JiFIjxuTzJsdydSEvqH/xMB2E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Raju Rangoju , "David S. Miller" Subject: [PATCH 5.0 02/36] cxgb4: offload VLAN flows regardless of VLAN ethtype Date: Mon, 3 Jun 2019 11:08:50 +0200 Message-Id: <20190603090521.133068585@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603090520.998342694@linuxfoundation.org> References: <20190603090520.998342694@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: Raju Rangoju [ Upstream commit b5730061d1056abf317caea823b94d6e12b5b4f6 ] VLAN flows never get offloaded unless ivlan_vld is set in filter spec. It's not compulsory for vlan_ethtype to be set. So, always enable ivlan_vld bit for offloading VLAN flows regardless of vlan_ethtype is set or not. Fixes: ad9af3e09c (cxgb4: add tc flower match support for vlan) Signed-off-by: Raju Rangoju Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c @@ -228,6 +228,9 @@ static void cxgb4_process_flow_match(str fs->val.ivlan = vlan_tci; fs->mask.ivlan = vlan_tci_mask; + fs->val.ivlan_vld = 1; + fs->mask.ivlan_vld = 1; + /* Chelsio adapters use ivlan_vld bit to match vlan packets * as 802.1Q. Also, when vlan tag is present in packets, * ethtype match is used then to match on ethtype of inner @@ -238,8 +241,6 @@ static void cxgb4_process_flow_match(str * ethtype value with ethtype of inner header. */ if (fs->val.ethtype == ETH_P_8021Q) { - fs->val.ivlan_vld = 1; - fs->mask.ivlan_vld = 1; fs->val.ethtype = 0; fs->mask.ethtype = 0; }