Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1276675/?format=api
{ "id": 1276675, "url": "http://patchwork.ozlabs.org/api/patches/1276675/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200424201623.10971-6-andre.guedes@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": "<20200424201623.10971-6-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-04-24T20:16:09", "name": "[05/19] igc: Add 'igc_ethtool_' prefix to functions in igc_ethtool.c", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "81ad8fa09312ae5df11d4c48068832518089eb56", "submitter": { "id": 72323, "url": "http://patchwork.ozlabs.org/api/people/72323/?format=api", "name": "Andre Guedes", "email": "andre.guedes@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/20200424201623.10971-6-andre.guedes@intel.com/mbox/", "series": [ { "id": 172579, "url": "http://patchwork.ozlabs.org/api/series/172579/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=172579", "date": "2020-04-24T20:16:07", "name": "igc: Fixes to NFC support code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/172579/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1276675/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1276675/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49857t2rLyz9sSG\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 25 Apr 2020 06:17:46 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id BA46A204C0;\n\tFri, 24 Apr 2020 20:17:44 +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 XXsWpJoGlz+h; Fri, 24 Apr 2020 20:17:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8327F204C3;\n\tFri, 24 Apr 2020 20:17:32 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id 9BCC41BF83C\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:27 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id 989EA86B59\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:27 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id wePsgUU1SOMi for <intel-wired-lan@lists.osuosl.org>;\n Fri, 24 Apr 2020 20:17:26 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id 19FB986BA9\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:26 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Apr 2020 13:17:25 -0700", "from kleandre-mobl.amr.corp.intel.com ([10.213.164.39])\n by orsmga001.jf.intel.com with ESMTP; 24 Apr 2020 13:17:25 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n dWaFFuj+DlygMhxUtcFtIcuGxHXm5Nv+EvtCBiiJjRYf7Bq2MBVcYWkhKuiYbxVbHmv/cFxkaT\n rXp8detPi2zg==", "\n q5g7EZVKKxYtYkTsD1kKe0jDWu7yGRbcIDHu7CyEqHcriE3+eMuGgnwa8w918wQkXbAbsOKJlg\n /PTVCPh+i1HA==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,313,1583222400\"; d=\"scan'208\";a=\"335474505\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 24 Apr 2020 13:16:09 -0700", "Message-Id": "<20200424201623.10971-6-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.26.0", "In-Reply-To": "<20200424201623.10971-1-andre.guedes@intel.com>", "References": "<20200424201623.10971-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 05/19] igc: Add 'igc_ethtool_' prefix to\n functions in igc_ethtool.c", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This patch adds the prefix 'igc_ethtool_' to all functions defined in\nigc_ethtool.c so they align with the name convention already followed by\nother parts of the driver (e.g. igc_tsn, igc_ptp). Also, this avoids\nsome name clashing with functions added to igc_main.c by upcoming\npatches in this series. No functionality is changed by this patch, just\nfunction renaming.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc.h | 3 +-\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 215 ++++++++++---------\n drivers/net/ethernet/intel/igc/igc_main.c | 2 +-\n 3 files changed, 112 insertions(+), 108 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h\nindex 7c92fc7703be..359ac40908f6 100644\n--- a/drivers/net/ethernet/intel/igc/igc.h\n+++ b/drivers/net/ethernet/intel/igc/igc.h\n@@ -16,8 +16,7 @@\n \n #include \"igc_hw.h\"\n \n-/* forward declaration */\n-void igc_set_ethtool_ops(struct net_device *);\n+void igc_ethtool_set_ops(struct net_device *);\n \n /* Transmit and receive queues */\n #define IGC_MAX_RX_QUEUES\t\t4\ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex 45481b1c9ee3..4ee040607c0b 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -124,8 +124,8 @@ static const char igc_priv_flags_strings[][ETH_GSTRING_LEN] = {\n \n #define IGC_PRIV_FLAGS_STR_LEN ARRAY_SIZE(igc_priv_flags_strings)\n \n-static void igc_get_drvinfo(struct net_device *netdev,\n-\t\t\t struct ethtool_drvinfo *drvinfo)\n+static void igc_ethtool_get_drvinfo(struct net_device *netdev,\n+\t\t\t\t struct ethtool_drvinfo *drvinfo)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -139,13 +139,13 @@ static void igc_get_drvinfo(struct net_device *netdev,\n \tdrvinfo->n_priv_flags = IGC_PRIV_FLAGS_STR_LEN;\n }\n \n-static int igc_get_regs_len(struct net_device *netdev)\n+static int igc_ethtool_get_regs_len(struct net_device *netdev)\n {\n \treturn IGC_REGS_LEN * sizeof(u32);\n }\n \n-static void igc_get_regs(struct net_device *netdev,\n-\t\t\t struct ethtool_regs *regs, void *p)\n+static void igc_ethtool_get_regs(struct net_device *netdev,\n+\t\t\t\t struct ethtool_regs *regs, void *p)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_hw *hw = &adapter->hw;\n@@ -323,7 +323,8 @@ static void igc_get_regs(struct net_device *netdev,\n \t\tregs_buff[205 + i] = rd32(IGC_ETQF(i));\n }\n \n-static void igc_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)\n+static void igc_ethtool_get_wol(struct net_device *netdev,\n+\t\t\t\tstruct ethtool_wolinfo *wol)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -354,7 +355,8 @@ static void igc_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)\n \t\twol->wolopts |= WAKE_PHY;\n }\n \n-static int igc_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)\n+static int igc_ethtool_set_wol(struct net_device *netdev,\n+\t\t\t struct ethtool_wolinfo *wol)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -382,21 +384,21 @@ static int igc_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)\n \treturn 0;\n }\n \n-static u32 igc_get_msglevel(struct net_device *netdev)\n+static u32 igc_ethtool_get_msglevel(struct net_device *netdev)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n \treturn adapter->msg_enable;\n }\n \n-static void igc_set_msglevel(struct net_device *netdev, u32 data)\n+static void igc_ethtool_set_msglevel(struct net_device *netdev, u32 data)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n \tadapter->msg_enable = data;\n }\n \n-static int igc_nway_reset(struct net_device *netdev)\n+static int igc_ethtool_nway_reset(struct net_device *netdev)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -405,7 +407,7 @@ static int igc_nway_reset(struct net_device *netdev)\n \treturn 0;\n }\n \n-static u32 igc_get_link(struct net_device *netdev)\n+static u32 igc_ethtool_get_link(struct net_device *netdev)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_mac_info *mac = &adapter->hw.mac;\n@@ -422,15 +424,15 @@ static u32 igc_get_link(struct net_device *netdev)\n \treturn igc_has_link(adapter);\n }\n \n-static int igc_get_eeprom_len(struct net_device *netdev)\n+static int igc_ethtool_get_eeprom_len(struct net_device *netdev)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n \treturn adapter->hw.nvm.word_size * 2;\n }\n \n-static int igc_get_eeprom(struct net_device *netdev,\n-\t\t\t struct ethtool_eeprom *eeprom, u8 *bytes)\n+static int igc_ethtool_get_eeprom(struct net_device *netdev,\n+\t\t\t\t struct ethtool_eeprom *eeprom, u8 *bytes)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_hw *hw = &adapter->hw;\n@@ -476,8 +478,8 @@ static int igc_get_eeprom(struct net_device *netdev,\n \treturn ret_val;\n }\n \n-static int igc_set_eeprom(struct net_device *netdev,\n-\t\t\t struct ethtool_eeprom *eeprom, u8 *bytes)\n+static int igc_ethtool_set_eeprom(struct net_device *netdev,\n+\t\t\t\t struct ethtool_eeprom *eeprom, u8 *bytes)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_hw *hw = &adapter->hw;\n@@ -544,8 +546,8 @@ static int igc_set_eeprom(struct net_device *netdev,\n \treturn ret_val;\n }\n \n-static void igc_get_ringparam(struct net_device *netdev,\n-\t\t\t struct ethtool_ringparam *ring)\n+static void igc_ethtool_get_ringparam(struct net_device *netdev,\n+\t\t\t\t struct ethtool_ringparam *ring)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -555,8 +557,8 @@ static void igc_get_ringparam(struct net_device *netdev,\n \tring->tx_pending = adapter->tx_ring_count;\n }\n \n-static int igc_set_ringparam(struct net_device *netdev,\n-\t\t\t struct ethtool_ringparam *ring)\n+static int igc_ethtool_set_ringparam(struct net_device *netdev,\n+\t\t\t\t struct ethtool_ringparam *ring)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_ring *temp_ring;\n@@ -670,8 +672,8 @@ static int igc_set_ringparam(struct net_device *netdev,\n \treturn err;\n }\n \n-static void igc_get_pauseparam(struct net_device *netdev,\n-\t\t\t struct ethtool_pauseparam *pause)\n+static void igc_ethtool_get_pauseparam(struct net_device *netdev,\n+\t\t\t\t struct ethtool_pauseparam *pause)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_hw *hw = &adapter->hw;\n@@ -689,8 +691,8 @@ static void igc_get_pauseparam(struct net_device *netdev,\n \t}\n }\n \n-static int igc_set_pauseparam(struct net_device *netdev,\n-\t\t\t struct ethtool_pauseparam *pause)\n+static int igc_ethtool_set_pauseparam(struct net_device *netdev,\n+\t\t\t\t struct ethtool_pauseparam *pause)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_hw *hw = &adapter->hw;\n@@ -729,7 +731,8 @@ static int igc_set_pauseparam(struct net_device *netdev,\n \treturn retval;\n }\n \n-static void igc_get_strings(struct net_device *netdev, u32 stringset, u8 *data)\n+static void igc_ethtool_get_strings(struct net_device *netdev, u32 stringset,\n+\t\t\t\t u8 *data)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tu8 *p = data;\n@@ -780,7 +783,7 @@ static void igc_get_strings(struct net_device *netdev, u32 stringset, u8 *data)\n \t}\n }\n \n-static int igc_get_sset_count(struct net_device *netdev, int sset)\n+static int igc_ethtool_get_sset_count(struct net_device *netdev, int sset)\n {\n \tswitch (sset) {\n \tcase ETH_SS_STATS:\n@@ -794,7 +797,7 @@ static int igc_get_sset_count(struct net_device *netdev, int sset)\n \t}\n }\n \n-static void igc_get_ethtool_stats(struct net_device *netdev,\n+static void igc_ethtool_get_stats(struct net_device *netdev,\n \t\t\t\t struct ethtool_stats *stats, u64 *data)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n@@ -850,8 +853,8 @@ static void igc_get_ethtool_stats(struct net_device *netdev,\n \tspin_unlock(&adapter->stats64_lock);\n }\n \n-static int igc_get_coalesce(struct net_device *netdev,\n-\t\t\t struct ethtool_coalesce *ec)\n+static int igc_ethtool_get_coalesce(struct net_device *netdev,\n+\t\t\t\t struct ethtool_coalesce *ec)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -870,8 +873,8 @@ static int igc_get_coalesce(struct net_device *netdev,\n \treturn 0;\n }\n \n-static int igc_set_coalesce(struct net_device *netdev,\n-\t\t\t struct ethtool_coalesce *ec)\n+static int igc_ethtool_set_coalesce(struct net_device *netdev,\n+\t\t\t\t struct ethtool_coalesce *ec)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tint i;\n@@ -928,7 +931,7 @@ static int igc_set_coalesce(struct net_device *netdev,\n }\n \n #define ETHER_TYPE_FULL_MASK ((__force __be16)~0)\n-static int igc_get_ethtool_nfc_entry(struct igc_adapter *adapter,\n+static int igc_ethtool_get_nfc_entry(struct igc_adapter *adapter,\n \t\t\t\t struct ethtool_rxnfc *cmd)\n {\n \tstruct ethtool_rx_flow_spec *fsp = &cmd->fs;\n@@ -977,7 +980,7 @@ static int igc_get_ethtool_nfc_entry(struct igc_adapter *adapter,\n \treturn 0;\n }\n \n-static int igc_get_ethtool_nfc_all(struct igc_adapter *adapter,\n+static int igc_ethtool_get_nfc_all(struct igc_adapter *adapter,\n \t\t\t\t struct ethtool_rxnfc *cmd,\n \t\t\t\t u32 *rule_locs)\n {\n@@ -999,8 +1002,8 @@ static int igc_get_ethtool_nfc_all(struct igc_adapter *adapter,\n \treturn 0;\n }\n \n-static int igc_get_rss_hash_opts(struct igc_adapter *adapter,\n-\t\t\t\t struct ethtool_rxnfc *cmd)\n+static int igc_ethtool_get_rss_hash_opts(struct igc_adapter *adapter,\n+\t\t\t\t\t struct ethtool_rxnfc *cmd)\n {\n \tcmd->data = 0;\n \n@@ -1049,8 +1052,8 @@ static int igc_get_rss_hash_opts(struct igc_adapter *adapter,\n \treturn 0;\n }\n \n-static int igc_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,\n-\t\t\t u32 *rule_locs)\n+static int igc_ethtool_get_rxnfc(struct net_device *dev,\n+\t\t\t\t struct ethtool_rxnfc *cmd, u32 *rule_locs)\n {\n \tstruct igc_adapter *adapter = netdev_priv(dev);\n \n@@ -1062,11 +1065,11 @@ static int igc_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,\n \t\tcmd->rule_cnt = adapter->nfc_filter_count;\n \t\treturn 0;\n \tcase ETHTOOL_GRXCLSRULE:\n-\t\treturn igc_get_ethtool_nfc_entry(adapter, cmd);\n+\t\treturn igc_ethtool_get_nfc_entry(adapter, cmd);\n \tcase ETHTOOL_GRXCLSRLALL:\n-\t\treturn igc_get_ethtool_nfc_all(adapter, cmd, rule_locs);\n+\t\treturn igc_ethtool_get_nfc_all(adapter, cmd, rule_locs);\n \tcase ETHTOOL_GRXFH:\n-\t\treturn igc_get_rss_hash_opts(adapter, cmd);\n+\t\treturn igc_ethtool_get_rss_hash_opts(adapter, cmd);\n \tdefault:\n \t\treturn -EOPNOTSUPP;\n \t}\n@@ -1074,8 +1077,8 @@ static int igc_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,\n \n #define UDP_RSS_FLAGS (IGC_FLAG_RSS_FIELD_IPV4_UDP | \\\n \t\t IGC_FLAG_RSS_FIELD_IPV6_UDP)\n-static int igc_set_rss_hash_opt(struct igc_adapter *adapter,\n-\t\t\t\tstruct ethtool_rxnfc *nfc)\n+static int igc_ethtool_set_rss_hash_opt(struct igc_adapter *adapter,\n+\t\t\t\t\tstruct ethtool_rxnfc *nfc)\n {\n \tu32 flags = adapter->flags;\n \n@@ -1240,7 +1243,7 @@ int igc_erase_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)\n \treturn 0;\n }\n \n-static int igc_update_ethtool_nfc_entry(struct igc_adapter *adapter,\n+static int igc_ethtool_update_nfc_entry(struct igc_adapter *adapter,\n \t\t\t\t\tstruct igc_nfc_filter *input,\n \t\t\t\t\tu16 sw_idx)\n {\n@@ -1288,7 +1291,7 @@ static int igc_update_ethtool_nfc_entry(struct igc_adapter *adapter,\n \treturn 0;\n }\n \n-static int igc_add_ethtool_nfc_entry(struct igc_adapter *adapter,\n+static int igc_ethtool_add_nfc_entry(struct igc_adapter *adapter,\n \t\t\t\t struct ethtool_rxnfc *cmd)\n {\n \tstruct net_device *netdev = adapter->netdev;\n@@ -1379,7 +1382,7 @@ static int igc_add_ethtool_nfc_entry(struct igc_adapter *adapter,\n \tif (err)\n \t\tgoto err_out_w_lock;\n \n-\tigc_update_ethtool_nfc_entry(adapter, input, input->sw_idx);\n+\tigc_ethtool_update_nfc_entry(adapter, input, input->sw_idx);\n \n \tspin_unlock(&adapter->nfc_lock);\n \treturn 0;\n@@ -1391,7 +1394,7 @@ static int igc_add_ethtool_nfc_entry(struct igc_adapter *adapter,\n \treturn err;\n }\n \n-static int igc_del_ethtool_nfc_entry(struct igc_adapter *adapter,\n+static int igc_ethtool_del_nfc_entry(struct igc_adapter *adapter,\n \t\t\t\t struct ethtool_rxnfc *cmd)\n {\n \tstruct ethtool_rx_flow_spec *fsp =\n@@ -1399,23 +1402,24 @@ static int igc_del_ethtool_nfc_entry(struct igc_adapter *adapter,\n \tint err;\n \n \tspin_lock(&adapter->nfc_lock);\n-\terr = igc_update_ethtool_nfc_entry(adapter, NULL, fsp->location);\n+\terr = igc_ethtool_update_nfc_entry(adapter, NULL, fsp->location);\n \tspin_unlock(&adapter->nfc_lock);\n \n \treturn err;\n }\n \n-static int igc_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)\n+static int igc_ethtool_set_rxnfc(struct net_device *dev,\n+\t\t\t\t struct ethtool_rxnfc *cmd)\n {\n \tstruct igc_adapter *adapter = netdev_priv(dev);\n \n \tswitch (cmd->cmd) {\n \tcase ETHTOOL_SRXFH:\n-\t\treturn igc_set_rss_hash_opt(adapter, cmd);\n+\t\treturn igc_ethtool_set_rss_hash_opt(adapter, cmd);\n \tcase ETHTOOL_SRXCLSRLINS:\n-\t\treturn igc_add_ethtool_nfc_entry(adapter, cmd);\n+\t\treturn igc_ethtool_add_nfc_entry(adapter, cmd);\n \tcase ETHTOOL_SRXCLSRLDEL:\n-\t\treturn igc_del_ethtool_nfc_entry(adapter, cmd);\n+\t\treturn igc_ethtool_del_nfc_entry(adapter, cmd);\n \tdefault:\n \t\treturn -EOPNOTSUPP;\n \t}\n@@ -1443,13 +1447,13 @@ void igc_write_rss_indir_tbl(struct igc_adapter *adapter)\n \t}\n }\n \n-static u32 igc_get_rxfh_indir_size(struct net_device *netdev)\n+static u32 igc_ethtool_get_rxfh_indir_size(struct net_device *netdev)\n {\n \treturn IGC_RETA_SIZE;\n }\n \n-static int igc_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,\n-\t\t\tu8 *hfunc)\n+static int igc_ethtool_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,\n+\t\t\t\tu8 *hfunc)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tint i;\n@@ -1464,8 +1468,8 @@ static int igc_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,\n \treturn 0;\n }\n \n-static int igc_set_rxfh(struct net_device *netdev, const u32 *indir,\n-\t\t\tconst u8 *key, const u8 hfunc)\n+static int igc_ethtool_set_rxfh(struct net_device *netdev, const u32 *indir,\n+\t\t\t\tconst u8 *key, const u8 hfunc)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tu32 num_queues;\n@@ -1493,8 +1497,8 @@ static int igc_set_rxfh(struct net_device *netdev, const u32 *indir,\n \treturn 0;\n }\n \n-static void igc_get_channels(struct net_device *netdev,\n-\t\t\t struct ethtool_channels *ch)\n+static void igc_ethtool_get_channels(struct net_device *netdev,\n+\t\t\t\t struct ethtool_channels *ch)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n@@ -1510,8 +1514,8 @@ static void igc_get_channels(struct net_device *netdev,\n \tch->combined_count = adapter->rss_queues;\n }\n \n-static int igc_set_channels(struct net_device *netdev,\n-\t\t\t struct ethtool_channels *ch)\n+static int igc_ethtool_set_channels(struct net_device *netdev,\n+\t\t\t\t struct ethtool_channels *ch)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tunsigned int count = ch->combined_count;\n@@ -1543,8 +1547,8 @@ static int igc_set_channels(struct net_device *netdev,\n \treturn 0;\n }\n \n-static int igc_get_ts_info(struct net_device *dev,\n-\t\t\t struct ethtool_ts_info *info)\n+static int igc_ethtool_get_ts_info(struct net_device *dev,\n+\t\t\t\t struct ethtool_ts_info *info)\n {\n \tstruct igc_adapter *adapter = netdev_priv(dev);\n \n@@ -1576,7 +1580,7 @@ static int igc_get_ts_info(struct net_device *dev,\n \t}\n }\n \n-static u32 igc_get_priv_flags(struct net_device *netdev)\n+static u32 igc_ethtool_get_priv_flags(struct net_device *netdev)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tu32 priv_flags = 0;\n@@ -1587,7 +1591,7 @@ static u32 igc_get_priv_flags(struct net_device *netdev)\n \treturn priv_flags;\n }\n \n-static int igc_set_priv_flags(struct net_device *netdev, u32 priv_flags)\n+static int igc_ethtool_set_priv_flags(struct net_device *netdev, u32 priv_flags)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tunsigned int flags = adapter->flags;\n@@ -1622,8 +1626,8 @@ static void igc_ethtool_complete(struct net_device *netdev)\n \tpm_runtime_put(&adapter->pdev->dev);\n }\n \n-static int igc_get_link_ksettings(struct net_device *netdev,\n-\t\t\t\t struct ethtool_link_ksettings *cmd)\n+static int igc_ethtool_get_link_ksettings(struct net_device *netdev,\n+\t\t\t\t\t struct ethtool_link_ksettings *cmd)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct igc_hw *hw = &adapter->hw;\n@@ -1729,8 +1733,9 @@ static int igc_get_link_ksettings(struct net_device *netdev,\n \treturn 0;\n }\n \n-static int igc_set_link_ksettings(struct net_device *netdev,\n-\t\t\t\t const struct ethtool_link_ksettings *cmd)\n+static int\n+igc_ethtool_set_link_ksettings(struct net_device *netdev,\n+\t\t\t const struct ethtool_link_ksettings *cmd)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tstruct net_device *dev = adapter->netdev;\n@@ -1796,8 +1801,8 @@ static int igc_set_link_ksettings(struct net_device *netdev,\n \treturn 0;\n }\n \n-static void igc_diag_test(struct net_device *netdev,\n-\t\t\t struct ethtool_test *eth_test, u64 *data)\n+static void igc_ethtool_diag_test(struct net_device *netdev,\n+\t\t\t\t struct ethtool_test *eth_test, u64 *data)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \tbool if_running = netif_running(netdev);\n@@ -1859,45 +1864,45 @@ static void igc_diag_test(struct net_device *netdev,\n \n static const struct ethtool_ops igc_ethtool_ops = {\n \t.supported_coalesce_params = ETHTOOL_COALESCE_USECS,\n-\t.get_drvinfo\t\t= igc_get_drvinfo,\n-\t.get_regs_len\t\t= igc_get_regs_len,\n-\t.get_regs\t\t= igc_get_regs,\n-\t.get_wol\t\t= igc_get_wol,\n-\t.set_wol\t\t= igc_set_wol,\n-\t.get_msglevel\t\t= igc_get_msglevel,\n-\t.set_msglevel\t\t= igc_set_msglevel,\n-\t.nway_reset\t\t= igc_nway_reset,\n-\t.get_link\t\t= igc_get_link,\n-\t.get_eeprom_len\t\t= igc_get_eeprom_len,\n-\t.get_eeprom\t\t= igc_get_eeprom,\n-\t.set_eeprom\t\t= igc_set_eeprom,\n-\t.get_ringparam\t\t= igc_get_ringparam,\n-\t.set_ringparam\t\t= igc_set_ringparam,\n-\t.get_pauseparam\t\t= igc_get_pauseparam,\n-\t.set_pauseparam\t\t= igc_set_pauseparam,\n-\t.get_strings\t\t= igc_get_strings,\n-\t.get_sset_count\t\t= igc_get_sset_count,\n-\t.get_ethtool_stats\t= igc_get_ethtool_stats,\n-\t.get_coalesce\t\t= igc_get_coalesce,\n-\t.set_coalesce\t\t= igc_set_coalesce,\n-\t.get_rxnfc\t\t= igc_get_rxnfc,\n-\t.set_rxnfc\t\t= igc_set_rxnfc,\n-\t.get_rxfh_indir_size\t= igc_get_rxfh_indir_size,\n-\t.get_rxfh\t\t= igc_get_rxfh,\n-\t.set_rxfh\t\t= igc_set_rxfh,\n-\t.get_ts_info\t\t= igc_get_ts_info,\n-\t.get_channels\t\t= igc_get_channels,\n-\t.set_channels\t\t= igc_set_channels,\n-\t.get_priv_flags\t\t= igc_get_priv_flags,\n-\t.set_priv_flags\t\t= igc_set_priv_flags,\n+\t.get_drvinfo\t\t= igc_ethtool_get_drvinfo,\n+\t.get_regs_len\t\t= igc_ethtool_get_regs_len,\n+\t.get_regs\t\t= igc_ethtool_get_regs,\n+\t.get_wol\t\t= igc_ethtool_get_wol,\n+\t.set_wol\t\t= igc_ethtool_set_wol,\n+\t.get_msglevel\t\t= igc_ethtool_get_msglevel,\n+\t.set_msglevel\t\t= igc_ethtool_set_msglevel,\n+\t.nway_reset\t\t= igc_ethtool_nway_reset,\n+\t.get_link\t\t= igc_ethtool_get_link,\n+\t.get_eeprom_len\t\t= igc_ethtool_get_eeprom_len,\n+\t.get_eeprom\t\t= igc_ethtool_get_eeprom,\n+\t.set_eeprom\t\t= igc_ethtool_set_eeprom,\n+\t.get_ringparam\t\t= igc_ethtool_get_ringparam,\n+\t.set_ringparam\t\t= igc_ethtool_set_ringparam,\n+\t.get_pauseparam\t\t= igc_ethtool_get_pauseparam,\n+\t.set_pauseparam\t\t= igc_ethtool_set_pauseparam,\n+\t.get_strings\t\t= igc_ethtool_get_strings,\n+\t.get_sset_count\t\t= igc_ethtool_get_sset_count,\n+\t.get_ethtool_stats\t= igc_ethtool_get_stats,\n+\t.get_coalesce\t\t= igc_ethtool_get_coalesce,\n+\t.set_coalesce\t\t= igc_ethtool_set_coalesce,\n+\t.get_rxnfc\t\t= igc_ethtool_get_rxnfc,\n+\t.set_rxnfc\t\t= igc_ethtool_set_rxnfc,\n+\t.get_rxfh_indir_size\t= igc_ethtool_get_rxfh_indir_size,\n+\t.get_rxfh\t\t= igc_ethtool_get_rxfh,\n+\t.set_rxfh\t\t= igc_ethtool_set_rxfh,\n+\t.get_ts_info\t\t= igc_ethtool_get_ts_info,\n+\t.get_channels\t\t= igc_ethtool_get_channels,\n+\t.set_channels\t\t= igc_ethtool_set_channels,\n+\t.get_priv_flags\t\t= igc_ethtool_get_priv_flags,\n+\t.set_priv_flags\t\t= igc_ethtool_set_priv_flags,\n \t.begin\t\t\t= igc_ethtool_begin,\n \t.complete\t\t= igc_ethtool_complete,\n-\t.get_link_ksettings\t= igc_get_link_ksettings,\n-\t.set_link_ksettings\t= igc_set_link_ksettings,\n-\t.self_test\t\t= igc_diag_test,\n+\t.get_link_ksettings\t= igc_ethtool_get_link_ksettings,\n+\t.set_link_ksettings\t= igc_ethtool_set_link_ksettings,\n+\t.self_test\t\t= igc_ethtool_diag_test,\n };\n \n-void igc_set_ethtool_ops(struct net_device *netdev)\n+void igc_ethtool_set_ops(struct net_device *netdev)\n {\n \tnetdev->ethtool_ops = &igc_ethtool_ops;\n }\ndiff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex 04f7f4112205..ecdc0548f24e 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -4935,7 +4935,7 @@ static int igc_probe(struct pci_dev *pdev,\n \thw->hw_addr = adapter->io_addr;\n \n \tnetdev->netdev_ops = &igc_netdev_ops;\n-\tigc_set_ethtool_ops(netdev);\n+\tigc_ethtool_set_ops(netdev);\n \tnetdev->watchdog_timeo = 5 * HZ;\n \n \tnetdev->mem_start = pci_resource_start(pdev, 0);\n", "prefixes": [ "05/19" ] }