Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512636/?format=api
{ "id": 512636, "url": "http://patchwork.ozlabs.org/api/patches/512636/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1441065295-234333-7-git-send-email-catherine.sullivan@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": "<1441065295-234333-7-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-31T23:54:46", "name": "[next,S14,06/15] i40e: Convert CEE App TLV selector to IEEE selector", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0e3c616f685b80e854c56b08a93da35c714b4687", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1441065295-234333-7-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512636/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512636/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 608C81401CB\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 1 Sep 2015 09:54:11 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8D270A3722;\n\tMon, 31 Aug 2015 23:54:10 +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 u8mGvtfbiQVx; Mon, 31 Aug 2015 23:54:10 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F1B44A36D9;\n\tMon, 31 Aug 2015 23:54:09 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 358A01C1009\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:07 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 318D43315B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:07 +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 64kRUGxpbJ0v for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:06 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8D08B33D0D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:06 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga102.fm.intel.com with ESMTP; 31 Aug 2015 16:54:06 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 31 Aug 2015 16:54:06 -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.17,445,1437462000\"; d=\"scan'208\";a=\"635798425\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 31 Aug 2015 19:54:46 -0400", "Message-Id": "<1441065295-234333-7-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1441065295-234333-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1441065295-234333-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Greg Bowers <gregory.j.bowers@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S14 06/15] i40e: Convert CEE App TLV\n\tselector to IEEE selector", "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: Greg Bowers <gregory.j.bowers@intel.com>\n\nChanges the parsing of CEE App TLVs to fill in the App selector in struct\ni40e_dcbx_config with the IEEE App selector so the caller doesn't have to\nconsider whether the App came from a CEE or IEEE DCBX negotiation.\n\nSigned-off-by: Greg Bowers <gregory.j.bowers@intel.com>\nChange-ID: Ia7d9d664cde04d2ebcc9822fd22e4929c6edab3a\n---\n drivers/net/ethernet/intel/i40e/i40e_dcb.c | 16 ++++++++++++----\n drivers/net/ethernet/intel/i40e/i40e_type.h | 2 ++\n 2 files changed, 14 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\nindex 251a841..2691277 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n@@ -380,7 +380,7 @@ static void i40e_parse_cee_app_tlv(struct i40e_cee_feat_tlv *tlv,\n {\n \tu16 length, typelength, offset = 0;\n \tstruct i40e_cee_app_prio *app;\n-\tu8 i, up;\n+\tu8 i, up, selector;\n \n \ttypelength = ntohs(tlv->hdr.typelen);\n \tlength = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >>\n@@ -397,9 +397,17 @@ static void i40e_parse_cee_app_tlv(struct i40e_cee_feat_tlv *tlv,\n \t\t\t\tbreak;\n \t\t}\n \t\tdcbcfg->app[i].priority = up;\n-\t\t/* Get Selector from lower 2 bits */\n-\t\tdcbcfg->app[i].selector = (app->upper_oui_sel &\n-\t\t\t\t\t I40E_CEE_APP_SELECTOR_MASK);\n+\n+\t\t/* Get Selector from lower 2 bits, and convert to IEEE */\n+\t\tselector = (app->upper_oui_sel & I40E_CEE_APP_SELECTOR_MASK);\n+\t\tif (selector == I40E_CEE_APP_SEL_ETHTYPE)\n+\t\t\tdcbcfg->app[i].selector = I40E_APP_SEL_ETHTYPE;\n+\t\telse if (selector == I40E_CEE_APP_SEL_TCPIP)\n+\t\t\tdcbcfg->app[i].selector = I40E_APP_SEL_TCPIP;\n+\t\telse\n+\t\t\t/* Keep selector as it is for unknown types */\n+\t\t\tdcbcfg->app[i].selector = selector;\n+\n \t\tdcbcfg->app[i].protocolid = ntohs(app->protocol);\n \t\t/* Move to next app */\n \t\toffset += sizeof(*app);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex c8f7a52..4ec3ffa 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -418,6 +418,8 @@ struct i40e_fc_info {\n #define I40E_APP_PROTOID_FIP\t\t0x8914\n #define I40E_APP_SEL_ETHTYPE\t\t0x1\n #define I40E_APP_SEL_TCPIP\t\t0x2\n+#define I40E_CEE_APP_SEL_ETHTYPE\t0x0\n+#define I40E_CEE_APP_SEL_TCPIP\t\t0x1\n \n /* CEE or IEEE 802.1Qaz ETS Configuration data */\n struct i40e_dcb_ets_config {\n", "prefixes": [ "next", "S14", "06/15" ] }