Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/693949/?format=api
{ "id": 693949, "url": "http://patchwork.ozlabs.org/api/patches/693949/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478896779-13697-12-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-12-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-11T20:39:35", "name": "[next,S54,11/15] i40e: rename i40e_put_mac_in_vlan and i40e_del_mac_all_vlan", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ae6d84695a3cc9aa974d4e50619dcc4f50990373", "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-12-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/693949/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/693949/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 3tFsJp12Tsz9t2g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 12 Nov 2016 07:41:30 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 83495959E6;\n\tFri, 11 Nov 2016 20:41:28 +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 lDYXG0Vs4h6C; Fri, 11 Nov 2016 20:41:27 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id BFD40960E5;\n\tFri, 11 Nov 2016 20:41:20 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 84C171CEC94\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:17 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 81CBFC2242\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:17 +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 olr8ioBuNnAt 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 4F4F1C297A\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:13 -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=\"30297962\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 11 Nov 2016 12:39:35 -0800", "Message-Id": "<1478896779-13697-12-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 11/15] i40e: rename\n\ti40e_put_mac_in_vlan and i40e_del_mac_all_vlan", "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\nThese functions purpose is to add a new MAC filter correctly, whether\nwe're using VLANs or not. Their goal is to ensure that all active VLANs\nget the new MAC filter. Rename them so that their intent is clear. They\nfunction correctly regardless of whether we have any active VLANs or\nonly have I40E_VLAN_ANY filters. The new names convey how they function\nin a more clear manner.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: Iec1961f968c0223a7132724a74e26a665750b107\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 6 +++---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 24 ++++++++++++----------\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++--\n 3 files changed, 18 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex dd8c3f3..1fdb082 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -857,9 +857,9 @@ int i40e_add_vlan_all_mac(struct i40e_vsi *vsi, s16 vid);\n int i40e_vsi_add_vlan(struct i40e_vsi *vsi, u16 vid);\n void i40e_rm_vlan_all_mac(struct i40e_vsi *vsi, s16 vid);\n void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, u16 vid);\n-struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n-\t\t\t\t\t const u8 *macaddr);\n-int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr);\n+struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,\n+\t\t\t\t\t const u8 *macaddr);\n+int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr);\n bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);\n struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr);\n #ifdef I40E_FCOE\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 3812966..6a6c293 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1482,18 +1482,19 @@ void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan)\n }\n \n /**\n- * i40e_put_mac_in_vlan - Make macvlan filters from macaddrs and vlans\n+ * i40e_add_mac_filter - Add a MAC filter for all active VLANs\n * @vsi: the VSI to be searched\n * @macaddr: the mac address to be filtered\n *\n- * Goes through all the macvlan filters and adds a macvlan filter for each\n+ * If we're not in VLAN mode, just add the filter to I40E_VLAN_ANY. Otherwise,\n+ * go through all the macvlan filters and add a macvlan filter for each\n * unique vlan that already exists. If a PVID has been assigned, instead only\n * add the macaddr to that VLAN.\n *\n * Returns last filter added on success, else NULL\n **/\n-struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n-\t\t\t\t\t const u8 *macaddr)\n+struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,\n+\t\t\t\t\t const u8 *macaddr)\n {\n \tstruct i40e_mac_filter *f, *add = NULL;\n \tstruct hlist_node *h;\n@@ -1518,15 +1519,16 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n }\n \n /**\n- * i40e_del_mac_all_vlan - Remove a MAC filter from all VLANS\n+ * i40e_del_mac_filter - Remove a MAC filter from all VLANs\n * @vsi: the VSI to be searched\n * @macaddr: the mac address to be removed\n *\n- * Removes a given MAC address from a VSI, regardless of VLAN\n+ * Removes a given MAC address from a VSI regardless of what VLAN it has been\n+ * associated with.\n *\n * Returns 0 for success, or error\n **/\n-int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr)\n+int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr)\n {\n \tstruct i40e_mac_filter *f;\n \tstruct hlist_node *h;\n@@ -1587,8 +1589,8 @@ static int i40e_set_mac(struct net_device *netdev, void *p)\n \t\tnetdev_info(netdev, \"set new mac address %pM\\n\", addr->sa_data);\n \n \tspin_lock_bh(&vsi->mac_filter_hash_lock);\n-\ti40e_del_mac_all_vlan(vsi, netdev->dev_addr);\n-\ti40e_put_mac_in_vlan(vsi, addr->sa_data);\n+\ti40e_del_mac_filter(vsi, netdev->dev_addr);\n+\ti40e_add_mac_filter(vsi, addr->sa_data);\n \tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \tether_addr_copy(netdev->dev_addr, addr->sa_data);\n \tif (vsi->type == I40E_VSI_MAIN) {\n@@ -1765,7 +1767,7 @@ static int i40e_addr_sync(struct net_device *netdev, const u8 *addr)\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = np->vsi;\n \n-\tif (i40e_put_mac_in_vlan(vsi, addr))\n+\tif (i40e_add_mac_filter(vsi, addr))\n \t\treturn 0;\n \telse\n \t\treturn -ENOMEM;\n@@ -1784,7 +1786,7 @@ static int i40e_addr_unsync(struct net_device *netdev, const u8 *addr)\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = np->vsi;\n \n-\ti40e_del_mac_all_vlan(vsi, addr);\n+\ti40e_del_mac_filter(vsi, addr);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 0cdbdd3..1859911 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -1943,7 +1943,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \n \t\tf = i40e_find_mac(vsi, al->list[i].addr);\n \t\tif (!f)\n-\t\t\tf = i40e_put_mac_in_vlan(vsi, al->list[i].addr);\n+\t\t\tf = i40e_add_mac_filter(vsi, al->list[i].addr);\n \n \t\tif (!f) {\n \t\t\tdev_err(&pf->pdev->dev,\n@@ -2008,7 +2008,7 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t/* delete addresses from the list */\n \tfor (i = 0; i < al->num_elements; i++)\n-\t\tif (i40e_del_mac_all_vlan(vsi, al->list[i].addr)) {\n+\t\tif (i40e_del_mac_filter(vsi, al->list[i].addr)) {\n \t\t\tret = I40E_ERR_INVALID_MAC_ADDR;\n \t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\tgoto error_param;\n", "prefixes": [ "next", "S54", "11/15" ] }