Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/693945/?format=api
{ "id": 693945, "url": "http://patchwork.ozlabs.org/api/patches/693945/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478896779-13697-14-git-send-email-bimmy.pujari@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1478896779-13697-14-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-11T20:39:37", "name": "[next,S54,13/15] i40e: when adding or removing MAC filters, correctly handle VLANs", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f06c2170833d0cf92429cd8211937a3c682f0a54", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478896779-13697-14-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/693945/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/693945/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3tFsJk5Q2mz9t2g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 12 Nov 2016 07:41:26 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2EE428A56A;\n\tFri, 11 Nov 2016 20:41:25 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id tt8K43E7+K9O; Fri, 11 Nov 2016 20:41:23 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1530A95AF0;\n\tFri, 11 Nov 2016 20:41:19 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 149631CEC94\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:16 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 10A5FC2242\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:16 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id j-yumkfXX4HK for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 62A87C2A2A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP; 11 Nov 2016 12:41:14 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga005.fm.intel.com with ESMTP; 11 Nov 2016 12:41:14 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.31,474,1473145200\"; d=\"scan'208\";a=\"30297968\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 11 Nov 2016 12:39:37 -0800", "Message-Id": "<1478896779-13697-14-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S54 13/15] i40e: when adding or\n\tremoving MAC filters, correctly handle VLANs", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Jacob Keller <jacob.e.keller@intel.com>\n\nInstead of using i40e_add_filter or i40e_del_filter directly, when\nadding a MAC address, we should normally be using i40e_add_mac_filter or\ni40e_del_mac_filter. These functions correctly handle the various cases\nof VLAN mode or PVID settings. This ensures consistency and avoids the\nissues that can occur with the recent addition of a WARN_ON() in\ni40e_sync_vsi_filters.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I7fe62db063391fdd1180b2d6a6a3c5ab4307eeee\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +++---\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 ++++-------\n 2 files changed, 7 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 535a70a..59bc1f6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -9347,7 +9347,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)\n \t\t */\n \t\ti40e_rm_default_mac_filter(vsi, mac_addr);\n \t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n-\t\ti40e_add_filter(vsi, mac_addr, I40E_VLAN_ANY);\n+\t\ti40e_add_mac_filter(vsi, mac_addr);\n \t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t} else {\n \t\t/* relate the VSI_VMDQ name to the VSI_MAIN name */\n@@ -9356,7 +9356,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)\n \t\trandom_ether_addr(mac_addr);\n \n \t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n-\t\ti40e_add_filter(vsi, mac_addr, I40E_VLAN_ANY);\n+\t\ti40e_add_mac_filter(vsi, mac_addr);\n \t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t}\n \n@@ -9375,7 +9375,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)\n \t */\n \teth_broadcast_addr(broadcast);\n \tspin_lock_bh(&vsi->mac_filter_hash_lock);\n-\ti40e_add_filter(vsi, broadcast, I40E_VLAN_ANY);\n+\ti40e_add_mac_filter(vsi, broadcast);\n \tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \tether_addr_copy(netdev->dev_addr, mac_addr);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 49941dd..cbbf864 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -689,17 +689,15 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)\n \n \t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t\tif (is_valid_ether_addr(vf->default_lan_addr.addr)) {\n-\t\t\tf = i40e_add_filter(vsi, vf->default_lan_addr.addr,\n-\t\t\t\t vf->port_vlan_id ?\n-\t\t\t\t vf->port_vlan_id : -1);\n+\t\t\tf = i40e_add_mac_filter(vsi,\n+\t\t\t\t\t\tvf->default_lan_addr.addr);\n \t\t\tif (!f)\n \t\t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t\t \"Could not add MAC filter %pM for VF %d\\n\",\n \t\t\t\t\tvf->default_lan_addr.addr, vf->vf_id);\n \t\t}\n \t\teth_broadcast_addr(broadcast);\n-\t\tf = i40e_add_filter(vsi, broadcast,\n-\t\t\t\t vf->port_vlan_id ? vf->port_vlan_id : -1);\n+\t\tf = i40e_add_mac_filter(vsi, broadcast);\n \t\tif (!f)\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"Could not allocate VF broadcast filter\\n\");\n@@ -2718,8 +2716,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \n \t/* delete the temporary mac address */\n \tif (!is_zero_ether_addr(vf->default_lan_addr.addr))\n-\t\ti40e_del_filter(vsi, vf->default_lan_addr.addr,\n-\t\t\t\tvf->port_vlan_id ? vf->port_vlan_id : -1);\n+\t\ti40e_del_mac_filter(vsi, vf->default_lan_addr.addr);\n \n \t/* Delete all the filters for this VSI - we're going to kill it\n \t * anyway.\n", "prefixes": [ "next", "S54", "13/15" ] }