ionic: use offset for ethtool regs data
authorShannon Nelson <snelson@pensando.io>
Mon, 20 Jul 2020 23:00:13 +0000 (16:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jul 2020 01:09:38 +0000 (18:09 -0700)
Use an offset to write the second half of the regs data into the
second half of the buffer instead of overwriting the first half.

Fixes: 4d03e00a2140 ("ionic: Add initial ethtool support")
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c

index e03ea9b..0955619 100644 (file)
@@ -103,15 +103,18 @@ static void ionic_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
                           void *p)
 {
        struct ionic_lif *lif = netdev_priv(netdev);
+       unsigned int offset;
        unsigned int size;
 
        regs->version = IONIC_DEV_CMD_REG_VERSION;
 
+       offset = 0;
        size = IONIC_DEV_INFO_REG_COUNT * sizeof(u32);
-       memcpy_fromio(p, lif->ionic->idev.dev_info_regs->words, size);
+       memcpy_fromio(p + offset, lif->ionic->idev.dev_info_regs->words, size);
 
+       offset += size;
        size = IONIC_DEV_CMD_REG_COUNT * sizeof(u32);
-       memcpy_fromio(p, lif->ionic->idev.dev_cmd_regs->words, size);
+       memcpy_fromio(p + offset, lif->ionic->idev.dev_cmd_regs->words, size);
 }
 
 static int ionic_get_link_ksettings(struct net_device *netdev,