[src/trunk]: src/sys/dev/pci move declaration to #ifdef WM_DEBUG block as opp...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c73bf24c45c2
branches:  trunk
changeset: 820933:c73bf24c45c2
user:      maya <maya%NetBSD.org@localhost>
date:      Mon Jan 16 09:58:04 2017 +0000

description:
move declaration to #ifdef WM_DEBUG block as opposed to using __debugused
fixes build with DEBUG but without WM_DEBUG

ok martin

diffstat:

 sys/dev/pci/if_wm.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 9b9658940297 -r c73bf24c45c2 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Mon Jan 16 09:39:26 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Jan 16 09:58:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.467 2017/01/16 00:14:04 knakahara Exp $    */
+/*     $NetBSD: if_wm.c,v 1.468 2017/01/16 09:58:04 maya Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.467 2017/01/16 00:14:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.468 2017/01/16 09:58:04 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -7693,8 +7693,6 @@
        int count = 0;
        uint32_t status, errors;
        uint16_t vlantag;
-       uint32_t rsshash __debugused;
-       uint8_t rsstype  __debugused;
 
        KASSERT(mutex_owned(rxq->rxq_lock));
 
@@ -7711,8 +7709,8 @@
                len = le16toh(wm_rxdesc_get_pktlen(rxq, i));
                vlantag = wm_rxdesc_get_vlantag(rxq, i);
 #ifdef WM_DEBUG
-               rsshash = wm_rxdesc_get_rsshash(rxq, i);
-               rsstype = wm_rxdesc_get_rsstype(rxq, i);
+               uint32_t rsshash = wm_rxdesc_get_rsshash(rxq, i);
+               uint8_t rsstype = wm_rxdesc_get_rsstype(rxq, i);
 #endif
 
                if (!wm_rxdesc_dd(rxq, i, status))