Commit 948c251b authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: octeon-ethernet: eliminate OCTEON_ETHERNET_VERSION

This driver has drifted away from out-of-tree versions years ago
and the version string does not provide any useful information.
Instead provide the kernel version string to ethtool, so that we get
useful version information e.g. for bug reports.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c93b0e75
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
#include <asm/octeon/cvmx-config.h> #include <asm/octeon/cvmx-config.h>
#define OCTEON_ETHERNET_VERSION "1.9"
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
#define REUSE_SKBUFFS_WITHOUT_FREE 0 #define REUSE_SKBUFFS_WITHOUT_FREE 0
#else #else
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <generated/utsrelease.h>
#include <net/dst.h> #include <net/dst.h>
#include <asm/octeon/octeon.h> #include <asm/octeon/octeon.h>
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
static void cvm_oct_get_drvinfo(struct net_device *dev, static void cvm_oct_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
strlcpy(info->driver, "cavium-ethernet", sizeof(info->driver)); strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
strlcpy(info->version, OCTEON_ETHERNET_VERSION, sizeof(info->version)); strlcpy(info->version, UTS_RELEASE, sizeof(info->version));
strlcpy(info->bus_info, "Builtin", sizeof(info->bus_info)); strlcpy(info->bus_info, "Builtin", sizeof(info->bus_info));
} }
......
...@@ -681,7 +681,6 @@ static int cvm_oct_probe(struct platform_device *pdev) ...@@ -681,7 +681,6 @@ static int cvm_oct_probe(struct platform_device *pdev)
struct device_node *pip; struct device_node *pip;
octeon_mdiobus_force_mod_depencency(); octeon_mdiobus_force_mod_depencency();
pr_notice("cavium-ethernet %s\n", OCTEON_ETHERNET_VERSION);
pip = pdev->dev.of_node; pip = pdev->dev.of_node;
if (!pip) { if (!pip) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment