From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by dpdk.org (Postfix) with ESMTP id 689322B9D for ; Wed, 9 Aug 2017 05:47:38 +0200 (CEST) Received: by mail-pg0-f43.google.com with SMTP id v77so22744941pgb.3 for ; Tue, 08 Aug 2017 20:47:38 -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=s39Dv7xqHfNarpwQyqfpcICV7N9xEvVGRqfyJLa+O8I=; b=qBR1IymrBBBkjXtI3C+KwgQpl+WzgbxoBXhnKNfULM6OEN/BEi/zbXG7yK9zcf59tK 3VZHLPwDC7rd64DUTA32qH12+CrmjZYHnWNpCFQJqiLfsEx6tSSuG0X9JE54CAG+uTSW O4MyVGJvisNYXYk+AF6QHKZQAxn2diZEhdQ+85zEizdgzForq3aOQccOR1xhJDT8k3ff 297y7GXMq3+J3+SeB9XDjaTqX6mlhW5LYGDGxOOqoTyEXA7ax5nY+wn8r0WYZk3jBv39 mmfubisBGzVjrOxuMzVV1LlgOX7uYluoXAaRPR26qJD4zClYFUeDJ2d28hFxi6HnRzN+ 5lCw== 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=s39Dv7xqHfNarpwQyqfpcICV7N9xEvVGRqfyJLa+O8I=; b=bOLNLKns92Qrtx0f0Ma5eeuTXdHExWJfl1UyLgug+4Il5VvIz+/6BhAUefSste3WLL IveoZw1gVZsIcCWQVH1RunWc5wLLuNzpeD/qJSvtG2RImj7VaJBojfDOgbFHHep09DA3 3zhdJ7SZjKhfE+7e7umAkyyvVMKeo59XT3Wo8hkF7BZijAl67Zvu772YwGmj1Je3nX+W Z5avOVLcypL0lotjj/7uebJlpGDzrm0UPVbT4WPqq519vrnTjqjt3t4wjzOhNtCFUqAH 2JtmyDuqNtAQqHjyblTc6U+txB/z53qlzt4o645B+ei+ejk11fdbQvwZbVhR4zFw6PYq 19oA== X-Gm-Message-State: AHYfb5hLyyOJRKh8pzM+4oOVatXz68wnuZq+eJZM+YxA0U7fGfT9bzH8 nMmhXGAKixjCBBLe X-Received: by 10.101.91.203 with SMTP id o11mr6318647pgr.321.1502250457719; Tue, 08 Aug 2017 20:47:37 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id q3sm5093921pfl.89.2017.08.08.20.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Aug 2017 20:47:36 -0700 (PDT) From: Yuanhan Liu To: Chas Williams Cc: Shrikrishna Khare , dpdk stable , Yuanhan Liu Date: Wed, 9 Aug 2017 11:43:56 +0800 Message-Id: <1502250240-6599-14-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502250240-6599-1-git-send-email-yliu@fridaylinux.org> References: <1502250240-6599-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/vmxnet3: fix filtering on promiscuous disabling' 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: Wed, 09 Aug 2017 03:47:38 -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 08/11/17. So please shout if anyone has objections. Thanks. --yliu --- >>From c414070bc74aa6a6df60caa5ece75d30bc884e54 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 f123df9..aedac6c 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -831,7 +831,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