Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3f4d599 authored by stephen hemminger's avatar stephen hemminger Committed by Jeff Kirsher
Browse files

intel: make wired ethernet driver message level consistent (rev2) 



Dan Carpenter noticed that ixgbevf initial default was different than
the rest. But the problem is broader than that, only one Intel driver (ixgb)
was doing it almost right.

The convention for default debug level should be consistent among
Intel drivers and follow established convention.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 52f5509f

drivers/net/ethernet/intel/e1000/e1000_main.c

+3 −2
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver"); 
MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);



static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;

#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)");
@@ -981,7 +982,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
	adapter = netdev_priv(netdev);

	adapter->netdev = netdev;

	adapter->pdev = pdev;

	adapter->msg_enable = (1 << debug) - 1;

	adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);

	adapter->bars = bars;

	adapter->need_ioport = need_ioport;

drivers/net/ethernet/intel/e1000e/netdev.c

+6 −1
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ 
char e1000e_driver_name[] = "e1000e";

const char e1000e_driver_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 void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);



static const struct e1000_info *e1000_info_tbl[] = {
@@ -6172,7 +6177,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
	adapter->hw.adapter = adapter;

	adapter->hw.mac.type = ei->mac;

	adapter->max_hw_frame_size = ei->max_hw_frame_size;

	adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;

	adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);



	mmio_start = pci_resource_start(pdev, 0);

	mmio_len = pci_resource_len(pdev, 0);

drivers/net/ethernet/intel/igb/igb_main.c

+6 −1
Original line number Diff line number Diff line
@@ -238,6 +238,11 @@ MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver"); 
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)");



struct igb_reg_info {

	u32 ofs;

	char *name;
@@ -1893,7 +1898,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
	adapter->pdev = pdev;

	hw = &adapter->hw;

	hw->back = adapter;

	adapter->msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE;

	adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);



	mmio_start = pci_resource_start(pdev, 0);

	mmio_len = pci_resource_len(pdev, 0);

drivers/net/ethernet/intel/igbvf/netdev.c

+6 −1
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ static const char igbvf_driver_string[] = 
static const char igbvf_copyright[] =

		  "Copyright (c) 2009 - 2012 Intel Corporation.";



#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 igbvf_poll(struct napi_struct *napi, int budget);

static void igbvf_reset(struct igbvf_adapter *);

static void igbvf_set_interrupt_capability(struct igbvf_adapter *);
@@ -2649,7 +2654,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, 
	adapter->flags = ei->flags;

	adapter->hw.back = adapter;

	adapter->hw.mac.type = ei->mac;

	adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;

	adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);



	/* PCI config space info */

drivers/net/ethernet/intel/ixgb/ixgb_main.c

+3 −3
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver"); 
MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);



#define DEFAULT_DEBUG_LEVEL_SHIFT 3

static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;

#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)");
@@ -442,7 +442,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adapter->netdev = netdev;

	adapter->pdev = pdev;

	adapter->hw.back = adapter;

	adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);

	adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);



	adapter->hw.hw_addr = pci_ioremap_bar(pdev, BAR_0);

	if (!adapter->hw.hw_addr) {