diff options
| author | Jakub Kicinski | 2017-02-09 18:17:28 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-02-10 21:52:24 +0100 |
| commit | 2633beb99b81f4dd005f99aabd98c8afa056c528 (patch) | |
| tree | d3ce7dfa67f60ef2c7a521373d43a4f2298bbf43 /drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | |
| parent | bitfield.h: add FIELD_FIT() helper (diff) | |
| download | kernel-qcow2-linux-2633beb99b81f4dd005f99aabd98c8afa056c528.tar.gz kernel-qcow2-linux-2633beb99b81f4dd005f99aabd98c8afa056c528.tar.xz kernel-qcow2-linux-2633beb99b81f4dd005f99aabd98c8afa056c528.zip | |
nfp: rename the driver and add new main file
Support for the PF driver is about to be added and will share
much of the code. When the VF driver was added we planned to
maintain the PF driver as a separate module but have decided
that for our simple use case just maintaining a single module
is more reasonable. Rename the driver to just "nfp" and update
the Kconfig.
While at it remove latent references to NFP3200.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index 1b26e9646574..255f30252550 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Netronome Systems, Inc. + * Copyright (C) 2015-2017 Netronome Systems, Inc. * * This software is dual licensed under the GNU General License Version 2, * June 1991 as shown in the file COPYING in the top-level directory of this @@ -132,9 +132,9 @@ static void nfp_net_get_drvinfo(struct net_device *netdev, { struct nfp_net *nn = netdev_priv(netdev); - strlcpy(drvinfo->driver, nfp_net_driver_name, sizeof(drvinfo->driver)); - strlcpy(drvinfo->version, nfp_net_driver_version, - sizeof(drvinfo->version)); + strlcpy(drvinfo->driver, nn->pdev->driver->name, + sizeof(drvinfo->driver)); + strlcpy(drvinfo->version, nfp_driver_version, sizeof(drvinfo->version)); snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d.%d", |