From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by dpdk.org (Postfix) with ESMTP id 722D19969 for ; Mon, 21 Aug 2017 11:38:08 +0200 (CEST) Received: by mail-pg0-f46.google.com with SMTP id n4so33270370pgn.1 for ; Mon, 21 Aug 2017 02:38:08 -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=sjbN5Febd7aguj6C9/UamKJ9CaZ1s7tdmcimv/Z0XCc=; b=cfHTJzowk2258/2GguAj67mji/4IES6tr+iiebZlfv5lawHlJHbsKp9/GQfrO8auzz rj9nFLJAJNMrvy39bJIl2g3foiFOWzen76wCJ2aD1iAnn86iiteyC4DorfTtsNNI+D9K QO8nbyf6vI7n5gtHPWGFri3lRdG0uaoARscwQHSIgc80BBf8FmFryKBCw8XUYvjcHNGk m+vA79yNPOuWV+bmzA7vXXSPObTRHe78switTjE+vcgMmJePo6PcVVfJ2Pe48HbtLFCj ftlaiiutsv41bSQFS4ZikrxvGQumsqxbpiKVFYHYEzlq3QidsyQ3O7I2FBo4RyryHQ2n q/Wg== 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=sjbN5Febd7aguj6C9/UamKJ9CaZ1s7tdmcimv/Z0XCc=; b=hQ6qQ3S7LoHgZSFilRfs749DRBYd1/LHQBvZvoSyRY2NuvxlXLtV+2X/p1RZ3hSUKH c1Z3Q5Z/6vUquVVDRqh3WRYl+GP9TtmtUjn7mhaYHtrVGHhk5LnWwJ9YnrmmmJT2r+bG 3C/LtdQwIVQ0GntibI7ATKhNY/hu1OFtI6wPob7GzMhe0IOo/k0icJsxRd+Xt1VU2YxT xKF1fBO7bgSiwKYMzWFvXxnDjWuLxP3Uo9BTiSo3R/5aJKGrvY99QcwkTTqSGfsmoNZy 8f/SH1t16kRb5HZ3kzj4WROhsoe4ib8XDL1jesUPpY/GKaOa+6tY7wUL6gZfWAeQOCNy v0gA== X-Gm-Message-State: AHYfb5ibLx+oXXH3UIieN/4/emYlgbPlrx67ck8e15FQ7GtZxqachzqI qiJQIbJTBvMMZxWG X-Received: by 10.84.217.20 with SMTP id o20mr14081395pli.460.1503308287779; Mon, 21 Aug 2017 02:38:07 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id 69sm23355087pfh.186.2017.08.21.02.38.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Aug 2017 02:38:06 -0700 (PDT) From: Yuanhan Liu To: Chas Williams Cc: Shrikrishna Khare , dpdk stable , Yuanhan Liu Date: Mon, 21 Aug 2017 17:31:12 +0800 Message-Id: <1503307878-16728-58-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503307878-16728-1-git-send-email-yliu@fridaylinux.org> References: <1503307878-16728-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/vmxnet3: fix filtering on promiscuous disabling' has been queued to stable release 17.05.2 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: Mon, 21 Aug 2017 09:38:08 -0000 Hi, FYI, your patch has been queued to stable release 17.05.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From c45359611428a30e6a58e297eb791683b7401cde Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Mon, 24 Jul 2017 10:22:42 -0400 Subject: [PATCH] net/vmxnet3: fix filtering on promiscuous disabling [ upstream commit c1f7b53c83f37dcaf373b58e281ef16dc804bc14 ] We should only restore shadow_vfta when hw_vlan_filter is active. Otherwise, we should restore the previous filtering behavior. Fixes: f003fc383487 ("vmxnet3: enable vlan filtering") Signed-off-by: Chas Williams Acked-by: Shrikrishna Khare --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 2b8092d..723a336 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -995,7 +995,10 @@ vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev) struct vmxnet3_hw *hw = dev->data->dev_private; uint32_t *vf_table = hw->shared->devRead.rxFilterConf.vfTable; - memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE); + if (dev->data->dev_conf.rxmode.hw_vlan_filter) + memcpy(vf_table, hw->shadow_vfta, VMXNET3_VFT_TABLE_SIZE); + else + memset(vf_table, 0xff, VMXNET3_VFT_TABLE_SIZE); vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_PROMISC, 0); VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_UPDATE_VLAN_FILTERS); -- 2.7.4