Skip to content

Commit 49cad93

Browse files
Philippe Reynesdavem330
Philippe Reynes
authored and
davem330
committed
net: chelsio: cxgb2: 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. Signed-off-by: Philippe Reynes <tremyfr@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 6219d05 commit 49cad93

File tree

1 file changed

+37
-27
lines changed
  • drivers/net/ethernet/chelsio/cxgb

1 file changed

+37
-27
lines changed

‎drivers/net/ethernet/chelsio/cxgb/cxgb2.c

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -568,28 +568,33 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
568568
reg_block_dump(ap, buf, A_MC5_CONFIG, A_MC5_MASK_WRITE_CMD);
569569
}
570570

571-
static int get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
571+
static int get_link_ksettings(struct net_device *dev,
572+
struct ethtool_link_ksettings *cmd)
572573
{
573574
struct adapter *adapter = dev->ml_priv;
574575
struct port_info *p = &adapter->port[dev->if_port];
576+
u32 supported, advertising;
575577

576-
cmd->supported = p->link_config.supported;
577-
cmd->advertising = p->link_config.advertising;
578+
supported = p->link_config.supported;
579+
advertising = p->link_config.advertising;
578580

579581
if (netif_carrier_ok(dev)) {
580-
ethtool_cmd_speed_set(cmd, p->link_config.speed);
581-
cmd->duplex = p->link_config.duplex;
582+
cmd->base.speed = p->link_config.speed;
583+
cmd->base.duplex = p->link_config.duplex;
582584
} else {
583-
ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);
584-
cmd->duplex = DUPLEX_UNKNOWN;
585+
cmd->base.speed = SPEED_UNKNOWN;
586+
cmd->base.duplex = DUPLEX_UNKNOWN;
585587
}
586588

587-
cmd->port = (cmd->supported & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
588-
cmd->phy_address = p->phy->mdio.prtad;
589-
cmd->transceiver = XCVR_EXTERNAL;
590-
cmd->autoneg = p->link_config.autoneg;
591-
cmd->maxtxpkt = 0;
592-
cmd->maxrxpkt = 0;
589+
cmd->base.port = (supported & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
590+
cmd->base.phy_address = p->phy->mdio.prtad;
591+
cmd->base.autoneg = p->link_config.autoneg;
592+
593+
ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
594+
supported);
595+
ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,
596+
advertising);
597+
593598
return 0;
594599
}
595600

@@ -628,36 +633,41 @@ static int speed_duplex_to_caps(int speed, int duplex)
628633
ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full | \
629634
ADVERTISED_10000baseT_Full)
630635

631-
static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
636+
static int set_link_ksettings(struct net_device *dev,
637+
const struct ethtool_link_ksettings *cmd)
632638
{
633639
struct adapter *adapter = dev->ml_priv;
634640
struct port_info *p = &adapter->port[dev->if_port];
635641
struct link_config *lc = &p->link_config;
642+
u32 advertising;
643+
644+
ethtool_convert_link_mode_to_legacy_u32(&advertising,
645+
cmd->link_modes.advertising);
636646

637647
if (!(lc->supported & SUPPORTED_Autoneg))
638648
return -EOPNOTSUPP; /* can't change speed/duplex */
639649

640-
if (cmd->autoneg == AUTONEG_DISABLE) {
641-
u32 speed = ethtool_cmd_speed(cmd);
642-
int cap = speed_duplex_to_caps(speed, cmd->duplex);
650+
if (cmd->base.autoneg == AUTONEG_DISABLE) {
651+
u32 speed = cmd->base.speed;
652+
int cap = speed_duplex_to_caps(speed, cmd->base.duplex);
643653

644654
if (!(lc->supported & cap) || (speed == SPEED_1000))
645655
return -EINVAL;
646656
lc->requested_speed = speed;
647-
lc->requested_duplex = cmd->duplex;
657+
lc->requested_duplex = cmd->base.duplex;
648658
lc->advertising = 0;
649659
} else {
650-
cmd->advertising &= ADVERTISED_MASK;
651-
if (cmd->advertising & (cmd->advertising - 1))
652-
cmd->advertising = lc->supported;
653-
cmd->advertising &= lc->supported;
654-
if (!cmd->advertising)
660+
advertising &= ADVERTISED_MASK;
661+
if (advertising & (advertising - 1))
662+
advertising = lc->supported;
663+
advertising &= lc->supported;
664+
if (!advertising)
655665
return -EINVAL;
656666
lc->requested_speed = SPEED_INVALID;
657667
lc->requested_duplex = DUPLEX_INVALID;
658-
lc->advertising = cmd->advertising | ADVERTISED_Autoneg;
668+
lc->advertising = advertising | ADVERTISED_Autoneg;
659669
}
660-
lc->autoneg = cmd->autoneg;
670+
lc->autoneg = cmd->base.autoneg;
661671
if (netif_running(dev))
662672
t1_link_start(p->phy, p->mac, lc);
663673
return 0;
@@ -788,8 +798,6 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
788798
}
789799

790800
static const struct ethtool_ops t1_ethtool_ops = {
791-
.get_settings = get_settings,
792-
.set_settings = set_settings,
793801
.get_drvinfo = get_drvinfo,
794802
.get_msglevel = get_msglevel,
795803
.set_msglevel = set_msglevel,
@@ -807,6 +815,8 @@ static const struct ethtool_ops t1_ethtool_ops = {
807815
.get_ethtool_stats = get_stats,
808816
.get_regs_len = get_regs_len,
809817
.get_regs = get_regs,
818+
.get_link_ksettings = get_link_ksettings,
819+
.set_link_ksettings = set_link_ksettings,
810820
};
811821

812822
static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)

0 commit comments

Comments
 (0)