Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/460273/?format=api
{ "id": 460273, "url": "http://patchwork.ozlabs.org/api/patches/460273/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20150410234616.23532.23537.stgit@gmw-smvitp108.amr.corp.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": "<20150410234616.23532.23537.stgit@gmw-smvitp108.amr.corp.intel.com>", "list_archive_url": null, "date": "2015-04-10T23:48:19", "name": "[net-next,v2,07/25] fm10k: allow creation of VLAN on default vid", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e570063fb30def410b1be20bee881f3d4b8b381c", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@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/20150410234616.23532.23537.stgit@gmw-smvitp108.amr.corp.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/460273/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/460273/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 (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 64BA61401AF\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 11 Apr 2015 09:48:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AE874A12EE;\n\tFri, 10 Apr 2015 23:48:23 +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 6RCnC1NViKsx; Fri, 10 Apr 2015 23:48:23 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4ECAFA12C2;\n\tFri, 10 Apr 2015 23:48:23 +0000 (UTC)", "from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 156AD1C1E95\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 10 Apr 2015 23:48:22 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E7ECD8AF12\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 10 Apr 2015 23:48:21 +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 vjTTLdgSMznX for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 10 Apr 2015 23:48:19 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C07618AF10\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 10 Apr 2015 23:48:19 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga103.jf.intel.com with ESMTP; 10 Apr 2015 16:48:20 -0700", "from bjhicke1-mobl.amr.corp.intel.com (HELO\n\tgmw-smvitp108.amr.corp.intel.com) ([10.254.74.251])\n\tby orsmga003.jf.intel.com with ESMTP; 10 Apr 2015 16:48:19 -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.11,559,1422950400\"; d=\"scan'208\";a=\"554362751\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 10 Apr 2015 16:48:19 -0700", "Message-ID": "<20150410234616.23532.23537.stgit@gmw-smvitp108.amr.corp.intel.com>", "User-Agent": "StGit/0.17-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-next v2 07/25] fm10k: allow creation of VLAN\n\ton default vid", "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>", "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": "Previously, the user was not allowed to create a VLAN interface on top\nof the switch default vid.\n\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nAcked-by: Matthew Vick <matthew.vick@intel.com>\n---\nv2: based on feedback from Alex, keep the code, but just move it down in\n the function and return 0\n---\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 2a61b83..e8f5c8c 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -770,15 +770,15 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)\n \tif (hw->mac.vlan_override)\n \t\treturn -EACCES;\n \n-\t/* if default VLAN is already present do nothing */\n-\tif (vid == hw->mac.default_vid)\n-\t\treturn -EBUSY;\n-\n \t/* update active_vlans bitmask */\n \tset_bit(vid, interface->active_vlans);\n \tif (!set)\n \t\tclear_bit(vid, interface->active_vlans);\n \n+\t/* if default VLAN is already present do nothing */\n+\tif (vid == hw->mac.default_vid)\n+\t\treturn 0;\n+\n \tfm10k_mbx_lock(interface);\n \n \t/* only need to update the VLAN if not in promiscuous mode */\n", "prefixes": [ "net-next", "v2", "07/25" ] }