Page MenuHomeFreeBSD
Files F96334051

D37842.id114468.diff
No OneTemporary
Actions

D37842.id114468.diff
View Options

diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -2270,9 +2270,9 @@
/* Set random backoff seed for TX */
CSR_WRITE_4(sc, BGE_TX_RANDOM_BACKOFF,
- (IF_LLADDR(sc->bge_ifp)[0] + IF_LLADDR(sc->bge_ifp)[1] +
- IF_LLADDR(sc->bge_ifp)[2] + IF_LLADDR(sc->bge_ifp)[3] +
- IF_LLADDR(sc->bge_ifp)[4] + IF_LLADDR(sc->bge_ifp)[5]) &
+ (if_getlladdr(sc->bge_ifp)[0] + if_getlladdr(sc->bge_ifp)[1] +
+ if_getlladdr(sc->bge_ifp)[2] + if_getlladdr(sc->bge_ifp)[3] +
+ if_getlladdr(sc->bge_ifp)[4] + if_getlladdr(sc->bge_ifp)[5]) &
BGE_TX_BACKOFF_SEED_MASK);
/* Set inter-packet gap */
@@ -5450,7 +5450,7 @@
(if_getcapenable(ifp) & IFCAP_VLAN_MTU ? ETHER_VLAN_ENCAP_LEN : 0));
/* Load our MAC address. */
- m = (uint16_t *)IF_LLADDR(sc->bge_ifp);
+ m = (uint16_t *)if_getlladdr(sc->bge_ifp);
CSR_WRITE_4(sc, BGE_MAC_ADDR1_LO, htons(m[0]));
CSR_WRITE_4(sc, BGE_MAC_ADDR1_HI, (htons(m[1]) << 16) | htons(m[2]));
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -2942,7 +2942,7 @@
#define ASF_STACKUP 4
struct bge_softc {
- struct ifnet *bge_ifp; /* interface info */
+ if_t bge_ifp; /* interface info */
device_t bge_dev;
struct mtx bge_mtx;
device_t bge_miibus;

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 25, 3:37 PM (1 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12765197
Default Alt Text
D37842.id114468.diff (1 KB)

Event Timeline