Re: [PATCH v5 8/8] ax.25: x.25: Remove the now superfluous sentinel elements from ctl_table array

Joel Granados
2024-04-29T10:19:55Z

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

On Sat, Apr 27, 2024 at 10:14:36AM +0200, Sabrina Dubroca wrote:
> 2024-04-26, 12:47:00 +0200, Joel Granados via B4 Relay wrote:
> > diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c
> > index c4f8adbf8144..8f385d2a7628 100644
> > --- a/net/ax25/ax25_ds_timer.c
> > +++ b/net/ax25/ax25_ds_timer.c
> > @@ -49,12 +49,16 @@ void ax25_ds_del_timer(ax25_dev *ax25_dev)
> >
> > void ax25_ds_set_timer(ax25_dev *ax25_dev)
> > {
> > +#ifdef CONFIG_AX25_DAMA_SLAVE
>
> Is this really needed? Looks like this file is only compiled when this
> config is set:
>
> grep ax25_ds_timer net/ax25/Makefile
> ax25-$(CONFIG_AX25_DAMA_SLAVE) += ax25_ds_in.o ax25_ds_subr.o ax25_ds_timer.o
Good point. I had missed this detail when addressing
https://lore.kernel.org/oe-kbuild-all/202404040301.qzKmVQGB-lkp@intel.com/.
Thx for pointing it out. I'll remove the guards for V6.

Best

>
>
> > if (ax25_dev == NULL) /* paranoia */
> > return;
> >
> > ax25_dev->dama.slave_timeout =
> > msecs_to_jiffies(ax25_dev->values[AX25_VALUES_DS_TIMEOUT]) / 10;
> > mod_timer(&ax25_dev->dama.slave_timer, jiffies + HZ);
> > +#else
> > + return;
> > +#endif
> > }
>
> --
> Sabrina
>

--

Joel Granados

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]