Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536372/?format=api
{ "id": 536372, "url": "http://patchwork.ozlabs.org/api/patches/536372/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445902327-6717-6-git-send-email-jacob.e.keller@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": "<1445902327-6717-6-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-10-26T23:32:07", "name": "[next-queue,6/6] fm10k: consistently refer to VLANs and VLAN IDs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5b702e1260c726aa3bc94e803a39ecb9ce79c958", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/1445902327-6717-6-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536372/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536372/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 91C4A14132F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 27 Oct 2015 10:32:16 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D58848C4A8;\n\tMon, 26 Oct 2015 23:32:15 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id j0mKODPPZEEW; Mon, 26 Oct 2015 23:32:14 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3FAFE8C083;\n\tMon, 26 Oct 2015 23:32:14 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 93CC11C0FD5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:32:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8D3FD32330\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:32:11 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id QK7YGqWc+8aq for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:32:10 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9089132DC5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:32:10 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga101.fm.intel.com with ESMTP; 26 Oct 2015 16:32:10 -0700", "from jekeller-desk.amr.corp.intel.com ([134.134.3.123])\n\tby orsmga003.jf.intel.com with ESMTP; 26 Oct 2015 16:32:10 -0700" ], "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.20,202,1444719600\"; d=\"scan'208\";a=\"672286359\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Mon, 26 Oct 2015 16:32:07 -0700", "Message-Id": "<1445902327-6717-6-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.6.1.264.gbab76a9", "In-Reply-To": "<1445902327-6717-1-git-send-email-jacob.e.keller@intel.com>", "References": "<1445902327-6717-1-git-send-email-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [next-queue 6/6] fm10k: consistently refer to\n\tVLANs and VLAN IDs", "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": "Instead of using lowercase vlan, vid, or VID, always use VLAN or VLAN ID\nin comments when referring to VLANs. The original driver code was\nconsistent, but recent patches have not been as consistent with this\nnaming scheme.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 4 ++--\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 8 ++++----\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 ++--\n drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 10 +++++-----\n 4 files changed, 13 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 4cdabfc483d2..cc919cae7ed1 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -140,7 +140,7 @@ struct fm10k_ring {\n \t\t\t\t\t * different for DCB and RSS modes\n \t\t\t\t\t */\n \tu8 qos_pc;\t\t\t/* priority class of queue */\n-\tu16 vid;\t\t\t/* default vlan ID of queue */\n+\tu16 vid;\t\t\t/* default VLAN ID of queue */\n \tu16 count;\t\t\t/* amount of descriptors */\n \n \tu16 next_to_alloc;\n@@ -443,7 +443,7 @@ union fm10k_ftag_info {\n \tstruct {\n \t\t/* dglort and sglort combined into a single 32bit desc read */\n \t\t__le32 glort;\n-\t\t/* upper 16 bits of vlan are reserved 0 for swpri_type_user */\n+\t\t/* upper 16 bits of VLAN are reserved 0 for swpri_type_user */\n \t\t__le32 vlan;\n \t} d;\n \tstruct {\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 38fe2d8c8388..4307f1808d3a 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -630,7 +630,7 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)\n \t\tif (err)\n \t\t\treturn NETDEV_TX_OK;\n \n-\t\t/* locate vlan header */\n+\t\t/* locate VLAN header */\n \t\tvhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN);\n \n \t\t/* pull the 2 key pieces of data out of it */\n@@ -776,7 +776,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)\n \tif (!set)\n \t\tclear_bit(vid, interface->active_vlans);\n \n-\t/* disable the default VID on ring if we have an active VLAN */\n+\t/* disable the default VLAN ID on ring if we have an active VLAN */\n \tfor (i = 0; i < interface->num_rx_queues; i++) {\n \t\tstruct fm10k_ring *rx_ring = interface->rx_ring[i];\n \t\tu16 rx_vid = rx_ring->vid & (VLAN_N_VID - 1);\n@@ -787,7 +787,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)\n \t\t\trx_ring->vid &= ~FM10K_VLAN_CLEAR;\n \t}\n \n-\t/* Do not remove default VID related entries from VLAN and MAC tables */\n+\t/* Do not remove default VLAN ID related entries from VLAN and MAC tables */\n \tif (!set && vid == hw->mac.default_vid)\n \t\treturn 0;\n \n@@ -812,7 +812,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)\n \tif (err)\n \t\tgoto err_out;\n \n-\t/* set vid prior to syncing/unsyncing the VLAN */\n+\t/* set VLAN ID prior to syncing/unsyncing the VLAN */\n \tinterface->vid = vid + (set ? VLAN_N_VID : 0);\n \n \t/* Update the unicast and multicast address list to add/drop VLAN */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex e68000c35e02..3e1c65706736 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -715,7 +715,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,\n \t/* assign default VLAN to queue */\n \tring->vid = hw->mac.default_vid;\n \n-\t/* if we have an active VLAN, disable default VID */\n+\t/* if we have an active VLAN, disable default VLAN ID */\n \tif (test_bit(hw->mac.default_vid, interface->active_vlans))\n \t\tring->vid |= FM10K_VLAN_CLEAR;\n \n@@ -1299,7 +1299,7 @@ static s32 fm10k_update_pvid(struct fm10k_hw *hw, u32 **results,\n \tif (!fm10k_glort_valid_pf(hw, glort))\n \t\treturn FM10K_ERR_PARAM;\n \n-\t/* verify VID is valid */\n+\t/* verify VLAN ID is valid */\n \tif (pvid >= FM10K_VLAN_TABLE_VID_MAX)\n \t\treturn FM10K_ERR_PARAM;\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\nindex c7e09592c1f6..7c06dbcae589 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n@@ -329,7 +329,7 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort,\n \t/* clear set bit from VLAN ID */\n \tvid &= ~FM10K_VLAN_CLEAR;\n \n-\t/* if glort or vlan are not valid return error */\n+\t/* if glort or VLAN are not valid return error */\n \tif (!fm10k_glort_valid_pf(hw, glort) || vid >= FM10K_VLAN_TABLE_VID_MAX)\n \t\treturn FM10K_ERR_PARAM;\n \n@@ -1172,12 +1172,12 @@ s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results,\n }\n \n /**\n- * fm10k_iov_select_vid - Select correct default VID\n+ * fm10k_iov_select_vid - Select correct default VLAN ID\n * @hw: Pointer to hardware structure\n- * @vid: VID to correct\n+ * @vid: VLAN ID to correct\n *\n- * Will report an error if VID is out of range. For VID = 0, it will return\n- * either the pf_vid or sw_vid depending on which one is set.\n+ * Will report an error if the VLAN ID is out of range. For VID = 0, it will\n+ * return either the pf_vid or sw_vid depending on which one is set.\n */\n static inline s32 fm10k_iov_select_vid(struct fm10k_vf_info *vf_info, u16 vid)\n {\n", "prefixes": [ "next-queue", "6/6" ] }