Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/484607/?format=api
{ "id": 484607, "url": "http://patchwork.ozlabs.org/api/patches/484607/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1434405656-10465-6-git-send-email-jacob.e.keller@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": "<1434405656-10465-6-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-06-15T22:00:56", "name": "[6/6] fm10k: update netdev perm_addr during reinit, instead of at up", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2410f741b87837d2a7a5d0e1f42ab3c10ec2ee14", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/1434405656-10465-6-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/484607/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/484607/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 0AEDB14029E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 16 Jun 2015 08:01:10 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 54A50A3F5C;\n\tMon, 15 Jun 2015 22:01:09 +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 ypy9a42j5l6B; Mon, 15 Jun 2015 22:01:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 50750A3AA6;\n\tMon, 15 Jun 2015 22:01:08 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id DD8331C0E70\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 15 Jun 2015 22:01:06 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DA4B0A3BBD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 15 Jun 2015 22:01:06 +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 j-6fLFhtwrrX for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 15 Jun 2015 22:01:06 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0D7E3A3B2A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 15 Jun 2015 22:01:06 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga103.fm.intel.com with ESMTP; 15 Jun 2015 15:01:05 -0700", "from jekeller-desk.amr.corp.intel.com ([134.134.3.85])\n\tby FMSMGA003.fm.intel.com with ESMTP; 15 Jun 2015 15:01: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.13,621,1427785200\"; d=\"scan'208\";a=\"508766670\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Mon, 15 Jun 2015 15:00:56 -0700", "Message-Id": "<1434405656-10465-6-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.4.2", "In-Reply-To": "<1434405656-10465-1-git-send-email-jacob.e.keller@intel.com>", "References": "<1434405656-10465-1-git-send-email-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 6/6] fm10k: update netdev perm_addr during\n\treinit, instead of at up", "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": "Update the netdev permanent address during fm10k_reinit enables the user\nto immediately see the new MAC address on the VF even if the device\nisn't up. The previous code required that the device by opened before\nchanges would appear.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 15 ---------------\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 15 +++++++++++++++\n 2 files changed, 15 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 818bc8b1fa58..b2065cb44edc 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -996,21 +996,6 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface)\n \tint xcast_mode;\n \tu16 vid, glort;\n \n-\t/* restore our address if perm_addr is set */\n-\tif (hw->mac.type == fm10k_mac_vf) {\n-\t\tif (is_valid_ether_addr(hw->mac.perm_addr)) {\n-\t\t\tether_addr_copy(hw->mac.addr, hw->mac.perm_addr);\n-\t\t\tether_addr_copy(netdev->perm_addr, hw->mac.perm_addr);\n-\t\t\tether_addr_copy(netdev->dev_addr, hw->mac.perm_addr);\n-\t\t\tnetdev->addr_assign_type &= ~NET_ADDR_RANDOM;\n-\t\t}\n-\n-\t\tif (hw->mac.vlan_override)\n-\t\t\tnetdev->features &= ~NETIF_F_HW_VLAN_CTAG_RX;\n-\t\telse\n-\t\t\tnetdev->features |= NETIF_F_HW_VLAN_CTAG_RX;\n-\t}\n-\n \t/* record glort for this interface */\n \tglort = interface->glort;\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex d8ab6cdca456..dc354c74fd58 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -170,6 +170,21 @@ static void fm10k_reinit(struct fm10k_intfc *interface)\n \t/* reassociate interrupts */\n \tfm10k_mbx_request_irq(interface);\n \n+\t/* update hardware address for VFs if perm_addr has changed */\n+\tif (hw->mac.type == fm10k_mac_vf) {\n+\t\tif (is_valid_ether_addr(hw->mac.perm_addr)) {\n+\t\t\tether_addr_copy(hw->mac.addr, hw->mac.perm_addr);\n+\t\t\tether_addr_copy(netdev->perm_addr, hw->mac.perm_addr);\n+\t\t\tether_addr_copy(netdev->dev_addr, hw->mac.perm_addr);\n+\t\t\tnetdev->addr_assign_type &= ~NET_ADDR_RANDOM;\n+\t\t}\n+\n+\t\tif (hw->mac.vlan_override)\n+\t\t\tnetdev->features &= ~NETIF_F_HW_VLAN_CTAG_RX;\n+\t\telse\n+\t\t\tnetdev->features |= NETIF_F_HW_VLAN_CTAG_RX;\n+\t}\n+\n \t/* reset clock */\n \tfm10k_ts_reset(interface);\n \n", "prefixes": [ "6/6" ] }