Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/546265/?format=api
{ "id": 546265, "url": "http://patchwork.ozlabs.org/api/patches/546265/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1447896942-10644-1-git-send-email-jesse.brandeburg@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": "<1447896942-10644-1-git-send-email-jesse.brandeburg@intel.com>", "list_archive_url": null, "date": "2015-11-19T01:35:42", "name": "[next] i40e: trivial fixes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f94b2e9ce60dcee33137ce8f40282364372fdeb5", "submitter": { "id": 189, "url": "http://patchwork.ozlabs.org/api/people/189/?format=api", "name": "Jesse Brandeburg", "email": "jesse.brandeburg@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/1447896942-10644-1-git-send-email-jesse.brandeburg@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/546265/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/546265/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\tby ozlabs.org (Postfix) with ESMTP id 5C33E140213\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 19 Nov 2015 12:38:48 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 49A0C94B03;\n\tThu, 19 Nov 2015 01:38:48 +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 LrF6nzEOPqD3; Thu, 19 Nov 2015 01:38:47 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 9C44B947E2;\n\tThu, 19 Nov 2015 01:38:47 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id DFC531C11CD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 01:38:46 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D8F01868F1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 01:38:46 +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 npe1LOfnhA0L for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 01:38:46 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0D57F868EC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 01:38:46 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga102.jf.intel.com with ESMTP; 18 Nov 2015 17:38:45 -0800", "from jbrandeb-hsm2.jf.intel.com ([134.134.3.178])\n\tby fmsmga002.fm.intel.com with ESMTP; 18 Nov 2015 17:37:31 -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.20,315,1444719600\"; d=\"scan'208\";a=\"854374370\"", "From": "Jesse Brandeburg <jesse.brandeburg@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 18 Nov 2015 17:35:42 -0800", "Message-Id": "<1447896942-10644-1-git-send-email-jesse.brandeburg@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [next PATCH] i40e: trivial fixes", "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": "1) remove duplicate include of tcp.h\n2) put an ampersand at the end of a line instead of the beginning\n3) remove a useless dev_info\n4) match declaration of function to the implementation\n5) repair incorrect comment\n6) correct whitespace\n7) remove unused define\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 7 +++----\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +-----\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 15 ++++-----------\n 3 files changed, 8 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 4ca85d5..bd6d9c0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -42,7 +42,6 @@\n #include <linux/string.h>\n #include <linux/in.h>\n #include <linux/ip.h>\n-#include <linux/tcp.h>\n #include <linux/sctp.h>\n #include <linux/pkt_sched.h>\n #include <linux/ipv6.h>\n@@ -610,8 +609,8 @@ static inline char *i40e_nvm_version_str(struct i40e_hw *hw)\n \n \tfull_ver = hw->nvm.oem_ver;\n \tver = (u8)(full_ver >> I40E_OEM_VER_SHIFT);\n-\tbuild = (u16)((full_ver >> I40E_OEM_VER_BUILD_SHIFT)\n-\t\t & I40E_OEM_VER_BUILD_MASK);\n+\tbuild = (u16)((full_ver >> I40E_OEM_VER_BUILD_SHIFT) &\n+\t\t I40E_OEM_VER_BUILD_MASK);\n \tpatch = (u8)(full_ver & I40E_OEM_VER_PATCH_MASK);\n \n \tsnprintf(buf, sizeof(buf),\n@@ -719,7 +718,7 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid,\n void i40e_veb_release(struct i40e_veb *veb);\n \n int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc);\n-i40e_status i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid);\n+int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid);\n void i40e_vsi_remove_pvid(struct i40e_vsi *vsi);\n void i40e_vsi_reset_stats(struct i40e_vsi *vsi);\n void i40e_pf_reset_stats(struct i40e_pf *pf);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex d67ac85..c21481c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -328,7 +328,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,\n * @fd_data: the flow director data required for the FDir descriptor\n * @add: true adds a filter, false removes it\n *\n- * Always returns -EOPNOTSUPP\n+ * Returns 0 if the filters were successfully added or removed\n **/\n static int i40e_add_del_fdir_sctpv4(struct i40e_vsi *vsi,\n \t\t\t\t struct i40e_fdir_filter *fd_data,\n@@ -515,9 +515,6 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,\n \t\t\t\tpf->auto_disable_flags |=\n \t\t\t\t\t\t\tI40E_FLAG_FD_SB_ENABLED;\n \t\t\t}\n-\t\t} else {\n-\t\t\tdev_info(&pdev->dev,\n-\t\t\t\t\"FD filter programming failed due to incorrect filter parameters\\n\");\n \t\t}\n \t} else if (error == BIT(I40E_RX_PROG_STATUS_DESC_NO_FD_ENTRY_SHIFT)) {\n \t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n@@ -1873,7 +1870,6 @@ enable_int:\n \t\tq_vector->itr_countdown--;\n \telse\n \t\tq_vector->itr_countdown = ITR_COUNTDOWN_START;\n-\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 9a51ec1..1be1da1 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -411,7 +411,7 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc)\n \treturn false;\n }\n \n-/*\n+/**\n * i40evf_setup_tx_descriptors - Allocate the Tx descriptors\n * @tx_ring: the tx ring to set up\n *\n@@ -1260,10 +1260,12 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \t\trx = i40e_set_new_dynamic_itr(&q_vector->rx);\n \t\trxval = i40e_buildreg_itr(I40E_RX_ITR, q_vector->rx.itr);\n \t}\n+\n \tif (ITR_IS_DYNAMIC(vsi->tx_itr_setting)) {\n \t\ttx = i40e_set_new_dynamic_itr(&q_vector->tx);\n \t\ttxval = i40e_buildreg_itr(I40E_TX_ITR, q_vector->tx.itr);\n \t}\n+\n \tif (rx || tx) {\n \t\t/* get the higher of the two ITR adjustments and\n \t\t * use the same value for both ITR registers\n@@ -1299,7 +1301,6 @@ enable_int:\n \t\tq_vector->itr_countdown--;\n \telse\n \t\tq_vector->itr_countdown = ITR_COUNTDOWN_START;\n-\n }\n \n /**\n@@ -1553,7 +1554,6 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t*tx_flags |= I40E_TX_FLAGS_IPV6;\n \t\t}\n \n-\n \t\tif ((tx_ring->flags & I40E_TXR_FLAGS_OUTER_UDP_CSUM) &&\n \t\t (l4_tunnel == I40E_TXD_CTX_UDP_TUNNELING) &&\n \t\t (*cd_tunneling & I40E_TXD_CTX_QW0_EXT_IP_MASK)) {\n@@ -1652,7 +1652,7 @@ static void i40e_create_tx_ctx(struct i40e_ring *tx_ring,\n \tcontext_desc->type_cmd_tso_mss = cpu_to_le64(cd_type_cmd_tso_mss);\n }\n \n- /**\n+/**\n * i40e_chk_linearize - Check if there are more than 8 fragments per packet\n * @skb: send buffer\n * @tx_flags: collected send information\n@@ -1848,7 +1848,6 @@ static inline void i40evf_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\ttx_bi = &tx_ring->tx_bi[i];\n \t}\n \n-#define WB_STRIDE 0x3\n \t/* set next_to_watch value indicating a packet is present */\n \tfirst->next_to_watch = tx_desc;\n \n@@ -1875,12 +1874,6 @@ static inline void i40evf_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t *\t\t\tupdate tail and set RS bit on every packet.\n \t *\tif xmit_more is false and last_xmit_more was true\n \t *\t\tupdate tail and set RS bit.\n-\t * else (kernel < 3.18)\n-\t *\tif every packet spanned less than 4 desc\n-\t *\t\tthen set RS bit on 4th packet and update tail\n-\t *\t\ton every packet\n-\t *\telse\n-\t *\t\tset RS bit on EOP for every packet and update tail\n \t *\n \t * Optimization: wmb to be issued only in case of tail update.\n \t * Also optimize the Descriptor WB path for RS bit with the same\n", "prefixes": [ "next" ] }