From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id DAC712C2B for ; Fri, 14 Jul 2017 12:34:58 +0200 (CEST) Received: by mail-pf0-f194.google.com with SMTP id q85so10552448pfq.2 for ; Fri, 14 Jul 2017 03:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kAECeZHkb3ZrAFPTMsPCmWu8IsBgU5bWfyDy1NJ7YQE=; b=UcqomXXNY3Jbutuwgdp1qR7O2WNIbBiGMpjm5zxLgJXL6c6IzlNEBOxE12MCyV8pC0 EQKVKnNfbeTGLSPg3rc1NR96BgzNMAxl+8ZkbftYdOjyn6KXkO3FkAsEOZjzwDFFlRvu LbT9onSjFesleBp7ixr8L96LsWpNw1bkukHN6v7SdMMJUX60SSsCD6M8drJrqq3UvJ4R pmvU6zIk3JDghSnCG8y2F9HDJs1giWv2IgKlEL6QNvBLypOCmoj53lcfXWNRXvuOf2GQ UzGF7sNkscP8+LcOBDRd9Y+OV/T+0NZ09RSaRc9u80t2dw0zvGmywwaUbVbrSXWn6qYP XXlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kAECeZHkb3ZrAFPTMsPCmWu8IsBgU5bWfyDy1NJ7YQE=; b=ICycxL7yneXhg4YH08iRYQCgj2ogjpnoFh+UgFAf94Uiv8ActFsW+zGNCtWaMH/IBk ObsbWqVahG2a1EYg3MZnaW1BS8jl8RGFXtA4yIpPcPNVixCqO+OQ2RQ1wMUFcXrp24n0 XnzhhKgvK3losFA/h/J+LsXOzeBgG4cbaVrjQWquEOgkccp31SzP48nWkXux1+sfUJS6 szp/VAu3HA6XkAkTzMV/M9i5T8fTiiuU7ewNcxrmbT+WVgjh7Sfie1ZRRgM6vz0ITHaD SRL6Fha9xEaJhyuMdtMXQtU+/imEStErP38znOUgn1p+qE7tZJGg5GukjiTQeC0MvHs4 /Qdw== X-Gm-Message-State: AIVw1124TIRSG4463l9wrF9XKeCG7CZ/7m/nCbyMw7/AZY+UzJsx7iHr 1wol4NKCM40//Ci+ X-Received: by 10.84.229.76 with SMTP id d12mr15336456pln.222.1500028498228; Fri, 14 Jul 2017 03:34:58 -0700 (PDT) Received: from localhost.localdomain ([180.158.48.171]) by smtp.gmail.com with ESMTPSA id y205sm15273553pfb.124.2017.07.14.03.34.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Jul 2017 03:34:57 -0700 (PDT) From: Yuanhan Liu To: Markus Theil Cc: Wenzhuo Lu , dpdk stable Date: Fri, 14 Jul 2017 18:33:28 +0800 Message-Id: <1500028450-25989-4-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> References: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/igb: fix add/delete of flex filters' has been queued to LTS release 16.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2017 10:34:59 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/19/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 01ea4420fd9242ab74f3e140f6b456e72d0e5fcc Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 22 May 2017 12:17:50 +0200 Subject: [PATCH] net/igb: fix add/delete of flex filters [ upstream commit 167e7b9ae531491f10f495587cb59ae271430abb ] Before this patch, flex_filter->index was always zero when it was read and used after rte_zmalloc. The corresponding code was therefore moved into the add and delete parts of the if/else statement. Fixes: 231d43909a31 ("igb: migrate flex filter to new API") Signed-off-by: Markus Theil Acked-by: Wenzhuo Lu --- drivers/net/e1000/igb_ethdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index be2600d..0a94ecc 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -3736,10 +3736,6 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev, } wufc = E1000_READ_REG(hw, E1000_WUFC); - if (flex_filter->index < E1000_MAX_FHFT) - reg_off = E1000_FHFT(flex_filter->index); - else - reg_off = E1000_FHFT_EXT(flex_filter->index - E1000_MAX_FHFT); if (add) { if (eth_igb_flex_filter_lookup(&filter_info->flex_list, @@ -3769,6 +3765,11 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev, return -ENOSYS; } + if (flex_filter->index < E1000_MAX_FHFT) + reg_off = E1000_FHFT(flex_filter->index); + else + reg_off = E1000_FHFT_EXT(flex_filter->index - E1000_MAX_FHFT); + E1000_WRITE_REG(hw, E1000_WUFC, wufc | E1000_WUFC_FLEX_HQ | (E1000_WUFC_FLX0 << flex_filter->index)); queueing = filter->len | @@ -3797,6 +3798,11 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev, return -ENOENT; } + if (it->index < E1000_MAX_FHFT) + reg_off = E1000_FHFT(it->index); + else + reg_off = E1000_FHFT_EXT(it->index - E1000_MAX_FHFT); + for (i = 0; i < E1000_FHFT_SIZE_IN_DWD; i++) E1000_WRITE_REG(hw, reg_off + i * sizeof(uint32_t), 0); E1000_WRITE_REG(hw, E1000_WUFC, wufc & -- 2.7.4