On Sunday 03 February 2008, Andrew Morton wrote:
> On Sun, 13 Jan 2008 15:16:34 +0100 Helge Deller <deller@xxxxxx> wrote:
>
> > Convert optional struct size checks to non-optional compile-time checks.
> > Furthermore BUILD_BUG_ON() which will be optimized away by the compiler.
> >
> > Signed-off-by: Helge Deller <deller@xxxxxx>
> >
> > wavelan.c | 34 +++++-----------------------------
> > wavelan.p.h | 1 -
> > wavelan_cs.c | 33 ++++-----------------------------
> > wavelan_cs.p.h | 1 -
> > 4 files changed, 9 insertions(+), 60 deletions(-)
> >
> > diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
> > index a1f8a16..ffe50e2 100644
> > --- a/drivers/net/wireless/wavelan.c
> > +++ b/drivers/net/wireless/wavelan.c
> > @@ -49,27 +49,6 @@ static int __init wv_psa_to_irq(u8 irqval)
> > return -1;
> > }
> >
> > -#ifdef STRUCT_CHECK
> > -/*------------------------------------------------------------------*/
> > -/*
> > - * Sanity routine to verify the sizes of the various WaveLAN interface
> > - * structures.
> > - */
> > -static char *wv_struct_check(void)
> > -{
> > -#define SC(t,s,n) if (sizeof(t) != s) return(n);
> > -
> > - SC(psa_t, PSA_SIZE, "psa_t");
> > - SC(mmw_t, MMW_SIZE, "mmw_t");
> > - SC(mmr_t, MMR_SIZE, "mmr_t");
> > - SC(ha_t, HA_SIZE, "ha_t");
> > -
> > -#undef SC
> > -
> > - return ((char *) NULL);
> > -} /* wv_struct_check */
> > -#endif /* STRUCT_CHECK */
> > -
> > /********************* HOST ADAPTER SUBROUTINES *********************/
> > /*
> > * Useful subroutines to manage the WaveLAN ISA interface
> > @@ -4215,14 +4194,11 @@ struct net_device * __init wavelan_probe(int unit)
> > int i;
> > int r = 0;
> >
> > -#ifdef STRUCT_CHECK
> > - if (wv_struct_check() != (char *) NULL) {
> > - printk(KERN_WARNING
> > - "%s: wavelan_probe(): structure/compiler botch: \"%s\"\n",
> > - dev->name, wv_struct_check());
> > - return -ENODEV;
> > - }
> > -#endif /* STRUCT_CHECK */
> > + /* compile-time check the sizes of structures */
> > + BUILD_BUG_ON(sizeof(psa_t) != PSA_SIZE);
> > + BUILD_BUG_ON(sizeof(mmw_t) != MMW_SIZE);
>
> This assertion is now triggering with arm allmodconfig.
>
> Rafael, please track this as a post-2.6.24 regression.
Hello Andrew,
with which arm platform did you found this assertion to trigger ?
I tried a few (e.g. ARM-poodle and CONFIG_ARCH_SA1100 w/ISA) but didn't saw it breaking.
Maybe you could send me you .config file ?
Helge
PS: I tried Linus' current git tree which now includes my patch above as well.
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
