Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/581736/?format=api
{ "id": 581736, "url": "http://patchwork.ozlabs.org/api/patches/581736/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160210231630.9713.65406.stgit@localhost6.localdomain6/", "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": "<20160210231630.9713.65406.stgit@localhost6.localdomain6>", "list_archive_url": null, "date": "2016-02-10T23:16:30", "name": "ixgbevf: fix error code path when setting MAC address", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "88d9f780e231f5bf448f2d2a922afa00e61f9abc", "submitter": { "id": 1670, "url": "http://patchwork.ozlabs.org/api/people/1670/?format=api", "name": "Tantilov, Emil S", "email": "emil.s.tantilov@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/20160210231630.9713.65406.stgit@localhost6.localdomain6/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/581736/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/581736/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 589DA140325\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 11 Feb 2016 10:18:22 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C2D2691F64;\n\tWed, 10 Feb 2016 23:18:20 +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 ZkQ1wIU5Y7DK; Wed, 10 Feb 2016 23:18:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 39F8091EFE;\n\tWed, 10 Feb 2016 23:18:20 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E0F821C086E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 10 Feb 2016 23:18:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id D236032EB3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 10 Feb 2016 23:18:19 +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 vvNjDwGM-1OY for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 10 Feb 2016 23:18:17 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4E3C932C3D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 10 Feb 2016 23:18:17 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP; 10 Feb 2016 15:18:17 -0800", "from estantil-desk3.jf.intel.com (HELO localhost6.localdomain6)\n\t([134.134.3.186])\n\tby orsmga002.jf.intel.com with ESMTP; 10 Feb 2016 15:18:18 -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.22,427,1449561600\"; d=\"scan'208\";a=\"909613067\"", "From": "Emil Tantilov <emil.s.tantilov@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 10 Feb 2016 15:16:30 -0800", "Message-ID": "<20160210231630.9713.65406.stgit@localhost6.localdomain6>", "User-Agent": "StGit/0.17.1-4-g4a0c1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH] ixgbevf: fix error code path when setting\n\tMAC address", "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": "Return error when a MAC address change is rejected by the PF.\n\nThis will prevent the user from modifying the MAC address when\nthat operation is not permitted.\n\nSigned-off-by: Emil Tantilov <emil.s.tantilov@intel.com>\n---\n drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 12 ++++++++----\n drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +++-\n 2 files changed, 11 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\nindex 11d6d7e..98dca80 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n@@ -3668,19 +3668,23 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)\n \tstruct ixgbevf_adapter *adapter = netdev_priv(netdev);\n \tstruct ixgbe_hw *hw = &adapter->hw;\n \tstruct sockaddr *addr = p;\n+\tint err;\n \n \tif (!is_valid_ether_addr(addr->sa_data))\n \t\treturn -EADDRNOTAVAIL;\n \n-\tether_addr_copy(netdev->dev_addr, addr->sa_data);\n-\tether_addr_copy(hw->mac.addr, addr->sa_data);\n-\n \tspin_lock_bh(&adapter->mbx_lock);\n \n-\thw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);\n+\terr = hw->mac.ops.set_rar(hw, 0, addr->sa_data, 0);\n \n \tspin_unlock_bh(&adapter->mbx_lock);\n \n+\tif (err)\n+\t\treturn -EPERM;\n+\n+\tether_addr_copy(hw->mac.addr, addr->sa_data);\n+\tether_addr_copy(netdev->dev_addr, addr->sa_data);\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c\nindex 61a98f4..4d613a4 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/vf.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c\n@@ -408,8 +408,10 @@ static s32 ixgbevf_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr,\n \n \t/* if nacked the address was rejected, use \"perm_addr\" */\n \tif (!ret_val &&\n-\t (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK)))\n+\t (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK))) {\n \t\tixgbevf_get_mac_addr_vf(hw, hw->mac.addr);\n+\t\treturn IXGBE_ERR_MBX;\n+\t}\n \n \treturn ret_val;\n }\n", "prefixes": [] }