Re: [PATCH] intel: make wired ethernet driver message level consistent

Jeff Kirsher
2012-03-11T09:57:16Z

[-- Attachment #1: Type: text/plain, Size: 2057 bytes --]

On Sat, 2012-03-10 at 16:44 -0800, Stephen Hemminger wrote:
> On Sun, 11 Mar 2012 00:38:57 +0000
> Ben Hutchings <bhutchings@solarflare.com> wrote:
>
> > On Sat, 2012-03-10 at 16:01 -0800, Stephen Hemminger wrote:
> > > 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 right.
> > >
> > > The convention for default debug level should be consistent among
> > > Intel drivers and follow established convention.
> > [...]
> > > --- a/drivers/net/ethernet/intel/e1000/e1000_main.c 2012-02-27 08:43:02.348936997 -0800
> > > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c 2012-03-10 15:50:57.199452804 -0800
> > > @@ -215,7 +215,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/1000 Ne
> > > MODULE_LICENSE("GPL");
> > > MODULE_VERSION(DRV_VERSION);
> > >
> > > -static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
> > > +#define DEFAULT_DEBUG_LEVEL_SHIFT 3
> >
> > Wonder if this should really be 2 (enable DRV and PROBE) or 3 (enable
> > DRV, PROBE and LINK; equivalent to current behaviour)?
>
> That is really up to intel, the link up/down is useful, but nuisance
> with lots of devices.
>
> > > +static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;
> > > module_param(debug, int, 0);
> > > MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
> > >
> > > @@ -979,7 +980,7 @@ static int __devinit e1000_probe(struct
> > > adapter = netdev_priv(netdev);
> > > adapter->netdev = netdev;
> > > adapter->pdev = pdev;
> > > - adapter->msg_enable = (1 << debug) - 1;
> > > + adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
> > [...]
> >
> > This works, but not the way you intended. The first parameter is
> > supposed to be a module parameter with a default of -1. The second
> > parameter is supposed to be the bitmask to use when that default is not
> > overridden.
>
> I'll fix that.
>
>

Stephen, I await you updated patch with the fix, thanks!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]