{"id":819401,"url":"http://patchwork.ozlabs.org/api/patches/819401/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170928044132.30940-9-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170928044132.30940-9-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-09-28T04:41:29","name":"[net,08/11] net/mlx5e: Don't add/remove 802.1ad rules when changing 802.1Q VLAN filter","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"b9047a6163030a46bc4cd3b89f26736d32e4d9a2","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170928044132.30940-9-saeedm@mellanox.com/mbox/","series":[{"id":5488,"url":"http://patchwork.ozlabs.org/api/series/5488/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=5488","date":"2017-09-28T04:41:23","name":"Mellanox, mlx5 fixes 2017-09-28","version":1,"mbox":"http://patchwork.ozlabs.org/series/5488/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819401/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819401/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y2hql2tHKz9t3x\n\tfor ;\n\tThu, 28 Sep 2017 14:42:11 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751964AbdI1EmJ (ORCPT );\n\tThu, 28 Sep 2017 00:42:09 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:54408 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751673AbdI1EmG (ORCPT\n\t); Thu, 28 Sep 2017 00:42:06 -0400","from Internal Mail-Server by MTLPINE1 (envelope-from\n\tsaeedm@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 28 Sep 2017 06:42:01 +0200","from sws.mtl.labs.mlnx (reg-l-vrt-045-015.mtl.labs.mlnx\n\t[10.135.45.15])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v8S4g1jC011096;\n\tThu, 28 Sep 2017 07:42:01 +0300"],"From":"Saeed Mahameed ","To":"\"David S. Miller\" ","Cc":"netdev@vger.kernel.org, Gal Pressman ,\n\tSaeed Mahameed ","Subject":"[net 08/11] net/mlx5e: Don't add/remove 802.1ad rules when changing\n\t802.1Q VLAN filter","Date":"Thu, 28 Sep 2017 07:41:29 +0300","Message-Id":"<20170928044132.30940-9-saeedm@mellanox.com>","X-Mailer":"git-send-email 2.13.0","In-Reply-To":"<20170928044132.30940-1-saeedm@mellanox.com>","References":"<20170928044132.30940-1-saeedm@mellanox.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Gal Pressman \n\nToggling of C-tag VLAN filter should not affect the \"any S-tag\" steering rule.\n\nFixes: 8a271746a264 (\"net/mlx5e: Receive s-tagged packets in promiscuous mode\")\nSigned-off-by: Gal Pressman \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c\nindex f11fd07ac4dd..850cdc980ab5 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c\n@@ -291,7 +291,7 @@ void mlx5e_enable_vlan_filter(struct mlx5e_priv *priv)\n \tpriv->fs.vlan.filter_disabled = false;\n \tif (priv->netdev->flags & IFF_PROMISC)\n \t\treturn;\n-\tmlx5e_del_any_vid_rules(priv);\n+\tmlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID, 0);\n }\n \n void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv)\n@@ -302,7 +302,7 @@ void mlx5e_disable_vlan_filter(struct mlx5e_priv *priv)\n \tpriv->fs.vlan.filter_disabled = true;\n \tif (priv->netdev->flags & IFF_PROMISC)\n \t\treturn;\n-\tmlx5e_add_any_vid_rules(priv);\n+\tmlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID, 0);\n }\n \n int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,\n","prefixes":["net","08/11"]}