Module: xenomai-3
Branch: stable-3.0.x
Commit: 3fb574cd1b69487c20f58b56332e0858032c6f21
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=3fb574cd1b69487c20f58b56332e0858032c6f21
Author: Norbert Lange <norbert.la...@andritz.com>
Date: Tue Nov 21 11:57:28 2017 +0100
rtnet/driver: fix compilation of intel drivers
the local debug variable has a name-clash with a identically named
function in arch/x86/include/asm/traps.h
also a macro guard apparently used an outdated name
Signed-off-by: Norbert Lange <norbert.la...@andritz.com>
---
kernel/drivers/net/drivers/e1000/e1000_main.c | 6 +++---
kernel/drivers/net/drivers/eepro100.c | 20 ++++++++++----------
kernel/drivers/net/drivers/igb/igb_main.c | 6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/kernel/drivers/net/drivers/e1000/e1000_main.c
b/kernel/drivers/net/drivers/e1000/e1000_main.c
index 51e9a82..f53207b 100644
--- a/kernel/drivers/net/drivers/e1000/e1000_main.c
+++ b/kernel/drivers/net/drivers/e1000/e1000_main.c
@@ -243,8 +243,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver for
rtnet");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
-static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
-module_param(debug, int, 0);
+static int local_debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+module_param_named(debug, local_debug, int, 0);
MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
@@ -734,7 +734,7 @@ static int e1000_probe(struct pci_dev *pdev,
adapter->netdev = netdev;
adapter->pdev = pdev;
adapter->hw.back = adapter;
- adapter->msg_enable = (1 << debug) - 1;
+ adapter->msg_enable = (1 << local_debug) - 1;
mmio_start = pci_resource_start(pdev, BAR_0);
mmio_len = pci_resource_len(pdev, BAR_0);
diff --git a/kernel/drivers/net/drivers/eepro100.c
b/kernel/drivers/net/drivers/eepro100.c
index 6d54643..11b4cf4 100644
--- a/kernel/drivers/net/drivers/eepro100.c
+++ b/kernel/drivers/net/drivers/eepro100.c
@@ -52,7 +52,7 @@ static int multicast_filter_limit = 64;
e.g. "options=16" for FD, "options=32" for 100mbps-only. */
static int full_duplex[] = {-1, -1, -1, -1, -1, -1, -1, -1};
static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int debug = -1; /* The debug level */
+static int local_debug = -1; /* The debug level */
/* A few values that may be tweaked. */
/* The ring sizes should be a power of two for efficiency. */
@@ -120,7 +120,7 @@ MODULE_PARM_DESC(cards, "array of cards to be supported
(e.g. 1,0,1)");
MODULE_AUTHOR("Maintainer: Jan Kiszka <jan.kis...@web.de>");
MODULE_DESCRIPTION("Intel i82557/i82558/i82559 PCI EtherExpressPro driver");
MODULE_LICENSE("GPL");
-module_param(debug, int, 0444);
+module_param_named(debug, local_debug, int, 0444);
module_param_array(options, int, NULL, 0444);
module_param_array(full_duplex, int, NULL, 0444);
module_param(txfifo, int, 0444);
@@ -1823,14 +1823,14 @@ static struct pci_driver eepro100_driver = {
static int __init eepro100_init_module(void)
{
-#ifdef RTNET_DRV_EEPRO100_DBG
- if (debug >= 0 && speedo_debug != debug)
- printk(KERN_INFO "eepro100.c: Debug level is %d.\n", debug);
- if (debug >= 0)
- speedo_debug = debug;
-#else /* !RTNET_DRV_EEPRO100_DBG */
- debug = speedo_debug; /* touch debug variable */
-#endif /* RTNET_DRV_EEPRO100_DBG */
+#ifdef CONFIG_XENO_DRIVERS_NET_DRV_EEPRO100_DBG
+ if (local_debug >= 0 && speedo_debug != local_debug)
+ printk(KERN_INFO "eepro100.c: Debug level is %d.\n",
local_debug);
+ if (local_debug >= 0)
+ speedo_debug = local_debug;
+#else /* !CONFIG_XENO_DRIVERS_NET_DRV_EEPRO100_DBG */
+ local_debug = speedo_debug; /* touch debug variable */
+#endif /* CONFIG_XENO_DRIVERS_NET_DRV_EEPRO100_DBG */
return pci_register_driver(&eepro100_driver);
}
diff --git a/kernel/drivers/net/drivers/igb/igb_main.c
b/kernel/drivers/net/drivers/igb/igb_main.c
index 06303f5..fe0132b 100644
--- a/kernel/drivers/net/drivers/igb/igb_main.c
+++ b/kernel/drivers/net/drivers/igb/igb_main.c
@@ -277,9 +277,9 @@ MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
-static int debug = -1;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+static int local_debug = -1;
+module_param_named(debug, local_debug, int, 0);
+MODULE_PARM_DESC(debug, "debug level (0=none,...,16=all)");
struct igb_reg_info {
u32 ofs;
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
