From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 27 May 2005 19:11:41 +0000 (+0200)
Subject: [PATCH] r8169: identify the napi version
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~38555^2~36^2~53^2~7^2^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f7ccf420e5d5553d2cb25d21f8bb77e7747f1c35;p=mirror_ubuntu-zesty-kernel.git

[PATCH] r8169: identify the napi version

To tell if driver is configured for NAPI or not, put -NAPI on driver
version. Remove the NAPI printk since the complete version information
is displayed once in the pci probe routine or returned via ethtool.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 0f1f81b50c4a..e9592f523507 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -69,7 +69,13 @@ VERSION 2.2LK	<2005/01/25>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#define RTL8169_VERSION "2.2LK"
+#ifdef CONFIG_R8169_NAPI
+#define NAPI_SUFFIX	"-NAPI"
+#else
+#define NAPI_SUFFIX	""
+#endif
+
+#define RTL8169_VERSION "2.2LK" NAPI_SUFFIX
 #define MODULENAME "r8169"
 #define PFX MODULENAME ": "
 
@@ -1367,7 +1373,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef CONFIG_R8169_NAPI
 	dev->poll = rtl8169_poll;
 	dev->weight = R8169_NAPI_WEIGHT;
-	printk(KERN_INFO PFX "NAPI enabled\n");
 #endif
 
 #ifdef CONFIG_R8169_VLAN