From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751356AbdBJDwa (ORCPT ); Thu, 9 Feb 2017 22:52:30 -0500 Received: from mail-eopbgr20131.outbound.protection.outlook.com ([40.107.2.131]:62595 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750989AbdBJDw1 (ORCPT ); Thu, 9 Feb 2017 22:52:27 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hyong-youb.kim@cspi.com; Date: Fri, 10 Feb 2017 12:51:42 +0900 From: Hyong-Youb Kim To: Philippe Reynes CC: , , Subject: Re: [PATCH] net: myricom: myri10ge: use new api ethtool_{get|set}_link_ksettings Message-ID: <20170210035142.GA2520@gtest01.arcus> References: <1486678643-13139-1-git-send-email-tremyfr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1486678643-13139-1-git-send-email-tremyfr@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [111.91.137.40] X-ClientProxiedBy: SG2PR04CA0108.apcprd04.prod.outlook.com (10.165.169.162) To AM4PR0501MB1969.eurprd05.prod.outlook.com (10.167.91.135) X-MS-Office365-Filtering-Correlation-Id: 335a63ca-e1b8-410c-3f15-08d451683877 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:AM4PR0501MB1969; X-Microsoft-Exchange-Diagnostics: 1;AM4PR0501MB1969;3:WJ0rjvtMHVi4ACq5mHR25MhZlgfvIKb4DbE80IUEiaqX44GraJ5THMRDC6Rk+Dbw9JqtyAQW/hckVgxBZYb6wsQ9bFlnueirR2pdIYfDGOCRqb02GT/tZLHyYTyrSimN5vbgdheplwjqdAOSkcg5h7BKJDMhI2gZSK9Rr7M/zgSRAzaOOYAZTvedGqwwsbCHKRzrMWxSZnzJqGLfj7kXptTnRLf3Wkh2Y5Qcbg0jSFFKQzHs28ssyphiMHKu6emH58OffmgCmjdXbfjiJrEyRA==;25:kV3ZUa58cohEu79Do5YTHJqrPGkw+9MFSn2lij63cwtNcTXltmUbXMykazNSJSrbmHY9SZ8Q+PrOdj6krA4O4AwyQqavxmJGdb68YjhpWc0rsSASysj+Z1uPzlgUTAZRApATFDcZw5BLRhJiZVY1SJJpDShlgIkzUyd8VIpV9q1LcmfdZkUEIP0UFIxRcCvyKe5/F8dpfdiTOrfve0AnemdNmYw8rXLizEfXj9xSKWFR+/b/nY4rVgej4dlWRq4E0JRUAxSFGH2E9tJ4/1ajvfDzTo8DKHgSnT4ODRRxDUTLefOnvc5kI4YnRxHtGHhYMKofY7rJf8pH7bpLOsrxAdMA4fwueH0yihe5aEvWU034wbsUAKK9N3v9bhLN/47wcczipd0XF18mGqgsBTXWYK9A5SZiVHT0113q918tpsv5jdX35dSgn7G4tJg6AGCKmyOcTMwDTuluHFLcgmqEKA== X-Microsoft-Exchange-Diagnostics: 1;AM4PR0501MB1969;31:zXYl5AJ2jMkV61H/bxRoDPndkleZ/fdR9TOoTkwrtZgXaotc9WTZlzpnCiwQtN44yQcve86T8uQ1mEWN2wFMyJ0GUlomPC6qviOdcitDecF0keoeQ9CIlQVaZ321embWTIAHvgKE66c8M1W+b8KEUzpbosTwYrkKFHng+oYqiTTEpcL0YTKp6r/2SUsTI+Lbf9MHMhI+dI6ey44vxvjPbXlteyyZUXXD7wG99ASuklgw5WDzG+ZdT6tEwsKMs+dodk3hxL67cBsZNuWWrFR0HXCj0AetM1FRF8VNdP04oZo=;20:PPEx2gREfYJ3tuVoz0eV/+v0wuzRgGux12yVOXd2woDznpSFldOfYyduHcD8AMwsNblX45wGxoKAgWWaRmhYj9dJhiOlLbGRTotkHi/fg4uIpjqM84gVEztASdmV8KyUV9QmOD8oa4TQP973k4P14xust7fruCWESeIRU63TOaXmsPL0nJK1D7hKYFQDzT0JwzdosLht/c3X5jC07M/Wnq5m/pDooU7Hm7Ui3LXhJaR8zBSBBQpUe1ILEuczRkrTdcMONjxtoXnACpVJ6DmjXdZ3La8PKNzi7Z5Ng6Se7dJLpAfaXdklgv58/pcmOgKLC4AxBhoeC/JNMTONdfFu4GWA2kVERlL3UOtVujLsp6ffM9XUyPz7YWn4izWMSCJkyoA/HnbTK85Bpp/5S99OVFlk9d16NR6bR8+aJAgqYzqT7zqYLG3p1NWcwoGlHnDwElfYiPhAF/cswWrXVnqmjblSaebg9lj3X21gCPtwPGP5t/8MWg9LtjxWmgRj5wvx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123558025)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148);SRVR:AM4PR0501MB1969;BCL:0;PCL:0;RULEID:;SRVR:AM4PR0501MB1969; X-Microsoft-Exchange-Diagnostics: 1;AM4PR0501MB1969;4:s1Spq2pLX00Qs2zQAGOaTbXoG/rvtxbJtOEWSfG2UFj/AJ+JDW6EGUvUJ37RmefwP5SaYTg/XMfMWPocpAwbIRGNT39bq7Q+IGtWkuFnMnVnF5A+9fdAjTn8nHHm2wRKTbZKSv/acR89L6eIPBoWBojI9pDn88aof7Z8YkCstp8KXdZY1ew0gE11ewSCYBT+KinwtVK40AKiidql65k1dssTlb68QBEqg8EgTcidV/Dkd35l74wIimNmUA8h5FaOWrpDdDqtDK2lwesxtc67oXQLK6FKeIRRmsSKRy9aw38XgRVCSdRMobdhT8CzSx159j/zZI8j2ketjNlCcIlkUa/SB8CDVDk1auHy3QqD/B8S3EdAkroqqVr7tDHyJK6A7P7tQncFbzTY8uLypC1XvjTnVoNDIagu3LLXG8yRy3DUY4wIVDytkBwZhLZ1KwdeWNwzHfdt6IidznVMLC8UfNpsd3WAkCXsJF9DR0i/iDUK65p47q+6qb27Z1RkR81gFY4KH0kx3t63Vhh9yFO1tuJcTPQEt4yO/AvmDi04dOQa1TBmU77F1wVeOc2lWgg/A3D4GlBQ26N3A0dA6nknUIl3/nHtoedFVwETVOhDVBc= X-Forefront-PRVS: 0214EB3F68 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(24454002)(199003)(189002)(47776003)(189998001)(305945005)(92566002)(23726003)(4326007)(83506001)(3846002)(66066001)(50466002)(33656002)(2906002)(1076002)(1411001)(5660300001)(6116002)(97756001)(6506006)(39060400001)(55016002)(9686003)(229853002)(101416001)(54906002)(25786008)(8676002)(76176999)(50986999)(81166006)(54356999)(42186005)(106356001)(46406003)(6666003)(105586002)(81156014)(6246003)(68736007)(110136004)(38730400002)(7736002)(4001350100001)(97736004)(2950100002)(6916009)(53936002)(42882006)(7099028)(18370500001);DIR:OUT;SFP:1102;SCL:1;SRVR:AM4PR0501MB1969;H:gtest01.arcus;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM4PR0501MB1969;23:8VSTtRp53tVNduW0fdPkP5Mw2cVMD+hftoHH+xP?= =?us-ascii?Q?g4YRuukBigS4Mwn9h9b8BL9dyXB1p1WSNLpHnl1stZzZWesOLAO2DVx0CKiz?= =?us-ascii?Q?gsp73z29jRIa+JwxXWG6ox86r7M/xTOqkevKi+PJSVBfh4ct8Zm2xmVOQi7a?= =?us-ascii?Q?Pd6+0bHVGNfrfSIvPjqWd7xkFanKdhjlf6cY1D5/MktR6QiOc78I/B5BOr+3?= =?us-ascii?Q?d6uaE5+iJ0BWrXRSsZwxgUjBqvSCt5MzQr1qOReoztoidHDe2YfCv6KxhNTq?= =?us-ascii?Q?XrumogmuIw2ASBQaz2nbwQrWoQ0kCEhwwFjRKKFY97RWMJ5wp4YTidtDWDtt?= =?us-ascii?Q?xSjI3wgiH6zsIDLBqxwApL8/zAZDsbKUoyt2Ab3V2KyVN/eCcNaMyPLC/LMe?= =?us-ascii?Q?bSBYwIfHX+KyD0aS++KZsiu/+zLdNDI7Dpx0UD+ucyBXWisPMzTMQu2Rqlm/?= =?us-ascii?Q?Qi3j2U3KtWk/SQ+xzlEvmQDTQQ+vn3bkNpoZM/okTO3wfS69gLEvYVoCZl8/?= =?us-ascii?Q?w1BoJD77xjCNfZTcBesO+jpsRSPT/9x4KMIxoIwzhoWaBnPduhLkGS2BZw/S?= =?us-ascii?Q?m9mqMFLBoVC5SPlrrfvSvRsHSXK5Xng4yDdwh24s7y7g9gjqzFxylZMR1wfE?= =?us-ascii?Q?VY8BHtfrXyeI7qCsGNPCWATOGNTAFGSWN/p/jBOetg6fjp81ooGJgd5Img0k?= =?us-ascii?Q?q6lvW1xl/CxvHd3ZSNl1QHEwRW8EKxxg/jsRTC6aXGwHUnibewP62TMCib7e?= =?us-ascii?Q?lMidnn5nDp8+SZ9ARVX+8IXHcH3xi2pmzHezOcHYWCYatwrNN9OZeeox1Hkl?= =?us-ascii?Q?LzSF3zbVa3vcnpDv/dc839UsOVawdoa7Z41tQ7ATqiE0wvkk/un4S5HU+dDc?= =?us-ascii?Q?I2QKxBWFB+NmLt9SZ/+80kmrtuuSY2TYgnd6/jv+0mMb8x86xqXhdnzNvvRo?= =?us-ascii?Q?g3QwZJvpaWHFabEsyfANFtdUGiLcAM1Ih1q2QFzj/CiQQuXjA8nW461CJvrB?= =?us-ascii?Q?y/nfiV+aLgcZ7RuW5eDSx8lZvww5xD9VN00JI2hYfX4/2nsiv+OIZhrV/66w?= =?us-ascii?Q?xgNPeY/NAa0K1a1HBfHYW79/+b8brFw5mTV3h066QXI+YXYP/uaDxIeKMmlW?= =?us-ascii?Q?L3dwnMmPa2z2tTUFFMfgRLZOE+IdhRi2k9jzLRVcgCMXrtV+NevJ2eOhzzuv?= =?us-ascii?Q?/N6PH0NoPhm/+9NVCPi2XLa5lvtW/+4p+k3iGcuhFeYRatHRLpUCRelOBQy0?= =?us-ascii?Q?9u4S1itbVXn3Qoc7Jk9kMo6rse+4gc1aYWErru3+g7S8zW70JiZtRERw4Emw?= =?us-ascii?Q?KrHJr4wX7dCRXymIJEqCYwHfREjQSckJLYwO7LnS17bTG?= X-Microsoft-Exchange-Diagnostics: 1;AM4PR0501MB1969;6:VpgJsxBvvLiaYVHNhOoFYKGOyERgyVijzn8+N8H3jxber2xSaS2dx3VT58l4LwkZZ6N/APkJQ3OEs7JjTNPd223v/0ePH2syoySVDlRACerxS81eme67dxv5UdCr+yUAzqbehcu5L8s2WCl9LGyW3ZvxuC2qBhl9PwUbD37cS/D0pbpmIE+ikrw9dxsMG6YjbQKRP+ejJhbZwzpc8WjLWqXDiQjG5eIZmdE4y0cC7hLNKjlXuOGiRGpwtr8jj+K27ub3+lxV2R5nWgCRa7Yqqib10RSGCNZBONIsAgOmgAj2CIBDcMX0WQnqO6F2m4gKNSuBSSaxHFiu1jThGAVE/8/i5MQC4gYf6FZYa5wJJ/b2yuwjMMbS9Hm/I6BNYkZkTIovtr+Lh7HWbDiKHBj6yg==;5:aUMQMUYxcmvMtPvIB9iUQqB/om1EAqkqOxvdIpGsgn6v/t51lMOxI7R1R/N1gDOK+Qu1Pj3V+WUKJskxEl3e0RjlW2lnb14NURuhrWF/kgITeuPLGwSL/8z+k1hsZmIRVb2PNDOGSPdO+zTNz49SzAIsGwcsZ/Gl9dcmpDKPSyw=;24:8AJXftM1mPvsXRO0OpvW7vkJk4FHhLbYoeYTo+1cZp3jbyIdZfad7L9unBHuZ2d1oH+KKlo80s8W9cG5iwqWUE0rYl6bjbJ97ulvgsBJVIg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM4PR0501MB1969;7:YQm6uVld45ak5Jyc9Of/+OZRReo5+O4xZT3Y+QlzXpkNhPnUPkv96fhqIX1dknVREtvC44/AC3oKtt1E7gfrhWdJVJiz8LNtYm2SUxP+BDqt2CgK1CRuceltyLcdiivPXLSKeqpT9Sg1oMgzHjhpzOay8ViWSCqFTbjBGAKFGPBuyW9Qv5nKZ96MMuuqsiywL4wMBJt8sPSBkIIs4GPMyNasL5bp6P351bzwdGiVzsC0AJOEIM2PNq6mc9glSjYYLelvb+5Nw22rlEh3vWr5PuWccZW1Bh01G2+I4Vjn0T8GZgBUFwLMRnYRiO1uczAJJlU6r8ZEaTbSEkt0on67DW8sn6bMKUJwqMvvaUDqWLb+1QF5nrX1apj9gJQiva+qWa7/K0+ZI7apdR1YBWYq3DkAIgjyD4NUs6rCWQBfZs56tCb5LhUOZqgOvAkrec0PaL6Jae6Wb9fIzyCRPECBbwAA1FIz0QM/keUSC4adhyblKOZbpSx8y79AIksYk17y77jRCK12D9/i4qlV0/HQJA== X-OriginatorOrg: myri.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2017 03:52:21.4746 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0501MB1969 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 09, 2017 at 11:17:23PM +0100, Philippe Reynes wrote: > The ethtool api {get|set}_settings is deprecated. > We move this driver to new api {get|set}_link_ksettings. > > As I don't have the hardware, I'd be very pleased if > someone may test this patch. Tested using a 2-port NIC. Works fine. Acked-by: Hyong-Youb Kim > > Signed-off-by: Philippe Reynes > --- > drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 23 +++++++++------------ > 1 files changed, 10 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c > index 1139d18..b171ed2 100644 > --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c > +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c > @@ -1610,15 +1610,16 @@ static irqreturn_t myri10ge_intr(int irq, void *arg) > } > > static int > -myri10ge_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) > +myri10ge_get_link_ksettings(struct net_device *netdev, > + struct ethtool_link_ksettings *cmd) > { > struct myri10ge_priv *mgp = netdev_priv(netdev); > char *ptr; > int i; > > - cmd->autoneg = AUTONEG_DISABLE; > - ethtool_cmd_speed_set(cmd, SPEED_10000); > - cmd->duplex = DUPLEX_FULL; > + cmd->base.autoneg = AUTONEG_DISABLE; > + cmd->base.speed = SPEED_10000; > + cmd->base.duplex = DUPLEX_FULL; > > /* > * parse the product code to deterimine the interface type > @@ -1643,16 +1644,12 @@ static irqreturn_t myri10ge_intr(int irq, void *arg) > ptr++; > if (*ptr == 'R' || *ptr == 'Q' || *ptr == 'S') { > /* We've found either an XFP, quad ribbon fiber, or SFP+ */ > - cmd->port = PORT_FIBRE; > - cmd->supported |= SUPPORTED_FIBRE; > - cmd->advertising |= ADVERTISED_FIBRE; > + cmd->base.port = PORT_FIBRE; > + ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE); > + ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE); > } else { > - cmd->port = PORT_OTHER; > + cmd->base.port = PORT_OTHER; > } > - if (*ptr == 'R' || *ptr == 'S') > - cmd->transceiver = XCVR_EXTERNAL; > - else > - cmd->transceiver = XCVR_INTERNAL; > > return 0; > } > @@ -1925,7 +1922,6 @@ static int myri10ge_led(struct myri10ge_priv *mgp, int on) > } > > static const struct ethtool_ops myri10ge_ethtool_ops = { > - .get_settings = myri10ge_get_settings, > .get_drvinfo = myri10ge_get_drvinfo, > .get_coalesce = myri10ge_get_coalesce, > .set_coalesce = myri10ge_set_coalesce, > @@ -1939,6 +1935,7 @@ static int myri10ge_led(struct myri10ge_priv *mgp, int on) > .set_msglevel = myri10ge_set_msglevel, > .get_msglevel = myri10ge_get_msglevel, > .set_phys_id = myri10ge_phys_id, > + .get_link_ksettings = myri10ge_get_link_ksettings, > }; > > static int myri10ge_allocate_rings(struct myri10ge_slice_state *ss) > -- > 1.7.4.4 >