Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/605014/?format=api
{ "id": 605014, "url": "http://patchwork.ozlabs.org/api/patches/605014/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1459542871-39856-1-git-send-email-mitch.a.williams@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": "<1459542871-39856-1-git-send-email-mitch.a.williams@intel.com>", "list_archive_url": null, "date": "2016-04-01T20:34:31", "name": "[next,v2] i40evf: properly handle VLAN features", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "de349ded868edd4fe83f90cb4f16369c0455382c", "submitter": { "id": 967, "url": "http://patchwork.ozlabs.org/api/people/967/?format=api", "name": "Mitch Williams", "email": "mitch.a.williams@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/1459542871-39856-1-git-send-email-mitch.a.williams@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/605014/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/605014/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 3qcCjZ2L2dz9sD5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Apr 2016 07:32:18 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 67DDF33A3B;\n\tFri, 1 Apr 2016 20:32:17 +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 SXq0VQgt0q6T; Fri, 1 Apr 2016 20:32:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 269E22E497;\n\tFri, 1 Apr 2016 20:32:16 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id B5F741C0B41\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 20:32:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AC82995949\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 20:32:14 +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 Rf6QzFBHKF5G for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 20:32:14 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id F062295947\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 1 Apr 2016 20:32:13 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP; 01 Apr 2016 13:32:14 -0700", "from timeywimey.jf.intel.com ([10.166.12.154])\n\tby fmsmga001.fm.intel.com with ESMTP; 01 Apr 2016 13:32:13 -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.24,428,1455004800\"; d=\"scan'208\";a=\"936524297\"", "From": "Mitch Williams <mitch.a.williams@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 1 Apr 2016 13:34:31 -0700", "Message-Id": "<1459542871-39856-1-git-send-email-mitch.a.williams@intel.com>", "X-Mailer": "git-send-email 2.5.5", "Subject": "[Intel-wired-lan] [next PATCH v2] i40evf: properly handle VLAN\n\tfeatures", "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": "Correctly set the VLAN feature flags after setting the rest of the\nnetdev flags. And don't set them in hw_features, because these can't be\ncontrolled by the VF driver.\n\nTesting Hints: Make sure VLAN offloads work correctly when not using\nport VLANs, and make sure they're not available when using port VLANs.\n\nSigned-off-by: Mitch Williams <mitch.a.williams@intel.com>\n---\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 31 +++++++++++++------------\n 1 file changed, 16 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 4b70aae..7ef4d1a 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -2259,6 +2259,10 @@ static int i40evf_change_mtu(struct net_device *netdev, int new_mtu)\n \treturn 0;\n }\n \n+#define I40EVF_VLAN_FEATURES (NETIF_F_HW_VLAN_CTAG_TX |\\\n+\t\t\t NETIF_F_HW_VLAN_CTAG_RX |\\\n+\t\t\t NETIF_F_HW_VLAN_CTAG_FILTER)\n+\n static const struct net_device_ops i40evf_netdev_ops = {\n \t.ndo_open\t\t= i40evf_open,\n \t.ndo_stop\t\t= i40evf_close,\n@@ -2307,29 +2311,20 @@ static int i40evf_check_reset_complete(struct i40e_hw *hw)\n **/\n int i40evf_process_config(struct i40evf_adapter *adapter)\n {\n+\tstruct i40e_virtchnl_vf_resource *vfres = adapter->vf_res;\n \tstruct net_device *netdev = adapter->netdev;\n \tint i;\n \n \t/* got VF config message back from PF, now we can parse it */\n-\tfor (i = 0; i < adapter->vf_res->num_vsis; i++) {\n-\t\tif (adapter->vf_res->vsi_res[i].vsi_type == I40E_VSI_SRIOV)\n-\t\t\tadapter->vsi_res = &adapter->vf_res->vsi_res[i];\n+\tfor (i = 0; i < vfres->num_vsis; i++) {\n+\t\tif (vfres->vsi_res[i].vsi_type == I40E_VSI_SRIOV)\n+\t\t\tadapter->vsi_res = &vfres->vsi_res[i];\n \t}\n \tif (!adapter->vsi_res) {\n \t\tdev_err(&adapter->pdev->dev, \"No LAN VSI found\\n\");\n \t\treturn -ENODEV;\n \t}\n \n-\tif (adapter->vf_res->vf_offload_flags\n-\t & I40E_VIRTCHNL_VF_OFFLOAD_VLAN) {\n-\t\tnetdev->vlan_features = netdev->features &\n-\t\t\t\t\t~(NETIF_F_HW_VLAN_CTAG_TX |\n-\t\t\t\t\t NETIF_F_HW_VLAN_CTAG_RX |\n-\t\t\t\t\t NETIF_F_HW_VLAN_CTAG_FILTER);\n-\t\tnetdev->features |= NETIF_F_HW_VLAN_CTAG_TX |\n-\t\t\t\t NETIF_F_HW_VLAN_CTAG_RX |\n-\t\t\t\t NETIF_F_HW_VLAN_CTAG_FILTER;\n-\t}\n \tnetdev->features |= NETIF_F_HIGHDMA |\n \t\t\t NETIF_F_SG |\n \t\t\t NETIF_F_IP_CSUM |\n@@ -2338,7 +2333,7 @@ int i40evf_process_config(struct i40evf_adapter *adapter)\n \t\t\t NETIF_F_TSO |\n \t\t\t NETIF_F_TSO6 |\n \t\t\t NETIF_F_TSO_ECN |\n-\t\t\t NETIF_F_GSO_GRE\t |\n+\t\t\t NETIF_F_GSO_GRE |\n \t\t\t NETIF_F_GSO_UDP_TUNNEL |\n \t\t\t NETIF_F_RXCSUM |\n \t\t\t NETIF_F_GRO;\n@@ -2355,9 +2350,15 @@ int i40evf_process_config(struct i40evf_adapter *adapter)\n \tif (adapter->flags & I40EVF_FLAG_OUTER_UDP_CSUM_CAPABLE)\n \t\tnetdev->features |= NETIF_F_GSO_UDP_TUNNEL_CSUM;\n \n+\t/* always clear VLAN features because they can change at every reset */\n+\tnetdev->features &= ~(I40EVF_VLAN_FEATURES);\n \t/* copy netdev features into list of user selectable features */\n \tnetdev->hw_features |= netdev->features;\n-\tnetdev->hw_features &= ~NETIF_F_RXCSUM;\n+\n+\tif (vfres->vf_offload_flags & I40E_VIRTCHNL_VF_OFFLOAD_VLAN) {\n+\t\tnetdev->vlan_features = netdev->features;\n+\t\tnetdev->features |= I40EVF_VLAN_FEATURES;\n+\t}\n \n \tadapter->vsi.id = adapter->vsi_res->vsi_id;\n \n", "prefixes": [ "next", "v2" ] }