On Wed, 2016-08-31 at 10:48 -0700, Joe Perches wrote: > < sigh > Comment these tests out. > > These are just too enticing to people that don't verify that > both source and dest addresses really must be __aligned(2). > > It helps make Dan Carpenter happy too.
Having just been snagged by this it will make me happy too. - Greg > > Signed-off-by: Joe Perches <[email protected]> > cc: Dan Carpenter <[email protected]> > --- > scripts/checkpatch.pl | 70 > +++++++++++++++++++++++++-------------------------- > 1 file changed, 35 insertions(+), 35 deletions(-) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index bdc12d9..3f7245c 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -5568,46 +5568,46 @@ sub process { > } > > # Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, > bar) > - if ($^V && $^V ge 5.10.0 && > - defined $stat && > - $stat =~ > /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { > - if (WARN("PREFER_ETHER_ADDR_COPY", > - "Prefer ether_addr_copy() over memcpy() if the > Ethernet addresses are __aligned(2)\n" . "$here\n$stat\n") && > - $fix) { > - $fixed[$fixlinenr] =~ > s/\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/ether_addr_copy($2, > $7)/; > - } > - } > +# if ($^V && $^V ge 5.10.0 && > +# defined $stat && > +# $stat =~ > /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { > +# if (WARN("PREFER_ETHER_ADDR_COPY", > +# "Prefer ether_addr_copy() over memcpy() if the > Ethernet addresses are __aligned(2)\n" . "$here\n$stat\n") && > +# $fix) { > +# $fixed[$fixlinenr] =~ > s/\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/ether_addr_copy($2, > $7)/; > +# } > +# } > > # Check for memcmp(foo, bar, ETH_ALEN) that could be ether_addr_equal*(foo, > bar) > - if ($^V && $^V ge 5.10.0 && > - defined $stat && > - $stat =~ > /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { > - WARN("PREFER_ETHER_ADDR_EQUAL", > - "Prefer ether_addr_equal() or > ether_addr_equal_unaligned() over memcmp()\n" . "$here\n$stat\n") > - } > +# if ($^V && $^V ge 5.10.0 && > +# defined $stat && > +# $stat =~ > /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { > +# WARN("PREFER_ETHER_ADDR_EQUAL", > +# "Prefer ether_addr_equal() or > ether_addr_equal_unaligned() over memcmp()\n" . "$here\n$stat\n") > +# } > > # check for memset(foo, 0x0, ETH_ALEN) that could be eth_zero_addr > # check for memset(foo, 0xFF, ETH_ALEN) that could be eth_broadcast_addr > - if ($^V && $^V ge 5.10.0 && > - defined $stat && > - $stat =~ > /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { > - > - my $ms_val = $7; > - > - if ($ms_val =~ /^(?:0x|)0+$/i) { > - if (WARN("PREFER_ETH_ZERO_ADDR", > - "Prefer eth_zero_addr over memset()\n" > . "$here\n$stat\n") && > - $fix) { > - $fixed[$fixlinenr] =~ > s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*,\s*ETH_ALEN\s*\)/eth_zero_addr($2)/; > - } > - } elsif ($ms_val =~ /^(?:0xff|255)$/i) { > - if (WARN("PREFER_ETH_BROADCAST_ADDR", > - "Prefer eth_broadcast_addr() over > memset()\n" . "$here\n$stat\n") && > - $fix) { > - $fixed[$fixlinenr] =~ > s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*,\s*ETH_ALEN\s*\)/eth_broadcast_addr($2)/; > - } > - } > - } > +# if ($^V && $^V ge 5.10.0 && > +# defined $stat && > +# $stat =~ > /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) { > +# > +# my $ms_val = $7; > +# > +# if ($ms_val =~ /^(?:0x|)0+$/i) { > +# if (WARN("PREFER_ETH_ZERO_ADDR", > +# "Prefer eth_zero_addr over memset()\n" > . "$here\n$stat\n") && > +# $fix) { > +# $fixed[$fixlinenr] =~ > s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*,\s*ETH_ALEN\s*\)/eth_zero_addr($2)/; > +# } > +# } elsif ($ms_val =~ /^(?:0xff|255)$/i) { > +# if (WARN("PREFER_ETH_BROADCAST_ADDR", > +# "Prefer eth_broadcast_addr() over > memset()\n" . "$here\n$stat\n") && > +# $fix) { > +# $fixed[$fixlinenr] =~ > s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*,\s*ETH_ALEN\s*\)/eth_broadcast_addr($2)/; > +# } > +# } > +# } > > # typecasts on min/max could be min_t/max_t > if ($^V && $^V ge 5.10.0 &&
