diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2005-05-27 15:11:41 -0400 |
---|---|---|
committer | Francois Romieu <romieu@fr.zoreil.com> | 2005-05-27 15:11:41 -0400 |
commit | f7ccf420e5d5553d2cb25d21f8bb77e7747f1c35 (patch) | |
tree | d532a80b9238d9c28b02c78816cc8cb108ddb274 | |
parent | 53456f607a7ec02905823dc92a94c7e36d4ded1a (diff) |
[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>
-rw-r--r-- | drivers/net/r8169.c | 9 |
1 files changed, 7 insertions, 2 deletions
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> | |||
69 | #include <asm/io.h> | 69 | #include <asm/io.h> |
70 | #include <asm/irq.h> | 70 | #include <asm/irq.h> |
71 | 71 | ||
72 | #define RTL8169_VERSION "2.2LK" | 72 | #ifdef CONFIG_R8169_NAPI |
73 | #define NAPI_SUFFIX "-NAPI" | ||
74 | #else | ||
75 | #define NAPI_SUFFIX "" | ||
76 | #endif | ||
77 | |||
78 | #define RTL8169_VERSION "2.2LK" NAPI_SUFFIX | ||
73 | #define MODULENAME "r8169" | 79 | #define MODULENAME "r8169" |
74 | #define PFX MODULENAME ": " | 80 | #define PFX MODULENAME ": " |
75 | 81 | ||
@@ -1367,7 +1373,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1367 | #ifdef CONFIG_R8169_NAPI | 1373 | #ifdef CONFIG_R8169_NAPI |
1368 | dev->poll = rtl8169_poll; | 1374 | dev->poll = rtl8169_poll; |
1369 | dev->weight = R8169_NAPI_WEIGHT; | 1375 | dev->weight = R8169_NAPI_WEIGHT; |
1370 | printk(KERN_INFO PFX "NAPI enabled\n"); | ||
1371 | #endif | 1376 | #endif |
1372 | 1377 | ||
1373 | #ifdef CONFIG_R8169_VLAN | 1378 | #ifdef CONFIG_R8169_VLAN |