net: s390: qeth: use new api ethtool_{get|set}_link_ksettings

PATCH In review Philippe Reynes 2 participants 2 messages Mar 26, 2017 – Mar 27, 2017

Subsystems (3)

Network drivers s390 s390 network drivers

lore

Share & tools

lore

Philippe Reynes

author

2017-03-26 13:27 UTC #0 lore raw

PATCH 1/1 net: s390: qeth: use new api ethtool_{get|set}_link_ksettings

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.

Signed-off-by Philippe Reynes <[email protected]>

---
 drivers/s390/net/qeth_core.h      |    3 +-
 drivers/s390/net/qeth_core_main.c |   45 ++++++++++++++++++++----------------
 drivers/s390/net/qeth_l2_main.c   |    2 +-
 drivers/s390/net/qeth_l3_main.c   |    2 +-
 4 files changed, 29 insertions(+), 23 deletions(-)

drivers/s390/net/qeth_core.h +2 -1

index e7addea..5da0319 100644
@@ -973,7 +973,8 @@ void qeth_core_get_ethtool_stats(struct net_device *,
 void qeth_core_get_strings(struct net_device *, u32, u8 *);
 void qeth_core_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
 void qeth_dbf_longtext(debug_info_t *id, int level, char *text, ...);
-int qeth_core_ethtool_get_settings(struct net_device *, struct ethtool_cmd *);
+int qeth_core_ethtool_get_link_ksettings(struct net_device *netdev,
+					 struct ethtool_link_ksettings *ecmd);
 int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback);
 int qeth_hdr_chk_and_bounce(struct sk_buff *, struct qeth_hdr **, int);
 int qeth_configure_cq(struct qeth_card *, enum qeth_cq);

drivers/s390/net/qeth_core_main.c +25 ~~-20~~

121 lines not on this page · raw message

drivers/s390/net/qeth_l2_main.c +1 -1

index bea4833..55b3ca1 100644
@@ -1042,7 +1042,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)
 	.get_ethtool_stats = qeth_core_get_ethtool_stats,
 	.get_sset_count = qeth_core_get_sset_count,
 	.get_drvinfo = qeth_core_get_drvinfo,
-	.get_settings = qeth_core_ethtool_get_settings,
+	.get_link_ksettings = qeth_core_ethtool_get_link_ksettings,
 };
 
 static const struct ethtool_ops qeth_l2_osn_ops = {

drivers/s390/net/qeth_l3_main.c +1 -1

index 06d0add..63e6ae9 100644
@@ -3032,7 +3032,7 @@ static int qeth_l3_stop(struct net_device *dev)
 	.get_ethtool_stats = qeth_core_get_ethtool_stats,
 	.get_sset_count = qeth_core_get_sset_count,
 	.get_drvinfo = qeth_core_get_drvinfo,
-	.get_settings = qeth_core_ethtool_get_settings,
+	.get_link_ksettings = qeth_core_ethtool_get_link_ksettings,
 };
 
 /*

Signature · 1 line

1.7.4.4

Julian Wiedmann

2017-03-27 13:56 UTC #1 lore raw

Quoted 8 lines · Philippe Reynes

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.
Signed-off-by Philippe Reynes <[email protected]>
---

Hello Philippe,

thank you for the patch! Unfortunately I queued up pretty much the same change to our internal repo just last week... should be going upstream with our next patch series. Sorry for the duplicated effort.

Regards,
Julian