diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-11-01 03:10:22 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-11-01 03:10:22 +0000 |
| commit | 2cca60a5dca5db8c9aeeb5b47d83d03486301b53 (patch) | |
| tree | 7b779b32fea0c2db5b1b4f92da9537b0f27528fc | |
| parent | 679fb86ed63d98d4257e46fcd4a5e6c5be741833 (diff) | |
Remove the call to ieee80211_ifattach() for the moment as it
makes wi prematurely depend on net80211 code which bloats the
ramdisks.
ok dlg@
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/dev/ic/if_wi.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/conf/files b/sys/conf/files index a82a7d91c80..e4661a04d35 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.352 2005/10/31 19:35:14 deraadt Exp $ +# $OpenBSD: files,v 1.353 2005/11/01 03:10:21 jsg Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -218,7 +218,7 @@ device lc: ether, ifnet, ifmedia file dev/ic/lemac.c lc # WaveLan -device wi: ether, ifnet, ifmedia, wlan +device wi: ether, ifnet, ifmedia file dev/ic/if_wi.c wi file dev/ic/if_wi_hostap.c wi diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index 3e25286d2a5..0bd90ea7060 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.123 2005/10/31 05:37:12 jsg Exp $ */ +/* $OpenBSD: if_wi.c,v 1.124 2005/11/01 03:10:21 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -128,7 +128,7 @@ u_int32_t widebug = WIDEBUG; #if !defined(lint) && !defined(__OpenBSD__) static const char rcsid[] = - "$OpenBSD: if_wi.c,v 1.123 2005/10/31 05:37:12 jsg Exp $"; + "$OpenBSD: if_wi.c,v 1.124 2005/11/01 03:10:21 jsg Exp $"; #endif /* lint */ #ifdef foo @@ -431,7 +431,9 @@ wi_attach(struct wi_softc *sc, struct wi_funcs *funcs) * Call MI attach routines. */ if_attach(ifp); - ieee80211_ifattach(ifp); + memcpy(((struct arpcom *)ifp)->ac_enaddr, ic->ic_myaddr, + ETHER_ADDR_LEN); + ether_ifattach(ifp); printf("\n"); sc->wi_flags |= WI_FLAGS_ATTACHED; |