Tue Mar 19 16:49:12 2013 UTC ()
Fix compile error if BGE_DEBUG is set.


(msaitoh)
diff -r1.220 -r1.221 src/sys/dev/pci/if_bge.c
cvs diff -r1.220 -r1.221 src/sys/dev/pci/if_bge.c (expand / switch to unified diff)

--- src/sys/dev/pci/if_bge.c 2013/03/19 04:10:13 1.220
+++ src/sys/dev/pci/if_bge.c 2013/03/19 16:49:11 1.221
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_bge.c,v 1.220 2013/03/19 04:10:13 msaitoh Exp $ */ 1/* $NetBSD: if_bge.c,v 1.221 2013/03/19 16:49:11 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Wind River Systems 4 * Copyright (c) 2001 Wind River Systems
5 * Copyright (c) 1997, 1998, 1999, 2001 5 * Copyright (c) 1997, 1998, 1999, 2001
6 * Bill Paul <wpaul@windriver.com>. All rights reserved. 6 * Bill Paul <wpaul@windriver.com>. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -69,27 +69,27 @@ @@ -69,27 +69,27 @@
69 * does not support external SSRAM. 69 * does not support external SSRAM.
70 * 70 *
71 * Broadcom also produces a variation of the BCM5700 under the "Altima" 71 * Broadcom also produces a variation of the BCM5700 under the "Altima"
72 * brand name, which is functionally similar but lacks PCI-X support. 72 * brand name, which is functionally similar but lacks PCI-X support.
73 * 73 *
74 * Without external SSRAM, you can only have at most 4 TX rings, 74 * Without external SSRAM, you can only have at most 4 TX rings,
75 * and the use of the mini RX ring is disabled. This seems to imply 75 * and the use of the mini RX ring is disabled. This seems to imply
76 * that these features are simply not available on the BCM5701. As a 76 * that these features are simply not available on the BCM5701. As a
77 * result, this driver does not implement any support for the mini RX 77 * result, this driver does not implement any support for the mini RX
78 * ring. 78 * ring.
79 */ 79 */
80 80
81#include <sys/cdefs.h> 81#include <sys/cdefs.h>
82__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.220 2013/03/19 04:10:13 msaitoh Exp $"); 82__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.221 2013/03/19 16:49:11 msaitoh Exp $");
83 83
84#include "vlan.h" 84#include "vlan.h"
85 85
86#include <sys/param.h> 86#include <sys/param.h>
87#include <sys/systm.h> 87#include <sys/systm.h>
88#include <sys/callout.h> 88#include <sys/callout.h>
89#include <sys/sockio.h> 89#include <sys/sockio.h>
90#include <sys/mbuf.h> 90#include <sys/mbuf.h>
91#include <sys/malloc.h> 91#include <sys/malloc.h>
92#include <sys/kernel.h> 92#include <sys/kernel.h>
93#include <sys/device.h> 93#include <sys/device.h>
94#include <sys/socket.h> 94#include <sys/socket.h>
95#include <sys/sysctl.h> 95#include <sys/sysctl.h>
@@ -5684,27 +5684,27 @@ bge_debug_info(struct bge_softc *sc) @@ -5684,27 +5684,27 @@ bge_debug_info(struct bge_softc *sc)
5684 if (sc->bge_flags & BGE_TSO) 5684 if (sc->bge_flags & BGE_TSO)
5685 printf(" - TSO\n"); 5685 printf(" - TSO\n");
5686 5686
5687 if (sc->bge_flags & BGE_PHY_NO_3LED) 5687 if (sc->bge_flags & BGE_PHY_NO_3LED)
5688 printf(" - No 3 LEDs\n"); 5688 printf(" - No 3 LEDs\n");
5689 if (sc->bge_flags & BGE_PHY_CRC_BUG) 5689 if (sc->bge_flags & BGE_PHY_CRC_BUG)
5690 printf(" - CRC bug\n"); 5690 printf(" - CRC bug\n");
5691 if (sc->bge_flags & BGE_PHY_ADC_BUG) 5691 if (sc->bge_flags & BGE_PHY_ADC_BUG)
5692 printf(" - ADC bug\n"); 5692 printf(" - ADC bug\n");
5693 if (sc->bge_flags & BGE_PHY_5704_A0_BUG) 5693 if (sc->bge_flags & BGE_PHY_5704_A0_BUG)
5694 printf(" - 5704 A0 bug\n"); 5694 printf(" - 5704 A0 bug\n");
5695 if (sc->bge_flags & BGE_PHY_JITTER_BUG) 5695 if (sc->bge_flags & BGE_PHY_JITTER_BUG)
5696 printf(" - jitter bug\n"); 5696 printf(" - jitter bug\n");
5697 if (sc->bge_flags & BGE_PHY_BER_BGU) 5697 if (sc->bge_flags & BGE_PHY_BER_BUG)
5698 printf(" - BER bug\n"); 5698 printf(" - BER bug\n");
5699 if (sc->bge_flags & BGE_PHY_ADJUST_TRIM) 5699 if (sc->bge_flags & BGE_PHY_ADJUST_TRIM)
5700 printf(" - adjust trim\n"); 5700 printf(" - adjust trim\n");
5701 if (sc->bge_flags & BGE_PHY_NO_WIRESPEED) 5701 if (sc->bge_flags & BGE_PHY_NO_WIRESPEED)
5702 printf(" - no wirespeed\n"); 5702 printf(" - no wirespeed\n");
5703} 5703}
5704#endif /* BGE_DEBUG */ 5704#endif /* BGE_DEBUG */
5705 5705
5706static int 5706static int
5707bge_get_eaddr_fw(struct bge_softc *sc, uint8_t ether_addr[]) 5707bge_get_eaddr_fw(struct bge_softc *sc, uint8_t ether_addr[])
5708{ 5708{
5709 prop_dictionary_t dict; 5709 prop_dictionary_t dict;
5710 prop_data_t ea; 5710 prop_data_t ea;