Re: kern/48343: patch for re(4) to change link address of 8111E_VL

[Takahiro HAYASHI <t-hash%abox3.so-net.ne.jp@localhost>]

The following reply was made to PR kern/48343; it has been noted by GNATS.

From: Takahiro HAYASHI <t-hash%abox3.so-net.ne.jp@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: kern-bug-people%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, 
netbsd-bugs%netbsd.org@localhost
Subject: Re: kern/48343: patch for re(4) to change link address of 8111E_VL
Date: Sun, 10 Nov 2013 01:14:57 +0900

 Sorry, KASSERT condition was inverted.
 I simply replaced BUG_ON() macro and did not test with DIAGNOSTIC.
 
 --- etc/remac.diff.orig        2013-10-15 20:02:02.000000000 +0900
 +++ etc/remac.diff     2013-11-09 19:54:19.000000000 +0900
 @@ -37,7 +37,7 @@
  +re_eri_write(struct rtk_softc *sc, int addr, uint32_t mask,
  +                       uint32_t val, int type)
  +{
 -+     KASSERT((addr & 3) || (mask == 0));
 ++     KASSERT(!((addr & 3) || (mask == 0)));
  +     CSR_WRITE_4(sc, RTK_ERIDR, val);
  +     CSR_WRITE_4(sc, RTK_ERIAR, RTK_ERIAR_WRITE_CMD | type | mask | addr);
  +
 
 --
 t-hash