From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 530E0237 for ; Tue, 21 Nov 2017 14:21:23 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 065D320AF0; Tue, 21 Nov 2017 08:21:23 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:21:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=rg4grC6ZxZpcPMwFJ TTLzwbGXwOpXDRWyOd117Z6VKo=; b=V1kVbElaOTYIQazIN9WH/o+/WJo0DUmmY 953Vpju0kVI3SBWOCfODtVrZNn890iu5BmMex8fQis7VToicyTmDMNX81dce5qDx /rXR/nfXtuXQXwzJ/wmS+QIPSA4+CoL/40t0H9Rsk2XIiLgGOriDhW5aJA+erup4 D9CHUWjgbTQwdLEb1LDqQ5ZGLmZCW6Ec/n7V30GigK5VWzIxeLwy3MlWpf+Z/XIe uz5hz5riGD5/ocIO/LB0gsTNENMwsp1r4w/noJPFZKQcJdVi3EpYapOor6NN/rEa B2Pi4KFtgE1lQWgQs9l5nYy04wECgVN6JTxnAoPQdtAJGGKy8eqrg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=rg4grC6ZxZpcPMwFJTTLzwbGXwOpXDRWyOd117Z6VKo=; b=pOAsJHrn Zyl1/EW4GAM1r8pX3PUEwPn1qSiWDurEO67BJ3dMtv9Sd6Eijz78uRBOJZmqvCsT O+20nsw3gqpyMtXhsFNCQHdEZn1rnLDoL47COw+ODHrogZDX3qcP2Wyl6TvCn9ST 9iwZKsYbQRBZkwJNw6m4KKd5UDFWW0ZBSlIVH5mOpcjDiC/WqUlQmxoCR/Gj229V SZzc+hGD1eOHPyz0DESQIMsD/sPyAjBr4cOAsUei5lqroSbIrHM/mNIEEMvSZxl8 zW75OiDdcPqYSCrgCtX/K2eWEomRjtu5FJFyYfzF9FWSEVXBUNnBDkFqfe013fWG DlTt8OahDXZxVg== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 4B89B243B9; Tue, 21 Nov 2017 08:21:18 -0500 (EST) From: Yuanhan Liu To: Wei Dai Cc: Jingjing Wu , dpdk stable Date: Tue, 21 Nov 2017 21:16:13 +0800 Message-Id: <1511270333-31002-31-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/ixgbe: fix adding a mirror rule' has been queued to stable release 17.08.1 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: Tue, 21 Nov 2017 13:21:23 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 73285c775695bcf68b05afc65e46764f58b783e0 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Tue, 5 Sep 2017 17:16:57 +0800 Subject: [PATCH] net/ixgbe: fix adding a mirror rule [ upstream commit c2252db7f9a09bfca03f59fec2dab09e2a4d0d6b ] mirror rule_type can be a bit OR result of multiple mirror type of a rule. Fixes: 7ba29a76b196 ("ethdev: rename and extend the mirror type") Signed-off-by: Wei Dai Acked-by: Jingjing Wu --- drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 22171d8..858230d 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5450,13 +5450,13 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev, IXGBE_WRITE_REG(hw, IXGBE_MRCTL(rule_id), mr_ctl); /* write pool mirrror control register */ - if (mirror_conf->rule_type == ETH_MIRROR_VIRTUAL_POOL_UP) { + if (mirror_conf->rule_type & ETH_MIRROR_VIRTUAL_POOL_UP) { IXGBE_WRITE_REG(hw, IXGBE_VMRVM(rule_id), mp_lsb); IXGBE_WRITE_REG(hw, IXGBE_VMRVM(rule_id + rule_mr_offset), mp_msb); } /* write VLAN mirrror control register */ - if (mirror_conf->rule_type == ETH_MIRROR_VLAN) { + if (mirror_conf->rule_type & ETH_MIRROR_VLAN) { IXGBE_WRITE_REG(hw, IXGBE_VMRVLAN(rule_id), mv_lsb); IXGBE_WRITE_REG(hw, IXGBE_VMRVLAN(rule_id + rule_mr_offset), mv_msb); -- 2.7.4